Update Obj-C and Swift wrappers. (#1020)

* update Package.swift * update Cartfile * update Cartfile.resolved * themis.podspec: spec new dependency * set 0.15.1 version in xcodeproj * update versions in Package.swift and themis.podspec * fix projects settings * update changelog * set 0.15.1 version in examples * disable bitcode in project * update podspec * increase iOS version in Objc Tests Podfile
cossacklabs · Sep 14, 2023 · 7f06746 · 7f06746
1 parent d925c3b
commit 7f06746
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 Changes that are currently in development and have not been released yet.
 
+## [0.15.1](https://github.com/cossacklabs/themis/releases/tag/0.15.1), September 13 2023
+
+### Swift, Objective-C wrappers 
+- Updated OpenSSL to 1.1.1v 
+- Removed support of 32-bit platforms 
+- Minimum iOS: 11, macOS: 10.13, Catalyst: 14 
+
 ## [0.15.0](https://github.com/cossacklabs/themis/releases/tag/0.15.0), June 21st 2023
 
 **TL;DR:**

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,3 @@
-# OpenSSL 1.1.1k
-binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-xcframework.json" == 1.1.11101
+# OpenSSL 1.1.1v - we need this to build themis framework. 
+binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-xcframework.json" == 1.1.12201
+
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-xcframework.json" "1.1.11101"
+binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-xcframework.json" "1.1.12201"
diff --git a/Package.swift b/Package.swift
@@ -15,11 +15,11 @@ let package = Package(
     targets: [
         .binaryTarget(name: "themis",
                       // update version in URL path
-                      url: "https://github.com/cossacklabs/themis/releases/download/0.14.0/themis.xcframework.zip",
+                      url: "https://github.com/cossacklabs/themis/releases/download/0.15.1/themis.xcframework.zip",
                       // The scripts/create_xcframework.sh calculates the checksum when generating the XCF.
                       // Alternatively, run from package directory:
                       // swift package compute-checksum build/xcf_output/themis.xcframework.zip
-                      checksum: "182587c9070b94e552816d3cc174d64ea0f0a64d5b19483210bcf3dcac4d2658"),
+                      checksum: "2d5bfbba7d5d3ecd0d40acdaee65d1b5d42dee5df5ae9d99faec4119087238c5"),
 
     ]
 )
diff --git a/Themis.xcodeproj/project.pbxproj b/Themis.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 56;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -1022,7 +1022,7 @@
 				};
 			};
 			buildConfigurationList = 738B81092239809D00A9947C /* Build configuration list for PBXProject "Themis" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 14.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -1321,7 +1321,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1342,9 +1342,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 0.15.1;
 				ONLY_ACTIVE_ARCH = YES;
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -1387,7 +1387,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1402,9 +1402,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 0.15.1;
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1439,7 +1439,8 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.14.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 0.15.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
 				PRODUCT_MODULE_NAME = themis;
 				PRODUCT_NAME = themis;
@@ -1475,7 +1476,8 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.14.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 0.15.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
 				PRODUCT_MODULE_NAME = themis;
 				PRODUCT_NAME = themis;
@@ -1488,15 +1490,16 @@
 		9F4A24A7223A8D7F005CB63A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 11;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
+				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
 				EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/wrappers/themis/Obj-C/exported.symbols";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1510,15 +1513,17 @@
 				);
 				INFOPLIST_FILE = "src/wrappers/themis/Obj-c/Themis/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.14.0;
+				MARKETING_VERSION = 0.15.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
 				PRODUCT_MODULE_NAME = themis;
 				PRODUCT_NAME = themis;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
@@ -1529,15 +1534,16 @@
 		9F4A24A8223A8D7F005CB63A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 11;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
+				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
 				EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/wrappers/themis/Obj-C/exported.symbols";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1551,15 +1557,17 @@
 				);
 				INFOPLIST_FILE = "src/wrappers/themis/Obj-c/Themis/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.14.0;
+				MARKETING_VERSION = 0.15.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
 				PRODUCT_MODULE_NAME = themis;
 				PRODUCT_NAME = themis;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;

diff --git a/docs/examples/objc/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/objc/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1D0749F228D10B6A00EAF77F /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1D0749F128D10B6A00EAF77F /* themis */; };
+		1DD6A1AF2AB0E1510086E940 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1DD6A1AE2AB0E1510086E940 /* themis */; };
 		6D93CFF9263C294600ED53C4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D93CFF8263C294600ED53C4 /* AppDelegate.m */; };
 		6D93CFFC263C294600ED53C4 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D93CFFB263C294600ED53C4 /* SceneDelegate.m */; };
 		6D93CFFF263C294600ED53C4 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D93CFFE263C294600ED53C4 /* ViewController.m */; };
@@ -45,7 +45,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1D0749F228D10B6A00EAF77F /* themis in Frameworks */,
+				1DD6A1AF2AB0E1510086E940 /* themis in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -115,7 +115,7 @@
 			);
 			name = ThemisTest;
 			packageProductDependencies = (
-				1D0749F128D10B6A00EAF77F /* themis */,
+				1DD6A1AE2AB0E1510086E940 /* themis */,
 			);
 			productName = ThemisTest;
 			productReference = 6D93CFF4263C294600ED53C4 /* ThemisTest.app */;
@@ -144,7 +144,7 @@
 			);
 			mainGroup = 6D93CFEB263C294600ED53C4;
 			packageReferences = (
-				1D0749F028D10B6A00EAF77F /* XCRemoteSwiftPackageReference "themis" */,
+				1DD6A1AD2AB0E1510086E940 /* XCRemoteSwiftPackageReference "themis" */,
 			);
 			productRefGroup = 6D93CFF5263C294600ED53C4 /* Products */;
 			projectDirPath = "";
@@ -323,10 +323,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
 				CURRENT_PROJECT_VERSION = 2021122301;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ThemisTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -345,10 +345,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
 				CURRENT_PROJECT_VERSION = 2021122301;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ThemisTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -386,20 +386,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		1D0749F028D10B6A00EAF77F /* XCRemoteSwiftPackageReference "themis" */ = {
+		1DD6A1AD2AB0E1510086E940 /* XCRemoteSwiftPackageReference "themis" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/cossacklabs/themis";
 			requirement = {
-				kind = exactVersion;
-				version = 0.14.9;
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.15.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		1D0749F128D10B6A00EAF77F /* themis */ = {
+		1DD6A1AE2AB0E1510086E940 /* themis */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 1D0749F028D10B6A00EAF77F /* XCRemoteSwiftPackageReference "themis" */;
+			package = 1DD6A1AD2AB0E1510086E940 /* XCRemoteSwiftPackageReference "themis" */;
 			productName = themis;
 		};
 /* End XCSwiftPackageProductDependency section */

diff --git a/...jc/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...jc/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/cossacklabs/themis",
       "state" : {
-        "revision" : "b573ad970462e5ccc9dbafe5d954e57dcc386ba8",
-        "version" : "0.14.9"
+        "revision" : "d925c3ba6bb13bf1914a58f2380dfac4698aa09e",
+        "version" : "0.15.0"
       }
     }
   ],

diff --git a/docs/examples/objc/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/objc/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1DC9905A28D10F9800179131 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1DC9905928D10F9800179131 /* themis */; };
+		1D39D6D72AB0E95900AAE562 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1D39D6D62AB0E95900AAE562 /* themis */; };
 		6D445235263C2B4C00871215 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D445234263C2B4C00871215 /* AppDelegate.m */; };
 		6D445238263C2B4C00871215 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D445237263C2B4C00871215 /* ViewController.m */; };
 		6D44523A263C2B4E00871215 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6D445239263C2B4E00871215 /* Assets.xcassets */; };
@@ -41,7 +41,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1DC9905A28D10F9800179131 /* themis in Frameworks */,
+				1D39D6D72AB0E95900AAE562 /* themis in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -109,7 +109,7 @@
 			);
 			name = ThemisTest;
 			packageProductDependencies = (
-				1DC9905928D10F9800179131 /* themis */,
+				1D39D6D62AB0E95900AAE562 /* themis */,
 			);
 			productName = ThemisTest;
 			productReference = 6D445230263C2B4C00871215 /* ThemisTest.app */;
@@ -138,7 +138,7 @@
 			);
 			mainGroup = 6D445227263C2B4C00871215;
 			packageReferences = (
-				1DC9905828D10F9800179131 /* XCRemoteSwiftPackageReference "themis" */,
+				1D39D6D52AB0E95900AAE562 /* XCRemoteSwiftPackageReference "themis" */,
 			);
 			productRefGroup = 6D445231263C2B4C00871215 /* Products */;
 			projectDirPath = "";
@@ -363,20 +363,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		1DC9905828D10F9800179131 /* XCRemoteSwiftPackageReference "themis" */ = {
+		1D39D6D52AB0E95900AAE562 /* XCRemoteSwiftPackageReference "themis" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/cossacklabs/themis";
 			requirement = {
-				kind = exactVersion;
-				version = 0.14.9;
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.15.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		1DC9905928D10F9800179131 /* themis */ = {
+		1D39D6D62AB0E95900AAE562 /* themis */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 1DC9905828D10F9800179131 /* XCRemoteSwiftPackageReference "themis" */;
+			package = 1D39D6D52AB0E95900AAE562 /* XCRemoteSwiftPackageReference "themis" */;
 			productName = themis;
 		};
 /* End XCSwiftPackageProductDependency section */

diff --git a/.../macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/.../macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/cossacklabs/themis",
       "state" : {
-        "revision" : "b573ad970462e5ccc9dbafe5d954e57dcc386ba8",
-        "version" : "0.14.9"
+        "revision" : "d925c3ba6bb13bf1914a58f2380dfac4698aa09e",
+        "version" : "0.15.0"
       }
     }
   ],