From 8274ecd7ffdd4389a662776e124b3204b8b4b408 Mon Sep 17 00:00:00 2001 From: Christoph Krey Date: Tue, 17 Sep 2024 11:34:37 +0200 Subject: [PATCH] [NEW] update MQTTClient to iOS 16 --- OwnTracks/Podfile.lock | 6 +- .../Pods/Local Podspecs/mqttc.podspec.json | 10 +-- OwnTracks/Pods/Manifest.lock | 6 +- OwnTracks/Pods/Pods.xcodeproj/project.pbxproj | 78 +++++++++---------- .../mqttc/mqttc-Info.plist | 2 +- .../MQTTClient/MQTTClient/MQTTNWTransport.m | 4 +- 6 files changed, 54 insertions(+), 52 deletions(-) diff --git a/OwnTracks/Podfile.lock b/OwnTracks/Podfile.lock index 15087069..6a2d8f36 100644 --- a/OwnTracks/Podfile.lock +++ b/OwnTracks/Podfile.lock @@ -4,7 +4,7 @@ PODS: - CocoaLumberjack/Core (= 3.8.5) - CocoaLumberjack/Core (3.8.5) - DSJSONSchemaValidation (2.0.7) - - mqttc/MinL (14.0.1): + - mqttc/MinL (18.0.1): - CocoaLumberjack - Sodium (0.9.1) @@ -32,14 +32,14 @@ CHECKOUT OPTIONS: :commit: 73f175043330748ec408b0e4ec3f7b95622125b8 :git: https://github.com/k06a/ABStaticTableViewController.git mqttc: - :commit: 72e8ad1a45f312d380bdfeb9a445eba3ebd2104c + :commit: 013458a85c423f15fa9eeaa2efaa8a7b89df6eb5 :git: https://github.com/ckrey/mqttc.git SPEC CHECKSUMS: ABStaticTableViewController: d8cfbdd596fbf58b515b13e49cc8ca8ca86c6e12 CocoaLumberjack: 6a459bc897d6d80bd1b8c78482ec7ad05dffc3f0 DSJSONSchemaValidation: 46e30ccfa9908c49d184f453d556f55aa0aac1ff - mqttc: b9a739726c2c7f154d801193b2c2a9a63df59ccb + mqttc: e1fc06611080e51983d47050497df415d7a7ab90 Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da PODFILE CHECKSUM: 5bcc9521a761314c49864e23e5c00c40d0ec53a8 diff --git a/OwnTracks/Pods/Local Podspecs/mqttc.podspec.json b/OwnTracks/Pods/Local Podspecs/mqttc.podspec.json index 8eadc655..757a6b62 100644 --- a/OwnTracks/Pods/Local Podspecs/mqttc.podspec.json +++ b/OwnTracks/Pods/Local Podspecs/mqttc.podspec.json @@ -1,6 +1,6 @@ { "name": "mqttc", - "version": "14.0.1", + "version": "18.0.1", "summary": "iOS, macOS, watchOS and tvOS native ObjectiveC MQTT Client Framework", "homepage": "https://github.com/ckrey/mqttc", "license": { @@ -17,10 +17,10 @@ }, "requires_arc": true, "platforms": { - "ios": "13.1", - "osx": "10.15", - "tvos": "13.1", - "watchos": "6.1" + "ios": "16", + "osx": "12", + "tvos": "16", + "watchos": "9" }, "default_subspecs": "Core", "subspecs": [ diff --git a/OwnTracks/Pods/Manifest.lock b/OwnTracks/Pods/Manifest.lock index 15087069..6a2d8f36 100644 --- a/OwnTracks/Pods/Manifest.lock +++ b/OwnTracks/Pods/Manifest.lock @@ -4,7 +4,7 @@ PODS: - CocoaLumberjack/Core (= 3.8.5) - CocoaLumberjack/Core (3.8.5) - DSJSONSchemaValidation (2.0.7) - - mqttc/MinL (14.0.1): + - mqttc/MinL (18.0.1): - CocoaLumberjack - Sodium (0.9.1) @@ -32,14 +32,14 @@ CHECKOUT OPTIONS: :commit: 73f175043330748ec408b0e4ec3f7b95622125b8 :git: https://github.com/k06a/ABStaticTableViewController.git mqttc: - :commit: 72e8ad1a45f312d380bdfeb9a445eba3ebd2104c + :commit: 013458a85c423f15fa9eeaa2efaa8a7b89df6eb5 :git: https://github.com/ckrey/mqttc.git SPEC CHECKSUMS: ABStaticTableViewController: d8cfbdd596fbf58b515b13e49cc8ca8ca86c6e12 CocoaLumberjack: 6a459bc897d6d80bd1b8c78482ec7ad05dffc3f0 DSJSONSchemaValidation: 46e30ccfa9908c49d184f453d556f55aa0aac1ff - mqttc: b9a739726c2c7f154d801193b2c2a9a63df59ccb + mqttc: e1fc06611080e51983d47050497df415d7a7ab90 Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da PODFILE CHECKSUM: 5bcc9521a761314c49864e23e5c00c40d0ec53a8 diff --git a/OwnTracks/Pods/Pods.xcodeproj/project.pbxproj b/OwnTracks/Pods/Pods.xcodeproj/project.pbxproj index e21f770f..2e1a4176 100644 --- a/OwnTracks/Pods/Pods.xcodeproj/project.pbxproj +++ b/OwnTracks/Pods/Pods.xcodeproj/project.pbxproj @@ -1699,41 +1699,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 0ABF8FB5BF9CA697E0B3A08D0A137D74 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 8E34C205EF9B4CCA9E2FE69D04B10BF9 /* mqttc.debug.xcconfig */; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/mqttc/mqttc-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/mqttc/mqttc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 16.6; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MODULEMAP_FILE = "Target Support Files/mqttc/mqttc.modulemap"; - PRODUCT_MODULE_NAME = mqttc; - PRODUCT_NAME = mqttc; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; 0B81D513057850284EB364CAAA363E0F /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 2E8E46FC48056D67AB53541622988A3A /* Pods-OwnTracks.release.xcconfig */; @@ -2081,6 +2046,41 @@ }; name = Debug; }; + 772B7C4688499841CB1E78E9D13CD139 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8E34C205EF9B4CCA9E2FE69D04B10BF9 /* mqttc.debug.xcconfig */; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/mqttc/mqttc-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/mqttc/mqttc-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 16; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MODULEMAP_FILE = "Target Support Files/mqttc/mqttc.modulemap"; + PRODUCT_MODULE_NAME = mqttc; + PRODUCT_NAME = mqttc; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; 957F0F7F85250F604E6E637B1B9134E8 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 6C5BD630F6479B3C01F6BB5699D5176C /* ABStaticTableViewController.release.xcconfig */; @@ -2116,7 +2116,7 @@ }; name = Release; }; - ABD01F5789DA36036A94340C76F2538F /* Release */ = { + A2DC55A3EDA4002010636BFF41BF61DE /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 43ED6FDF79500E58B2120CABB567AD66 /* mqttc.release.xcconfig */; buildSettings = { @@ -2132,7 +2132,7 @@ GCC_PREFIX_HEADER = "Target Support Files/mqttc/mqttc-prefix.pch"; INFOPLIST_FILE = "Target Support Files/mqttc/mqttc-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 16.6; + IPHONEOS_DEPLOYMENT_TARGET = 16; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2311,8 +2311,8 @@ 41BB42EB051A4850016D2F54ACEAE763 /* Build configuration list for PBXNativeTarget "mqttc" */ = { isa = XCConfigurationList; buildConfigurations = ( - 0ABF8FB5BF9CA697E0B3A08D0A137D74 /* Debug */, - ABD01F5789DA36036A94340C76F2538F /* Release */, + 772B7C4688499841CB1E78E9D13CD139 /* Debug */, + A2DC55A3EDA4002010636BFF41BF61DE /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/OwnTracks/Pods/Target Support Files/mqttc/mqttc-Info.plist b/OwnTracks/Pods/Target Support Files/mqttc/mqttc-Info.plist index 5810a34b..0ae2c161 100644 --- a/OwnTracks/Pods/Target Support Files/mqttc/mqttc-Info.plist +++ b/OwnTracks/Pods/Target Support Files/mqttc/mqttc-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 14.0.1 + 18.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/OwnTracks/Pods/mqttc/MQTTClient/MQTTClient/MQTTNWTransport.m b/OwnTracks/Pods/mqttc/MQTTClient/MQTTClient/MQTTNWTransport.m index 15ef6ac3..2dc6b891 100644 --- a/OwnTracks/Pods/mqttc/MQTTClient/MQTTClient/MQTTNWTransport.m +++ b/OwnTracks/Pods/mqttc/MQTTClient/MQTTClient/MQTTNWTransport.m @@ -168,13 +168,15 @@ - (void)URLSession:(NSURLSession *)session DDLogVerbose(@"[MQTTNWTransport] SecTrustGetCertificateCount %ld", (long)certificateCount); + CFArrayRef certs = SecTrustCopyCertificateChain(challenge.protectionSpace.serverTrust); for (CFIndex index = 0; index < certificateCount; index++) { - SecCertificateRef certificateRef = SecTrustGetCertificateAtIndex(challenge.protectionSpace.serverTrust, index); + SecCertificateRef certificateRef = (SecCertificateRef)CFArrayGetValueAtIndex(certs, index); NSString *summary = (NSString*)CFBridgingRelease( SecCertificateCopySubjectSummary(certificateRef) ); DDLogVerbose(@"[MQTTNWTransport] SecCertificateCopySubjectSummary %@", summary); } + CFRelease(certs); if (self.allowUntrustedCertificates) { if ([challenge.protectionSpace.host isEqualToString:self.host]) {