From 1ed0e38104a2e0be81fc23a2f9726551158dc6ff Mon Sep 17 00:00:00 2001 From: Muhammad Mominul Huque Date: Fri, 14 Nov 2025 17:51:53 +0600 Subject: [PATCH 1/5] MACOSX_DEPLOYMENT_TARGET --- riti.xcodeproj/project.pbxproj | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/riti.xcodeproj/project.pbxproj b/riti.xcodeproj/project.pbxproj index 20b9596..bf3d884 100644 --- a/riti.xcodeproj/project.pbxproj +++ b/riti.xcodeproj/project.pbxproj @@ -1,6 +1,5 @@ // !$*UTF8*$! { - /* generated with cargo-xcode 1.11.0 */ archiveVersion = 1; classes = { }; @@ -32,7 +31,7 @@ /* Begin PBXFileReference section */ CA00B9937C4654FCDE10A9EB /* libriti.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libriti.a; sourceTree = BUILT_PRODUCTS_DIR; }; - CAF95239D67F3EF4668187A5 /* Cargo.toml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cargo.toml; path = Cargo.toml; sourceTree = ""; }; + CAF95239D67F3EF4668187A5 /* Cargo.toml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cargo.toml; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ @@ -124,7 +123,7 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - CA00A0F7F57D1056C3DE07A2 /* Release */ = { + CA004EBF41001056C3DE07A2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CARGO_XCODE_CARGO_DEP_FILE_NAME = libriti.d; @@ -132,13 +131,14 @@ INSTALL_GROUP = ""; INSTALL_MODE_FLAG = ""; INSTALL_OWNER = ""; + MACOSX_DEPLOYMENT_TARGET = 15.6; PRODUCT_NAME = riti; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; }; - name = Release; + name = Debug; }; - CA004EBF41001056C3DE07A2 /* Debug */ = { + CA00A0F7F57D1056C3DE07A2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CARGO_XCODE_CARGO_DEP_FILE_NAME = libriti.d; @@ -146,19 +146,20 @@ INSTALL_GROUP = ""; INSTALL_MODE_FLAG = ""; INSTALL_OWNER = ""; + MACOSX_DEPLOYMENT_TARGET = 15.6; PRODUCT_NAME = riti; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; }; - name = Debug; + name = Release; }; CAF7FE07D4CF3CC16B37690B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + "ADDITIONAL_SDKS[sdk=a*]" = macosx; "ADDITIONAL_SDKS[sdk=i*]" = macosx; "ADDITIONAL_SDKS[sdk=w*]" = macosx; "ADDITIONAL_SDKS[sdk=x*]" = macosx; - "ADDITIONAL_SDKS[sdk=a*]" = macosx; ALWAYS_SEARCH_USER_PATHS = NO; CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; CARGO_XCODE_BUILD_PROFILE = release; @@ -176,10 +177,10 @@ CAF8FE07D4CF228BE02872F8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + "ADDITIONAL_SDKS[sdk=a*]" = macosx; "ADDITIONAL_SDKS[sdk=i*]" = macosx; "ADDITIONAL_SDKS[sdk=w*]" = macosx; "ADDITIONAL_SDKS[sdk=x*]" = macosx; - "ADDITIONAL_SDKS[sdk=a*]" = macosx; ALWAYS_SEARCH_USER_PATHS = NO; CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; CARGO_XCODE_BUILD_PROFILE = debug; From 527955b596a235fd0e64ce54f4f9231a45c9e632 Mon Sep 17 00:00:00 2001 From: Muhammad Mominul Huque Date: Wed, 31 Dec 2025 13:07:45 +0600 Subject: [PATCH 2/5] MACOSX_DEPLOYMENT_TARGET --- riti.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/riti.xcodeproj/project.pbxproj b/riti.xcodeproj/project.pbxproj index bf3d884..b43cff8 100644 --- a/riti.xcodeproj/project.pbxproj +++ b/riti.xcodeproj/project.pbxproj @@ -131,7 +131,7 @@ INSTALL_GROUP = ""; INSTALL_MODE_FLAG = ""; INSTALL_OWNER = ""; - MACOSX_DEPLOYMENT_TARGET = 15.6; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = riti; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; @@ -146,7 +146,7 @@ INSTALL_GROUP = ""; INSTALL_MODE_FLAG = ""; INSTALL_OWNER = ""; - MACOSX_DEPLOYMENT_TARGET = 15.6; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = riti; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; From 4a0110e3e1e529e0adf57d0d570c021c17cbabea Mon Sep 17 00:00:00 2001 From: Muhammad Mominul Huque Date: Wed, 31 Dec 2025 14:16:02 +0600 Subject: [PATCH 3/5] msrv --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 60f293a..d408698 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,11 +18,11 @@ codegen-units = 1 [dependencies] ahash = { version = "0.8", features = ["serde"] } emojicon = { version = "0.5", features = ["custom"] } -serde_json = "1.0" +serde_json = "=1.0.108" regex = "~1.9" # For maintaining MSRV stringplus = "0.1" -edit-distance = "2.1" -okkhor = "0.7" +edit-distance = "=2.1.0" +okkhor = "0.8" poriborton = "0.2" upodesh = "0.4" From 2e431d2f9438a4cf7cd0f21fb2304c02ab36ab86 Mon Sep 17 00:00:00 2001 From: Mominul Date: Wed, 31 Dec 2025 16:56:54 +0600 Subject: [PATCH 4/5] Bump MSRV to 1.75.0 --- .github/workflows/main.yml | 4 ++-- Cargo.toml | 8 ++++---- src/fixed/method.rs | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08c8baf..6200616 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,8 +13,8 @@ jobs: matrix: rust: - stable - - 1.63.0 # MSRV for linux distributions (>= Debian 12) - # - nightly # To keep the MSRV, we can't test with nightly as some downgraded crates fails to compile + - 1.75.0 # MSRV for linux distributions (>= Debian 12) + - nightly platform: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/Cargo.toml b/Cargo.toml index d408698..25f8146 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Muhammad Mominul Huque "] license = "MPL-2.0" edition = "2021" -rust-version = "1.63.0" +rust-version = "1.75.0" [lib] crate-type = ["lib", "staticlib"] @@ -18,10 +18,10 @@ codegen-units = 1 [dependencies] ahash = { version = "0.8", features = ["serde"] } emojicon = { version = "0.5", features = ["custom"] } -serde_json = "=1.0.108" -regex = "~1.9" # For maintaining MSRV +serde_json = "1.0" +regex = "1.9" stringplus = "0.1" -edit-distance = "=2.1.0" +edit-distance = "2.1" okkhor = "0.8" poriborton = "0.2" upodesh = "0.4" diff --git a/src/fixed/method.rs b/src/fixed/method.rs index b6755a0..a3ae468 100644 --- a/src/fixed/method.rs +++ b/src/fixed/method.rs @@ -622,6 +622,9 @@ mod tests { assert_eq!(method.suggestions, ["()"]); } + // The latest Rust version has incompatibility with the sorting order of the suggestions. + // So, this sensitive test are disabled for the MSRV. + #[rustversion::not(stable(1.75))] #[test] fn test_suggestion_smart_quote() { let mut method = FixedMethod::default(); @@ -645,7 +648,7 @@ mod tests { // The latest Rust version has incompatibility with the sorting order of the suggestions. // So, this sensitive test are disabled for the MSRV. - #[rustversion::not(stable(1.63))] + #[rustversion::not(stable(1.75))] #[test] fn test_emojis() { use crate::keycodes::VC_SEMICOLON; // Don't know why Rust 1.63 errors on unused import in CI. @@ -697,7 +700,7 @@ mod tests { // The latest Rust version has incompatibility with the sorting order of the suggestions. // So, this sensitive test are disabled for the MSRV. - #[rustversion::not(stable(1.63))] + #[rustversion::not(stable(1.75))] #[test] fn test_suggestion_ansi() { let mut method = FixedMethod::default(); From 0cdd81254d312a3de9c7ca99e036edaa16b8dd59 Mon Sep 17 00:00:00 2001 From: Muhammad Mominul Huque Date: Wed, 31 Dec 2025 17:09:11 +0600 Subject: [PATCH 5/5] fix --- src/fixed/method.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fixed/method.rs b/src/fixed/method.rs index a3ae468..5d58458 100644 --- a/src/fixed/method.rs +++ b/src/fixed/method.rs @@ -560,6 +560,7 @@ fn is_left_standing_kar(c: char) -> bool { } #[cfg(test)] +#[allow(unused_imports)] mod tests { use pretty_assertions::assert_eq;