From e57676c0f26455ca0e4bcb4d11560e7716a51fe4 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Thu, 22 Jan 2026 15:11:34 -0500 Subject: [PATCH 1/7] maint(mac): upgrade to Xcode 26 change cocoa-sentry version to one compatible with Xcode 26 --- mac/Keyman4MacIM/Podfile | 6 +++--- mac/Keyman4MacIM/Podfile.lock | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mac/Keyman4MacIM/Podfile b/mac/Keyman4MacIM/Podfile index a5c62be447d..9f797cfd793 100644 --- a/mac/Keyman4MacIM/Podfile +++ b/mac/Keyman4MacIM/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -platform :osx, '10.13' +platform :osx, '11.0' use_frameworks! target 'Keyman' do @@ -7,11 +7,11 @@ target 'Keyman' do # use_frameworks! # Pods for Keyman - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.38.0' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.57.3' target 'KeymanTests' do inherit! :search_paths - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.38.0' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.57.3' use_frameworks! # Pods for testing end diff --git a/mac/Keyman4MacIM/Podfile.lock b/mac/Keyman4MacIM/Podfile.lock index 004e0acc65b..5c349d43aad 100644 --- a/mac/Keyman4MacIM/Podfile.lock +++ b/mac/Keyman4MacIM/Podfile.lock @@ -1,24 +1,24 @@ PODS: - - Sentry (8.38.0-beta.1): - - Sentry/Core (= 8.38.0-beta.1) - - Sentry/Core (8.38.0-beta.1) + - Sentry (8.57.3): + - Sentry/Core (= 8.57.3) + - Sentry/Core (8.57.3) DEPENDENCIES: - - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `8.38.0`) + - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `8.57.3`) EXTERNAL SOURCES: Sentry: :git: https://github.com/getsentry/sentry-cocoa.git - :tag: 8.38.0 + :tag: 8.57.3 CHECKOUT OPTIONS: Sentry: :git: https://github.com/getsentry/sentry-cocoa.git - :tag: 8.38.0 + :tag: 8.57.3 SPEC CHECKSUMS: - Sentry: 4d6027fbfde9ddc35e5c368292843097d039db5f + Sentry: c643eb180df401dd8c734c5036ddd9dd9218daa6 -PODFILE CHECKSUM: 19b128c35d9c5e59f90d09522c053de65096696a +PODFILE CHECKSUM: d45d4bde6c75c2c91314777c88c421e5e604d84d COCOAPODS: 1.15.2 From c45605072b3496b9434cdeba645663c1cc44d0b3 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Thu, 22 Jan 2026 16:10:01 -0500 Subject: [PATCH 2/7] maint(mac): try using sentry-cocoa 9.2.0 Fixes: #15475 --- mac/Keyman4MacIM/Podfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mac/Keyman4MacIM/Podfile b/mac/Keyman4MacIM/Podfile index 9f797cfd793..ac315b5ee9e 100644 --- a/mac/Keyman4MacIM/Podfile +++ b/mac/Keyman4MacIM/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -platform :osx, '11.0' +platform :osx, '12.0' use_frameworks! target 'Keyman' do @@ -7,11 +7,11 @@ target 'Keyman' do # use_frameworks! # Pods for Keyman - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.57.3' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '9.2.0' target 'KeymanTests' do inherit! :search_paths - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.57.3' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '9.2.0' use_frameworks! # Pods for testing end From ffba6f368de073d1b8e5250e4062593dc9b2e2b8 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Fri, 23 Jan 2026 15:03:24 -0500 Subject: [PATCH 3/7] maint(mac): Revert "maint(mac): try using sentry-cocoa 9.2.0" This reverts commit c45605072b3496b9434cdeba645663c1cc44d0b3. --- mac/Keyman4MacIM/Podfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mac/Keyman4MacIM/Podfile b/mac/Keyman4MacIM/Podfile index ac315b5ee9e..9f797cfd793 100644 --- a/mac/Keyman4MacIM/Podfile +++ b/mac/Keyman4MacIM/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -platform :osx, '12.0' +platform :osx, '11.0' use_frameworks! target 'Keyman' do @@ -7,11 +7,11 @@ target 'Keyman' do # use_frameworks! # Pods for Keyman - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '9.2.0' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.57.3' target 'KeymanTests' do inherit! :search_paths - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '9.2.0' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '8.57.3' use_frameworks! # Pods for testing end From 5c77062bca1c3cf8d19f890444137e79a5de49bb Mon Sep 17 00:00:00 2001 From: sgschantz Date: Mon, 26 Jan 2026 10:50:41 -0500 Subject: [PATCH 4/7] maint(ios): build with Xcode 26 attempt build using swift packages instead of carthage --- ios/Cartfile | 4 - ios/Cartfile.resolved | 4 - .../KeymanEngine.xcodeproj/project.pbxproj | 103 +++++++++++--- ios/engine/build.sh | 25 ---- .../Keyman/Keyman.xcodeproj/project.pbxproj | 126 +++++++++++++----- .../xcshareddata/swiftpm/Package.resolved | 42 ++++++ 6 files changed, 213 insertions(+), 91 deletions(-) delete mode 100644 ios/Cartfile delete mode 100644 ios/Cartfile.resolved create mode 100644 ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/ios/Cartfile b/ios/Cartfile deleted file mode 100644 index 9ffc07d3305..00000000000 --- a/ios/Cartfile +++ /dev/null @@ -1,4 +0,0 @@ -github "weichsel/ZIPFoundation" ~> 0.9 -github "devicekit/DeviceKit" ~> 5.0 -github "ashleymills/Reachability.swift" -github "getsentry/sentry-cocoa" ~> 8.38.0 diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved deleted file mode 100644 index ca05da1ae94..00000000000 --- a/ios/Cartfile.resolved +++ /dev/null @@ -1,4 +0,0 @@ -github "ashleymills/Reachability.swift" "v5.2.4" -github "devicekit/DeviceKit" "5.5.0" -github "getsentry/sentry-cocoa" "8.44.0" -github "weichsel/ZIPFoundation" "0.9.19" diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj index 94dea1d5c79..387701c0953 100644 --- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj +++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj @@ -26,8 +26,11 @@ 1645D5972036C9F80076C51B /* KMPKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1645D5962036C9F80076C51B /* KMPKeyboard.swift */; }; 165EB3A12098993900040A69 /* KeyboardError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EB3A02098993900040A69 /* KeyboardError.swift */; }; 29084CAB2CD48B5D004070E7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29084CAA2CD48B5D004070E7 /* Images.xcassets */; }; - 296EF2C72AFA26C700E3E384 /* ZIPFoundation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 296EF2C62AFA26C700E3E384 /* ZIPFoundation.xcframework */; }; 29B30C232B564F9900C342A4 /* KeymanEngineLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B30C222B564F9900C342A4 /* KeymanEngineLogger.swift */; }; + 29C3F3F52F2525F7000D1C6F /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3F42F2525F7000D1C6F /* DeviceKit */; }; + 29C3F3F82F25261D000D1C6F /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3F72F25261D000D1C6F /* Reachability */; }; + 29C3F3FB2F25263C000D1C6F /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3FA2F25263C000D1C6F /* ZIPFoundation */; }; + 29C3F3FE2F2526B7000D1C6F /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3FD2F2526B7000D1C6F /* Sentry */; }; 29E202BD2CCB7541008B4740 /* KeyboardHeightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29E202BC2CCB7541008B4740 /* KeyboardHeightViewController.swift */; }; 377D10DE26846B8900467431 /* SpacebarTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377D10DD26846B8900467431 /* SpacebarTextViewController.swift */; }; 6CD5DFAA150F6DC8007A5DDE /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD5DFA8150F6DC8007A5DDE /* icon.png */; }; @@ -121,9 +124,6 @@ CE46D65D247B93C9005FD506 /* (null) in Resources */ = {isa = PBXBuildFile; }; CE5C8BE324B5B3BA00FAFB7F /* Queries+LexicalModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5C8BE224B5B3BA00FAFB7F /* Queries+LexicalModel.swift */; }; CE5C8BE524B5BD1C00FAFB7F /* QueryModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5C8BE424B5BD1C00FAFB7F /* QueryModelTests.swift */; }; - CE5EDDC726522EAA001733AC /* Sentry.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE5EDDC226522EAA001733AC /* Sentry.xcframework */; }; - CE5EDDC826522EAA001733AC /* Reachability.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE5EDDC326522EAA001733AC /* Reachability.xcframework */; }; - CE5EDDD52652372A001733AC /* DeviceKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE5EDDBB26522EA3001733AC /* DeviceKit.xcframework */; }; CE67D961228A6F190029F2B5 /* KeyboardCommandStructs.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE67D960228A6F190029F2B5 /* KeyboardCommandStructs.swift */; }; CE71705823A9C14D00A924A1 /* ResourceFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE71705723A9C14D00A924A1 /* ResourceFileManager.swift */; }; CE71705F23A9C97F00A924A1 /* PackageInstallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE71705E23A9C97F00A924A1 /* PackageInstallViewController.swift */; }; @@ -307,7 +307,6 @@ 2949146F2738DA6700400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/ResourceInfoView.strings"; sourceTree = ""; }; 294914702738DD7400400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/Localizable.strings"; sourceTree = ""; }; 294914712738DD9700400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "ff-NG"; path = "ff-NG.lproj/Localizable.stringsdict"; sourceTree = ""; }; - 296EF2C62AFA26C700E3E384 /* ZIPFoundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ZIPFoundation.xcframework; path = ../../Carthage/Build/ZIPFoundation.xcframework; sourceTree = ""; }; 297810FE297FAEDF007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/ResourceInfoView.strings; sourceTree = ""; }; 297810FF297FAEF8007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/Localizable.strings; sourceTree = ""; }; 29781100297FAF06007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = kn; path = kn.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -433,9 +432,6 @@ CE4459D323FBBB34003151FD /* KeymanEngineTestHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KeymanEngineTestHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; CE5C8BE224B5B3BA00FAFB7F /* Queries+LexicalModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Queries+LexicalModel.swift"; sourceTree = ""; }; CE5C8BE424B5BD1C00FAFB7F /* QueryModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueryModelTests.swift; sourceTree = ""; }; - CE5EDDBB26522EA3001733AC /* DeviceKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DeviceKit.xcframework; path = ../../Carthage/Build/DeviceKit.xcframework; sourceTree = ""; }; - CE5EDDC226522EAA001733AC /* Sentry.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../../Carthage/Build/Sentry.xcframework; sourceTree = ""; }; - CE5EDDC326522EAA001733AC /* Reachability.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Reachability.xcframework; path = ../../Carthage/Build/Reachability.xcframework; sourceTree = ""; }; CE67D960228A6F190029F2B5 /* KeyboardCommandStructs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardCommandStructs.swift; sourceTree = ""; }; CE71705723A9C14D00A924A1 /* ResourceFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourceFileManager.swift; sourceTree = ""; }; CE71705E23A9C97F00A924A1 /* PackageInstallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PackageInstallViewController.swift; sourceTree = ""; }; @@ -562,10 +558,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 296EF2C72AFA26C700E3E384 /* ZIPFoundation.xcframework in Frameworks */, - CE5EDDD52652372A001733AC /* DeviceKit.xcframework in Frameworks */, - CE5EDDC726522EAA001733AC /* Sentry.xcframework in Frameworks */, - CE5EDDC826522EAA001733AC /* Reachability.xcframework in Frameworks */, + 29C3F3F52F2525F7000D1C6F /* DeviceKit in Frameworks */, + 29C3F3F82F25261D000D1C6F /* Reachability in Frameworks */, + 29C3F3FB2F25263C000D1C6F /* ZIPFoundation in Frameworks */, + 29C3F3FE2F2526B7000D1C6F /* Sentry in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -949,10 +945,6 @@ F243888114BBD43000A3E055 /* Frameworks */ = { isa = PBXGroup; children = ( - 296EF2C62AFA26C700E3E384 /* ZIPFoundation.xcframework */, - CE5EDDC326522EAA001733AC /* Reachability.xcframework */, - CE5EDDC226522EAA001733AC /* Sentry.xcframework */, - CE5EDDBB26522EA3001733AC /* DeviceKit.xcframework */, 9A079DE52231A69D00581263 /* Foundation.framework */, ); name = Frameworks; @@ -1221,6 +1213,12 @@ vi, ); mainGroup = F243887314BBD43000A3E055; + packageReferences = ( + 29C3F3F32F2525F7000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */, + 29C3F3F62F25261D000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */, + 29C3F3F92F25263C000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */, + 29C3F3FC2F2526B7000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */, + ); productRefGroup = F243887F14BBD43000A3E055 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1889,7 +1887,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -1900,6 +1898,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1945,7 +1944,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -1957,6 +1956,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; @@ -2108,7 +2108,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../Carthage/Build/"; + FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -2140,7 +2140,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -2151,6 +2151,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -2383,7 +2384,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../Carthage/Build/"; + FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -2426,7 +2427,7 @@ DEFINES_MODULE = YES; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../Carthage/Build/"; + FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -2581,6 +2582,64 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 29C3F3F32F2525F7000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/devicekit/DeviceKit.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.7.0; + }; + }; + 29C3F3F62F25261D000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/ashleymills/Reachability.swift"; + requirement = { + branch = master; + kind = branch; + }; + }; + 29C3F3F92F25263C000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/weichsel/ZIPFoundation.git"; + requirement = { + kind = exactVersion; + version = 0.9.20; + }; + }; + 29C3F3FC2F2526B7000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/getsentry/sentry-cocoa.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 9.2.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 29C3F3F42F2525F7000D1C6F /* DeviceKit */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F3F32F2525F7000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */; + productName = DeviceKit; + }; + 29C3F3F72F25261D000D1C6F /* Reachability */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F3F62F25261D000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */; + productName = Reachability; + }; + 29C3F3FA2F25263C000D1C6F /* ZIPFoundation */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F3F92F25263C000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */; + productName = ZIPFoundation; + }; + 29C3F3FD2F2526B7000D1C6F /* Sentry */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F3FC2F2526B7000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */; + productName = Sentry; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = F243887514BBD43000A3E055 /* Project object */; } diff --git a/ios/engine/build.sh b/ios/engine/build.sh index 39bd26118c0..dc003db4566 100755 --- a/ios/engine/build.sh +++ b/ios/engine/build.sh @@ -28,7 +28,6 @@ if builder_is_debug_build; then fi builder_describe_outputs \ - configure /ios/Carthage/Build \ build /ios/build/Build/Products/Release/KeymanEngine.xcframework # Base definitions (must be before do_clean call) @@ -58,29 +57,6 @@ fi function do_clean () { # Possible TODO: can we clean the engine target without also cleaning the app target? rm -rf "$BUILD_PATH" - rm -rf Carthage -} - -function carthage_die() { - local msg="$1" - - # Don't leave a trace of the failed folder; we'd have to rebuild stuff anyway. - # This way, a later re-run doesn't think `configure` succeeded when it did not. - rm -rf Carthage - builder_die "$1" -} - -function do_carthage() { - # Carthage setup must be handled from the directory with the Cartfile / Cartfile.resolved, it seems. - pushd .. > /dev/null - - carthage checkout || carthage_die "Carthage dependency checkout failed" - - # --no-use-binaries: due to https://github.com/Carthage/Carthage/issues/3134, - # which affects the sentry-cocoa dependency. - carthage build --use-xcframeworks --no-use-binaries --platform iOS || carthage_die "Carthage dependency loading failed" - - popd > /dev/null } function do_packages() { @@ -92,7 +68,6 @@ function do_packages() { function do_configure ( ) { do_packages - do_carthage } # Manages KeymanEngine.bundle, which is included inside the :engine target. diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj index 7292a3f91df..9997aadfaf1 100644 --- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj +++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj @@ -14,9 +14,11 @@ 162E2C9F2092D36800F40769 /* UIDevice+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 162E2C9E2092D36800F40769 /* UIDevice+Extensions.swift */; }; 165EB39A2097165B00040A69 /* UIColor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EB3992097165B00040A69 /* UIColor+Extensions.swift */; }; 165EB39C2097181D00040A69 /* KMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EB39B2097181D00040A69 /* KMView.swift */; }; - 296EF2C42AFA267500E3E384 /* ZIPFoundation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */; }; - 296EF2C52AFA267500E3E384 /* ZIPFoundation.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 29B30C212B56325D00C342A4 /* KeymanLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29CA9A612B4F9B0B00EAB099 /* KeymanLogger.swift */; }; + 29C3F4012F2526CA000D1C6F /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4002F2526CA000D1C6F /* Sentry */; }; + 29C3F4042F2526E5000D1C6F /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4032F2526E5000D1C6F /* ZIPFoundation */; }; + 29C3F4072F2526F2000D1C6F /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4062F2526F2000D1C6F /* Reachability */; }; + 29C3F40A2F25270A000D1C6F /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4092F25270A000D1C6F /* DeviceKit */; }; 29CA9A622B4F9B0B00EAB099 /* KeymanLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29CA9A612B4F9B0B00EAB099 /* KeymanLogger.swift */; }; 981AFA8F19EF44DE006706BF /* 724-info@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9815725518E4F0930014DF0C /* 724-info@2x.png */; }; 981AFA9619EF44DE006706BF /* MainViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 98ABADCE176935E500B62590 /* MainViewController_iPhone.xib */; }; @@ -148,12 +150,6 @@ CE80AD33257F2B4A008D2150 /* KeymanEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */; }; CE80AD34257F2B4B008D2150 /* KeymanEngine.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CEBD34322654FE3500EB2EA8 /* KeymanEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */; }; - CEBD343B2654FEB400EB2EA8 /* DeviceKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */; }; - CEBD343C2654FEB400EB2EA8 /* DeviceKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - CEBD343F2654FEB400EB2EA8 /* Reachability.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */; }; - CEBD34402654FEB400EB2EA8 /* Reachability.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - CEBD34412654FEB400EB2EA8 /* Sentry.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */; }; - CEBD34422654FEB400EB2EA8 /* Sentry.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CEF4E55623E95B7B0065B9C7 /* ImageBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEF4E55523E95B7B0065B9C7 /* ImageBanner.xib */; }; CEF4E55723E95B7B0065B9C7 /* ImageBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEF4E55523E95B7B0065B9C7 /* ImageBanner.xib */; }; CEF4E55923E967140065B9C7 /* ImageBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF4E55823E967140065B9C7 /* ImageBannerViewController.swift */; }; @@ -178,10 +174,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - CEBD34402654FEB400EB2EA8 /* Reachability.xcframework in Embed Frameworks */, - 296EF2C52AFA267500E3E384 /* ZIPFoundation.xcframework in Embed Frameworks */, - CEBD343C2654FEB400EB2EA8 /* DeviceKit.xcframework in Embed Frameworks */, - CEBD34422654FEB400EB2EA8 /* Sentry.xcframework in Embed Frameworks */, CE80AD34257F2B4B008D2150 /* KeymanEngine.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -200,7 +192,6 @@ 16A9229D20325253003CC98E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Keyman/Info.plist; sourceTree = SOURCE_ROOT; }; 293EA3E027059C6900545EED /* ha */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ha; path = ha.lproj/Localizable.strings; sourceTree = ""; }; 294914742738DF7700400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/Localizable.strings"; sourceTree = ""; }; - 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ZIPFoundation.xcframework; path = ../../Carthage/Build/ZIPFoundation.xcframework; sourceTree = ""; }; 297810FD297FA818007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/Localizable.strings; sourceTree = ""; }; 298566B829802828004ACA95 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 298566C42980C493004ACA95 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; }; @@ -336,9 +327,6 @@ CEACC90E25F07D58006EAB45 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; CEACC90F25F07D5A006EAB45 /* km */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = km; path = km.lproj/Localizable.strings; sourceTree = ""; }; CEACC91225F07D77006EAB45 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; - CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DeviceKit.xcframework; path = ../../Carthage/Build/DeviceKit.xcframework; sourceTree = ""; }; - CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Reachability.xcframework; path = ../../Carthage/Build/Reachability.xcframework; sourceTree = ""; }; - CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../../Carthage/Build/Sentry.xcframework; sourceTree = ""; }; CEBD3458265511B700EB2EA8 /* am */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = am; path = am.lproj/Localizable.strings; sourceTree = ""; }; CEEC468226F2F7BA009A5B7D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; CEEF81B92673019600EE6A07 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = ""; }; @@ -352,11 +340,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CEBD343F2654FEB400EB2EA8 /* Reachability.xcframework in Frameworks */, - 296EF2C42AFA267500E3E384 /* ZIPFoundation.xcframework in Frameworks */, - CEBD343B2654FEB400EB2EA8 /* DeviceKit.xcframework in Frameworks */, - CEBD34412654FEB400EB2EA8 /* Sentry.xcframework in Frameworks */, CE80AD33257F2B4A008D2150 /* KeymanEngine.framework in Frameworks */, + 29C3F40A2F25270A000D1C6F /* DeviceKit in Frameworks */, + 29C3F4072F2526F2000D1C6F /* Reachability in Frameworks */, + 29C3F4012F2526CA000D1C6F /* Sentry in Frameworks */, + 29C3F4042F2526E5000D1C6F /* ZIPFoundation in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -537,10 +525,6 @@ 98ABADB2176935E400B62590 /* Frameworks */ = { isa = PBXGroup; children = ( - 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */, - CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */, - CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */, - CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */, CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */, ); name = Frameworks; @@ -799,6 +783,12 @@ vi, ); mainGroup = 98ABADA7176935E400B62590; + packageReferences = ( + 29C3F3FF2F2526CA000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */, + 29C3F4022F2526E5000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */, + 29C3F4052F2526F2000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */, + 29C3F4082F25270A000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */, + ); productRefGroup = 98ABADB1176935E400B62590 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1127,9 +1117,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3YE4W86L3G; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; @@ -1147,6 +1139,7 @@ PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -1163,9 +1156,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3YE4W86L3G; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch"; INFOPLIST_FILE = Keyman/Info.plist; @@ -1181,6 +1176,7 @@ PRODUCT_NAME = Keyman; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Distribution"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; @@ -1220,10 +1216,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)", - "$(SRCROOT)/../../Carthage/Build/", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1275,10 +1268,7 @@ COPY_PHASE_STRIP = YES; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)", - "$(SRCROOT)/../../Carthage/Build/", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1309,8 +1299,10 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_ENTITLEMENTS = SWKeyboard/SWKeyboard.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = 3YE4W86L3G; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1336,6 +1328,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development SWKeyboard"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution SWKeyboard"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -1419,10 +1412,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)", - "$(SRCROOT)/../../Carthage/Build/", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1452,9 +1442,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3YE4W86L3G; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; @@ -1472,6 +1464,7 @@ PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -1490,8 +1483,10 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_ENTITLEMENTS = SWKeyboard/SWKeyboard.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = 3YE4W86L3G; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1517,6 +1512,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development SWKeyboard"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution SWKeyboard"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -1561,6 +1557,64 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 29C3F3FF2F2526CA000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/getsentry/sentry-cocoa.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 9.2.0; + }; + }; + 29C3F4022F2526E5000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/weichsel/ZIPFoundation.git"; + requirement = { + kind = exactVersion; + version = 0.9.20; + }; + }; + 29C3F4052F2526F2000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/ashleymills/Reachability.swift"; + requirement = { + branch = master; + kind = branch; + }; + }; + 29C3F4082F25270A000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/devicekit/DeviceKit.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 29C3F4002F2526CA000D1C6F /* Sentry */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F3FF2F2526CA000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */; + productName = Sentry; + }; + 29C3F4032F2526E5000D1C6F /* ZIPFoundation */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F4022F2526E5000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */; + productName = ZIPFoundation; + }; + 29C3F4062F2526F2000D1C6F /* Reachability */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F4052F2526F2000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */; + productName = Reachability; + }; + 29C3F4092F25270A000D1C6F /* DeviceKit */ = { + isa = XCSwiftPackageProductDependency; + package = 29C3F4082F25270A000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */; + productName = DeviceKit; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 98ABADA8176935E400B62590 /* Project object */; } diff --git a/ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000000..8f793256012 --- /dev/null +++ b/ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,42 @@ +{ + "originHash" : "a373bd824b59e33f7208114e4d77d167cc3f88776f323dd66ef0d5e716c837af", + "pins" : [ + { + "identity" : "devicekit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/devicekit/DeviceKit.git", + "state" : { + "revision" : "581df61650bc457ec00373a592a84be3e7468eb1", + "version" : "5.7.0" + } + }, + { + "identity" : "reachability.swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ashleymills/Reachability.swift", + "state" : { + "branch" : "master", + "revision" : "21d1dc412cfecbe6e34f1f4c4eb88d3f912654a6" + } + }, + { + "identity" : "sentry-cocoa", + "kind" : "remoteSourceControl", + "location" : "https://github.com/getsentry/sentry-cocoa.git", + "state" : { + "revision" : "de66bd4fa0661c81455e8ad2509ed6f0e39025dc", + "version" : "9.2.0" + } + }, + { + "identity" : "zipfoundation", + "kind" : "remoteSourceControl", + "location" : "https://github.com/weichsel/ZIPFoundation.git", + "state" : { + "revision" : "22787ffb59de99e5dc1fbfe80b19c97a904ad48d", + "version" : "0.9.20" + } + } + ], + "version" : 3 +} From de81102da2331f8bc27d8af79d59f710b5edbe70 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Mon, 26 Jan 2026 12:36:35 -0500 Subject: [PATCH 5/7] chore(ios): Revert "maint(ios): build with Xcode 26" This reverts commit 5c77062bca1c3cf8d19f890444137e79a5de49bb. --- ios/Cartfile | 4 + ios/Cartfile.resolved | 4 + .../KeymanEngine.xcodeproj/project.pbxproj | 103 +++----------- ios/engine/build.sh | 25 ++++ .../Keyman/Keyman.xcodeproj/project.pbxproj | 126 +++++------------- .../xcshareddata/swiftpm/Package.resolved | 42 ------ 6 files changed, 91 insertions(+), 213 deletions(-) create mode 100644 ios/Cartfile create mode 100644 ios/Cartfile.resolved delete mode 100644 ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/ios/Cartfile b/ios/Cartfile new file mode 100644 index 00000000000..9ffc07d3305 --- /dev/null +++ b/ios/Cartfile @@ -0,0 +1,4 @@ +github "weichsel/ZIPFoundation" ~> 0.9 +github "devicekit/DeviceKit" ~> 5.0 +github "ashleymills/Reachability.swift" +github "getsentry/sentry-cocoa" ~> 8.38.0 diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved new file mode 100644 index 00000000000..ca05da1ae94 --- /dev/null +++ b/ios/Cartfile.resolved @@ -0,0 +1,4 @@ +github "ashleymills/Reachability.swift" "v5.2.4" +github "devicekit/DeviceKit" "5.5.0" +github "getsentry/sentry-cocoa" "8.44.0" +github "weichsel/ZIPFoundation" "0.9.19" diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj index 387701c0953..94dea1d5c79 100644 --- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj +++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj @@ -26,11 +26,8 @@ 1645D5972036C9F80076C51B /* KMPKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1645D5962036C9F80076C51B /* KMPKeyboard.swift */; }; 165EB3A12098993900040A69 /* KeyboardError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EB3A02098993900040A69 /* KeyboardError.swift */; }; 29084CAB2CD48B5D004070E7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29084CAA2CD48B5D004070E7 /* Images.xcassets */; }; + 296EF2C72AFA26C700E3E384 /* ZIPFoundation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 296EF2C62AFA26C700E3E384 /* ZIPFoundation.xcframework */; }; 29B30C232B564F9900C342A4 /* KeymanEngineLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B30C222B564F9900C342A4 /* KeymanEngineLogger.swift */; }; - 29C3F3F52F2525F7000D1C6F /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3F42F2525F7000D1C6F /* DeviceKit */; }; - 29C3F3F82F25261D000D1C6F /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3F72F25261D000D1C6F /* Reachability */; }; - 29C3F3FB2F25263C000D1C6F /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3FA2F25263C000D1C6F /* ZIPFoundation */; }; - 29C3F3FE2F2526B7000D1C6F /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F3FD2F2526B7000D1C6F /* Sentry */; }; 29E202BD2CCB7541008B4740 /* KeyboardHeightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29E202BC2CCB7541008B4740 /* KeyboardHeightViewController.swift */; }; 377D10DE26846B8900467431 /* SpacebarTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377D10DD26846B8900467431 /* SpacebarTextViewController.swift */; }; 6CD5DFAA150F6DC8007A5DDE /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD5DFA8150F6DC8007A5DDE /* icon.png */; }; @@ -124,6 +121,9 @@ CE46D65D247B93C9005FD506 /* (null) in Resources */ = {isa = PBXBuildFile; }; CE5C8BE324B5B3BA00FAFB7F /* Queries+LexicalModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5C8BE224B5B3BA00FAFB7F /* Queries+LexicalModel.swift */; }; CE5C8BE524B5BD1C00FAFB7F /* QueryModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5C8BE424B5BD1C00FAFB7F /* QueryModelTests.swift */; }; + CE5EDDC726522EAA001733AC /* Sentry.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE5EDDC226522EAA001733AC /* Sentry.xcframework */; }; + CE5EDDC826522EAA001733AC /* Reachability.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE5EDDC326522EAA001733AC /* Reachability.xcframework */; }; + CE5EDDD52652372A001733AC /* DeviceKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE5EDDBB26522EA3001733AC /* DeviceKit.xcframework */; }; CE67D961228A6F190029F2B5 /* KeyboardCommandStructs.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE67D960228A6F190029F2B5 /* KeyboardCommandStructs.swift */; }; CE71705823A9C14D00A924A1 /* ResourceFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE71705723A9C14D00A924A1 /* ResourceFileManager.swift */; }; CE71705F23A9C97F00A924A1 /* PackageInstallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE71705E23A9C97F00A924A1 /* PackageInstallViewController.swift */; }; @@ -307,6 +307,7 @@ 2949146F2738DA6700400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/ResourceInfoView.strings"; sourceTree = ""; }; 294914702738DD7400400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/Localizable.strings"; sourceTree = ""; }; 294914712738DD9700400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "ff-NG"; path = "ff-NG.lproj/Localizable.stringsdict"; sourceTree = ""; }; + 296EF2C62AFA26C700E3E384 /* ZIPFoundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ZIPFoundation.xcframework; path = ../../Carthage/Build/ZIPFoundation.xcframework; sourceTree = ""; }; 297810FE297FAEDF007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/ResourceInfoView.strings; sourceTree = ""; }; 297810FF297FAEF8007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/Localizable.strings; sourceTree = ""; }; 29781100297FAF06007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = kn; path = kn.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -432,6 +433,9 @@ CE4459D323FBBB34003151FD /* KeymanEngineTestHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KeymanEngineTestHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; CE5C8BE224B5B3BA00FAFB7F /* Queries+LexicalModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Queries+LexicalModel.swift"; sourceTree = ""; }; CE5C8BE424B5BD1C00FAFB7F /* QueryModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueryModelTests.swift; sourceTree = ""; }; + CE5EDDBB26522EA3001733AC /* DeviceKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DeviceKit.xcframework; path = ../../Carthage/Build/DeviceKit.xcframework; sourceTree = ""; }; + CE5EDDC226522EAA001733AC /* Sentry.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../../Carthage/Build/Sentry.xcframework; sourceTree = ""; }; + CE5EDDC326522EAA001733AC /* Reachability.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Reachability.xcframework; path = ../../Carthage/Build/Reachability.xcframework; sourceTree = ""; }; CE67D960228A6F190029F2B5 /* KeyboardCommandStructs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardCommandStructs.swift; sourceTree = ""; }; CE71705723A9C14D00A924A1 /* ResourceFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourceFileManager.swift; sourceTree = ""; }; CE71705E23A9C97F00A924A1 /* PackageInstallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PackageInstallViewController.swift; sourceTree = ""; }; @@ -558,10 +562,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 29C3F3F52F2525F7000D1C6F /* DeviceKit in Frameworks */, - 29C3F3F82F25261D000D1C6F /* Reachability in Frameworks */, - 29C3F3FB2F25263C000D1C6F /* ZIPFoundation in Frameworks */, - 29C3F3FE2F2526B7000D1C6F /* Sentry in Frameworks */, + 296EF2C72AFA26C700E3E384 /* ZIPFoundation.xcframework in Frameworks */, + CE5EDDD52652372A001733AC /* DeviceKit.xcframework in Frameworks */, + CE5EDDC726522EAA001733AC /* Sentry.xcframework in Frameworks */, + CE5EDDC826522EAA001733AC /* Reachability.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -945,6 +949,10 @@ F243888114BBD43000A3E055 /* Frameworks */ = { isa = PBXGroup; children = ( + 296EF2C62AFA26C700E3E384 /* ZIPFoundation.xcframework */, + CE5EDDC326522EAA001733AC /* Reachability.xcframework */, + CE5EDDC226522EAA001733AC /* Sentry.xcframework */, + CE5EDDBB26522EA3001733AC /* DeviceKit.xcframework */, 9A079DE52231A69D00581263 /* Foundation.framework */, ); name = Frameworks; @@ -1213,12 +1221,6 @@ vi, ); mainGroup = F243887314BBD43000A3E055; - packageReferences = ( - 29C3F3F32F2525F7000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */, - 29C3F3F62F25261D000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */, - 29C3F3F92F25263C000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */, - 29C3F3FC2F2526B7000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */, - ); productRefGroup = F243887F14BBD43000A3E055 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1887,7 +1889,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -1898,7 +1900,6 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1944,7 +1945,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -1956,7 +1957,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; - FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; @@ -2108,7 +2108,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../Carthage/Build/"; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -2140,7 +2140,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -2151,7 +2151,6 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -2384,7 +2383,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../Carthage/Build/"; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -2427,7 +2426,7 @@ DEFINES_MODULE = YES; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../Carthage/Build/"; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -2582,64 +2581,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 29C3F3F32F2525F7000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/devicekit/DeviceKit.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 5.7.0; - }; - }; - 29C3F3F62F25261D000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/ashleymills/Reachability.swift"; - requirement = { - branch = master; - kind = branch; - }; - }; - 29C3F3F92F25263C000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/weichsel/ZIPFoundation.git"; - requirement = { - kind = exactVersion; - version = 0.9.20; - }; - }; - 29C3F3FC2F2526B7000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/getsentry/sentry-cocoa.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 9.2.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 29C3F3F42F2525F7000D1C6F /* DeviceKit */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F3F32F2525F7000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */; - productName = DeviceKit; - }; - 29C3F3F72F25261D000D1C6F /* Reachability */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F3F62F25261D000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */; - productName = Reachability; - }; - 29C3F3FA2F25263C000D1C6F /* ZIPFoundation */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F3F92F25263C000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */; - productName = ZIPFoundation; - }; - 29C3F3FD2F2526B7000D1C6F /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F3FC2F2526B7000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = F243887514BBD43000A3E055 /* Project object */; } diff --git a/ios/engine/build.sh b/ios/engine/build.sh index dc003db4566..39bd26118c0 100755 --- a/ios/engine/build.sh +++ b/ios/engine/build.sh @@ -28,6 +28,7 @@ if builder_is_debug_build; then fi builder_describe_outputs \ + configure /ios/Carthage/Build \ build /ios/build/Build/Products/Release/KeymanEngine.xcframework # Base definitions (must be before do_clean call) @@ -57,6 +58,29 @@ fi function do_clean () { # Possible TODO: can we clean the engine target without also cleaning the app target? rm -rf "$BUILD_PATH" + rm -rf Carthage +} + +function carthage_die() { + local msg="$1" + + # Don't leave a trace of the failed folder; we'd have to rebuild stuff anyway. + # This way, a later re-run doesn't think `configure` succeeded when it did not. + rm -rf Carthage + builder_die "$1" +} + +function do_carthage() { + # Carthage setup must be handled from the directory with the Cartfile / Cartfile.resolved, it seems. + pushd .. > /dev/null + + carthage checkout || carthage_die "Carthage dependency checkout failed" + + # --no-use-binaries: due to https://github.com/Carthage/Carthage/issues/3134, + # which affects the sentry-cocoa dependency. + carthage build --use-xcframeworks --no-use-binaries --platform iOS || carthage_die "Carthage dependency loading failed" + + popd > /dev/null } function do_packages() { @@ -68,6 +92,7 @@ function do_packages() { function do_configure ( ) { do_packages + do_carthage } # Manages KeymanEngine.bundle, which is included inside the :engine target. diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj index 9997aadfaf1..7292a3f91df 100644 --- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj +++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj @@ -14,11 +14,9 @@ 162E2C9F2092D36800F40769 /* UIDevice+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 162E2C9E2092D36800F40769 /* UIDevice+Extensions.swift */; }; 165EB39A2097165B00040A69 /* UIColor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EB3992097165B00040A69 /* UIColor+Extensions.swift */; }; 165EB39C2097181D00040A69 /* KMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EB39B2097181D00040A69 /* KMView.swift */; }; + 296EF2C42AFA267500E3E384 /* ZIPFoundation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */; }; + 296EF2C52AFA267500E3E384 /* ZIPFoundation.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 29B30C212B56325D00C342A4 /* KeymanLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29CA9A612B4F9B0B00EAB099 /* KeymanLogger.swift */; }; - 29C3F4012F2526CA000D1C6F /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4002F2526CA000D1C6F /* Sentry */; }; - 29C3F4042F2526E5000D1C6F /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4032F2526E5000D1C6F /* ZIPFoundation */; }; - 29C3F4072F2526F2000D1C6F /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4062F2526F2000D1C6F /* Reachability */; }; - 29C3F40A2F25270A000D1C6F /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 29C3F4092F25270A000D1C6F /* DeviceKit */; }; 29CA9A622B4F9B0B00EAB099 /* KeymanLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29CA9A612B4F9B0B00EAB099 /* KeymanLogger.swift */; }; 981AFA8F19EF44DE006706BF /* 724-info@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9815725518E4F0930014DF0C /* 724-info@2x.png */; }; 981AFA9619EF44DE006706BF /* MainViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 98ABADCE176935E500B62590 /* MainViewController_iPhone.xib */; }; @@ -150,6 +148,12 @@ CE80AD33257F2B4A008D2150 /* KeymanEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */; }; CE80AD34257F2B4B008D2150 /* KeymanEngine.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CEBD34322654FE3500EB2EA8 /* KeymanEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */; }; + CEBD343B2654FEB400EB2EA8 /* DeviceKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */; }; + CEBD343C2654FEB400EB2EA8 /* DeviceKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + CEBD343F2654FEB400EB2EA8 /* Reachability.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */; }; + CEBD34402654FEB400EB2EA8 /* Reachability.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + CEBD34412654FEB400EB2EA8 /* Sentry.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */; }; + CEBD34422654FEB400EB2EA8 /* Sentry.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CEF4E55623E95B7B0065B9C7 /* ImageBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEF4E55523E95B7B0065B9C7 /* ImageBanner.xib */; }; CEF4E55723E95B7B0065B9C7 /* ImageBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEF4E55523E95B7B0065B9C7 /* ImageBanner.xib */; }; CEF4E55923E967140065B9C7 /* ImageBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF4E55823E967140065B9C7 /* ImageBannerViewController.swift */; }; @@ -174,6 +178,10 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + CEBD34402654FEB400EB2EA8 /* Reachability.xcframework in Embed Frameworks */, + 296EF2C52AFA267500E3E384 /* ZIPFoundation.xcframework in Embed Frameworks */, + CEBD343C2654FEB400EB2EA8 /* DeviceKit.xcframework in Embed Frameworks */, + CEBD34422654FEB400EB2EA8 /* Sentry.xcframework in Embed Frameworks */, CE80AD34257F2B4B008D2150 /* KeymanEngine.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -192,6 +200,7 @@ 16A9229D20325253003CC98E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Keyman/Info.plist; sourceTree = SOURCE_ROOT; }; 293EA3E027059C6900545EED /* ha */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ha; path = ha.lproj/Localizable.strings; sourceTree = ""; }; 294914742738DF7700400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/Localizable.strings"; sourceTree = ""; }; + 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ZIPFoundation.xcframework; path = ../../Carthage/Build/ZIPFoundation.xcframework; sourceTree = ""; }; 297810FD297FA818007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/Localizable.strings; sourceTree = ""; }; 298566B829802828004ACA95 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 298566C42980C493004ACA95 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; }; @@ -327,6 +336,9 @@ CEACC90E25F07D58006EAB45 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; CEACC90F25F07D5A006EAB45 /* km */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = km; path = km.lproj/Localizable.strings; sourceTree = ""; }; CEACC91225F07D77006EAB45 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; + CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DeviceKit.xcframework; path = ../../Carthage/Build/DeviceKit.xcframework; sourceTree = ""; }; + CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Reachability.xcframework; path = ../../Carthage/Build/Reachability.xcframework; sourceTree = ""; }; + CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../../Carthage/Build/Sentry.xcframework; sourceTree = ""; }; CEBD3458265511B700EB2EA8 /* am */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = am; path = am.lproj/Localizable.strings; sourceTree = ""; }; CEEC468226F2F7BA009A5B7D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; CEEF81B92673019600EE6A07 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = ""; }; @@ -340,11 +352,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CEBD343F2654FEB400EB2EA8 /* Reachability.xcframework in Frameworks */, + 296EF2C42AFA267500E3E384 /* ZIPFoundation.xcframework in Frameworks */, + CEBD343B2654FEB400EB2EA8 /* DeviceKit.xcframework in Frameworks */, + CEBD34412654FEB400EB2EA8 /* Sentry.xcframework in Frameworks */, CE80AD33257F2B4A008D2150 /* KeymanEngine.framework in Frameworks */, - 29C3F40A2F25270A000D1C6F /* DeviceKit in Frameworks */, - 29C3F4072F2526F2000D1C6F /* Reachability in Frameworks */, - 29C3F4012F2526CA000D1C6F /* Sentry in Frameworks */, - 29C3F4042F2526E5000D1C6F /* ZIPFoundation in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -525,6 +537,10 @@ 98ABADB2176935E400B62590 /* Frameworks */ = { isa = PBXGroup; children = ( + 296EF2C32AFA267500E3E384 /* ZIPFoundation.xcframework */, + CEBD34352654FEB400EB2EA8 /* DeviceKit.xcframework */, + CEBD34372654FEB400EB2EA8 /* Reachability.xcframework */, + CEBD34382654FEB400EB2EA8 /* Sentry.xcframework */, CE80AD32257F2B4A008D2150 /* KeymanEngine.framework */, ); name = Frameworks; @@ -783,12 +799,6 @@ vi, ); mainGroup = 98ABADA7176935E400B62590; - packageReferences = ( - 29C3F3FF2F2526CA000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */, - 29C3F4022F2526E5000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */, - 29C3F4052F2526F2000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */, - 29C3F4082F25270A000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */, - ); productRefGroup = 98ABADB1176935E400B62590 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1117,11 +1127,9 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3YE4W86L3G; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; @@ -1139,7 +1147,6 @@ PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -1156,11 +1163,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3YE4W86L3G; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch"; INFOPLIST_FILE = Keyman/Info.plist; @@ -1176,7 +1181,6 @@ PRODUCT_NAME = Keyman; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Distribution"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; @@ -1216,7 +1220,10 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = ( + "$(PROJECT_DIR)", + "$(SRCROOT)/../../Carthage/Build/", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1268,7 +1275,10 @@ COPY_PHASE_STRIP = YES; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = ( + "$(PROJECT_DIR)", + "$(SRCROOT)/../../Carthage/Build/", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1299,10 +1309,8 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_ENTITLEMENTS = SWKeyboard/SWKeyboard.entitlements; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = 3YE4W86L3G; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1328,7 +1336,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development SWKeyboard"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution SWKeyboard"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -1412,7 +1419,10 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = ( + "$(PROJECT_DIR)", + "$(SRCROOT)/../../Carthage/Build/", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1442,11 +1452,9 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3YE4W86L3G; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; @@ -1464,7 +1472,6 @@ PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -1483,10 +1490,8 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_ENTITLEMENTS = SWKeyboard/SWKeyboard.entitlements; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = 3YE4W86L3G; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 3YE4W86L3G; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1512,7 +1517,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "Keyman Development SWKeyboard"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keyman Distribution SWKeyboard"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -1557,64 +1561,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 29C3F3FF2F2526CA000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/getsentry/sentry-cocoa.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 9.2.0; - }; - }; - 29C3F4022F2526E5000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/weichsel/ZIPFoundation.git"; - requirement = { - kind = exactVersion; - version = 0.9.20; - }; - }; - 29C3F4052F2526F2000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/ashleymills/Reachability.swift"; - requirement = { - branch = master; - kind = branch; - }; - }; - 29C3F4082F25270A000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/devicekit/DeviceKit.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 5.7.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 29C3F4002F2526CA000D1C6F /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F3FF2F2526CA000D1C6F /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; - 29C3F4032F2526E5000D1C6F /* ZIPFoundation */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F4022F2526E5000D1C6F /* XCRemoteSwiftPackageReference "ZIPFoundation" */; - productName = ZIPFoundation; - }; - 29C3F4062F2526F2000D1C6F /* Reachability */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F4052F2526F2000D1C6F /* XCRemoteSwiftPackageReference "Reachability" */; - productName = Reachability; - }; - 29C3F4092F25270A000D1C6F /* DeviceKit */ = { - isa = XCSwiftPackageProductDependency; - package = 29C3F4082F25270A000D1C6F /* XCRemoteSwiftPackageReference "DeviceKit" */; - productName = DeviceKit; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 98ABADA8176935E400B62590 /* Project object */; } diff --git a/ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 8f793256012..00000000000 --- a/ios/keymanios.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,42 +0,0 @@ -{ - "originHash" : "a373bd824b59e33f7208114e4d77d167cc3f88776f323dd66ef0d5e716c837af", - "pins" : [ - { - "identity" : "devicekit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/devicekit/DeviceKit.git", - "state" : { - "revision" : "581df61650bc457ec00373a592a84be3e7468eb1", - "version" : "5.7.0" - } - }, - { - "identity" : "reachability.swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ashleymills/Reachability.swift", - "state" : { - "branch" : "master", - "revision" : "21d1dc412cfecbe6e34f1f4c4eb88d3f912654a6" - } - }, - { - "identity" : "sentry-cocoa", - "kind" : "remoteSourceControl", - "location" : "https://github.com/getsentry/sentry-cocoa.git", - "state" : { - "revision" : "de66bd4fa0661c81455e8ad2509ed6f0e39025dc", - "version" : "9.2.0" - } - }, - { - "identity" : "zipfoundation", - "kind" : "remoteSourceControl", - "location" : "https://github.com/weichsel/ZIPFoundation.git", - "state" : { - "revision" : "22787ffb59de99e5dc1fbfe80b19c97a904ad48d", - "version" : "0.9.20" - } - } - ], - "version" : 3 -} From aa86cfceca3b3813f021cd74b3609e1aa9fdd6d3 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Mon, 26 Jan 2026 12:46:05 -0500 Subject: [PATCH 6/7] maint(ios): upgrade Sentry version --- ios/Cartfile | 2 +- ios/Cartfile.resolved | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Cartfile b/ios/Cartfile index 9ffc07d3305..f0eb983c5e8 100644 --- a/ios/Cartfile +++ b/ios/Cartfile @@ -1,4 +1,4 @@ github "weichsel/ZIPFoundation" ~> 0.9 github "devicekit/DeviceKit" ~> 5.0 github "ashleymills/Reachability.swift" -github "getsentry/sentry-cocoa" ~> 8.38.0 +github "getsentry/sentry-cocoa" ~> 8.57.3 diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved index ca05da1ae94..54775dca044 100644 --- a/ios/Cartfile.resolved +++ b/ios/Cartfile.resolved @@ -1,4 +1,4 @@ github "ashleymills/Reachability.swift" "v5.2.4" -github "devicekit/DeviceKit" "5.5.0" -github "getsentry/sentry-cocoa" "8.44.0" -github "weichsel/ZIPFoundation" "0.9.19" +github "devicekit/DeviceKit" "5.7.0" +github "getsentry/sentry-cocoa" "8.58.0" +github "weichsel/ZIPFoundation" "0.9.20" From d9bbffcd1239cd13518eeda79b1e044acfabeffd Mon Sep 17 00:00:00 2001 From: sgschantz Date: Wed, 28 Jan 2026 18:20:06 -0500 Subject: [PATCH 7/7] maint(ios): update sentry version Fixes: #15475 --- ios/Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Cartfile b/ios/Cartfile index f0eb983c5e8..49beca6729c 100644 --- a/ios/Cartfile +++ b/ios/Cartfile @@ -1,4 +1,4 @@ github "weichsel/ZIPFoundation" ~> 0.9 github "devicekit/DeviceKit" ~> 5.0 github "ashleymills/Reachability.swift" -github "getsentry/sentry-cocoa" ~> 8.57.3 +github "getsentry/sentry-cocoa" ~> 8.58