Obj-C and Swift example updates (#947)

cossacklabs · Sep 14, 2022 · 05df0a4 · 05df0a4
1 parent b573ad9
commit 05df0a4
Show file tree

Hide file tree

Showing 14 changed files with 116 additions and 115 deletions.
diff --git a/docs/examples/objc/iOS-CocoaPods/Podfile b/docs/examples/objc/iOS-CocoaPods/Podfile
@@ -23,6 +23,6 @@ use_frameworks!
 
 target :"ThemisTest" do
 
-  pod 'themis', '0.13.10'
+  pod 'themis', '0.14.0'
 
 end
diff --git a/docs/examples/objc/iOS-CocoaPods/Podfile.lock b/docs/examples/objc/iOS-CocoaPods/Podfile.lock
@@ -1,19 +1,19 @@
 PODS:
   - CLOpenSSL-XCF (1.1.11101)
-  - themis (0.13.10):
-    - themis/openssl-1.1.1 (= 0.13.10)
-  - themis/openssl-1.1.1 (0.13.10):
+  - themis (0.14.0):
+    - themis/openssl-1.1.1 (= 0.14.0)
+  - themis/openssl-1.1.1 (0.14.0):
     - CLOpenSSL-XCF (= 1.1.11101)
-    - themis/openssl-1.1.1/core (= 0.13.10)
-    - themis/openssl-1.1.1/objcwrapper (= 0.13.10)
-  - themis/openssl-1.1.1/core (0.13.10):
+    - themis/openssl-1.1.1/core (= 0.14.0)
+    - themis/openssl-1.1.1/objcwrapper (= 0.14.0)
+  - themis/openssl-1.1.1/core (0.14.0):
     - CLOpenSSL-XCF (= 1.1.11101)
-  - themis/openssl-1.1.1/objcwrapper (0.13.10):
+  - themis/openssl-1.1.1/objcwrapper (0.14.0):
     - CLOpenSSL-XCF (= 1.1.11101)
     - themis/openssl-1.1.1/core
 
 DEPENDENCIES:
-  - themis (= 0.13.10)
+  - themis (= 0.14.0)
 
 SPEC REPOS:
   trunk:
@@ -22,8 +22,8 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   CLOpenSSL-XCF: 71ce1fb96734754ea5936e239e15999129413793
-  themis: 1fc3604d5efabec8e7f004701ba5413de9a52ccc
+  themis: 4bcef173f13a428822f8db4cb504e4c7b2c302b1
 
-PODFILE CHECKSUM: 015d2f867c3c97acda2d4da730a61438e08c0528
+PODFILE CHECKSUM: c544df5cbc47ee301679b77bbdbc4d4509f4d351
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.3
diff --git a/docs/examples/objc/iOS-CocoaPods/ThemisTest/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/objc/iOS-CocoaPods/ThemisTest/ThemisTest.xcodeproj/project.pbxproj
@@ -245,7 +245,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-ThemisTest/Pods-ThemisTest-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/themis/themis.framework",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/openssl/openssl.framework/openssl",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/CLOpenSSL-XCF/openssl.framework/openssl",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (

diff --git a/docs/examples/objc/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/objc/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj
@@ -7,14 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1D0749F228D10B6A00EAF77F /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1D0749F128D10B6A00EAF77F /* 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 */; };
 		6D93D002263C294600ED53C4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6D93D000263C294600ED53C4 /* Main.storyboard */; };
 		6D93D004263C294900ED53C4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6D93D003263C294900ED53C4 /* Assets.xcassets */; };
 		6D93D007263C294900ED53C4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6D93D005263C294900ED53C4 /* LaunchScreen.storyboard */; };
 		6D93D00A263C294900ED53C4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D93D009263C294900ED53C4 /* main.m */; };
-		6DC890F2263C29EF003DA2AB /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 6DC890F1263C29EF003DA2AB /* themis */; };
 		6DC890FA263C2AF6003DA2AB /* server.priv in Resources */ = {isa = PBXBuildFile; fileRef = 6DC890F6263C2AF6003DA2AB /* server.priv */; };
 		6DC890FB263C2AF6003DA2AB /* client.pub in Resources */ = {isa = PBXBuildFile; fileRef = 6DC890F7263C2AF6003DA2AB /* client.pub */; };
 		6DC890FC263C2AF6003DA2AB /* server.pub in Resources */ = {isa = PBXBuildFile; fileRef = 6DC890F8263C2AF6003DA2AB /* server.pub */; };
@@ -45,7 +45,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6DC890F2263C29EF003DA2AB /* themis in Frameworks */,
+				1D0749F228D10B6A00EAF77F /* themis in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -115,7 +115,7 @@
 			);
 			name = ThemisTest;
 			packageProductDependencies = (
-				6DC890F1263C29EF003DA2AB /* themis */,
+				1D0749F128D10B6A00EAF77F /* themis */,
 			);
 			productName = ThemisTest;
 			productReference = 6D93CFF4263C294600ED53C4 /* ThemisTest.app */;
@@ -144,7 +144,7 @@
 			);
 			mainGroup = 6D93CFEB263C294600ED53C4;
 			packageReferences = (
-				6DC890F0263C29EF003DA2AB /* XCRemoteSwiftPackageReference "themis" */,
+				1D0749F028D10B6A00EAF77F /* XCRemoteSwiftPackageReference "themis" */,
 			);
 			productRefGroup = 6D93CFF5263C294600ED53C4 /* Products */;
 			projectDirPath = "";
@@ -324,12 +324,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ThemisTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis.spm2.ThemisTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -343,12 +345,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ThemisTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis.spm2.ThemisTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -380,20 +384,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		6DC890F0263C29EF003DA2AB /* XCRemoteSwiftPackageReference "themis" */ = {
+		1D0749F028D10B6A00EAF77F /* XCRemoteSwiftPackageReference "themis" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/cossacklabs/themis";
 			requirement = {
 				kind = exactVersion;
-				version = 0.13.7;
+				version = 0.14.9;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		6DC890F1263C29EF003DA2AB /* themis */ = {
+		1D0749F128D10B6A00EAF77F /* themis */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 6DC890F0263C29EF003DA2AB /* XCRemoteSwiftPackageReference "themis" */;
+			package = 1D0749F028D10B6A00EAF77F /* 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
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "themis",
-        "repositoryURL": "https://github.com/cossacklabs/themis",
-        "state": {
-          "branch": null,
-          "revision": "68b485b8017098fce723e0839ecb9543d32463f6",
-          "version": "0.13.7"
-        }
+  "pins" : [
+    {
+      "identity" : "themis",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/cossacklabs/themis",
+      "state" : {
+        "revision" : "b573ad970462e5ccc9dbafe5d954e57dcc386ba8",
+        "version" : "0.14.9"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/docs/examples/objc/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/objc/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj
@@ -7,12 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1DC9905A28D10F9800179131 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1DC9905928D10F9800179131 /* 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 */; };
 		6D44523D263C2B4E00871215 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6D44523B263C2B4E00871215 /* Main.storyboard */; };
 		6D445240263C2B4E00871215 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D44523F263C2B4E00871215 /* main.m */; };
-		6D44524A263C2BA500871215 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 6D445249263C2BA500871215 /* themis */; };
 		6D445251263C2BAE00871215 /* server.priv in Resources */ = {isa = PBXBuildFile; fileRef = 6D44524D263C2BAE00871215 /* server.priv */; };
 		6D445252263C2BAE00871215 /* client.pub in Resources */ = {isa = PBXBuildFile; fileRef = 6D44524E263C2BAE00871215 /* client.pub */; };
 		6D445253263C2BAE00871215 /* server.pub in Resources */ = {isa = PBXBuildFile; fileRef = 6D44524F263C2BAE00871215 /* server.pub */; };
@@ -41,7 +41,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6D44524A263C2BA500871215 /* themis in Frameworks */,
+				1DC9905A28D10F9800179131 /* themis in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -109,7 +109,7 @@
 			);
 			name = ThemisTest;
 			packageProductDependencies = (
-				6D445249263C2BA500871215 /* themis */,
+				1DC9905928D10F9800179131 /* themis */,
 			);
 			productName = ThemisTest;
 			productReference = 6D445230263C2B4C00871215 /* ThemisTest.app */;
@@ -138,7 +138,7 @@
 			);
 			mainGroup = 6D445227263C2B4C00871215;
 			packageReferences = (
-				6D445248263C2BA500871215 /* XCRemoteSwiftPackageReference "themis" */,
+				1DC9905828D10F9800179131 /* XCRemoteSwiftPackageReference "themis" */,
 			);
 			productRefGroup = 6D445231263C2B4C00871215 /* Products */;
 			projectDirPath = "";
@@ -309,6 +309,7 @@
 				CODE_SIGN_ENTITLEMENTS = ThemisTest/ThemisTest.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ThemisTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -327,6 +328,7 @@
 				CODE_SIGN_ENTITLEMENTS = ThemisTest/ThemisTest.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ThemisTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -361,20 +363,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		6D445248263C2BA500871215 /* XCRemoteSwiftPackageReference "themis" */ = {
+		1DC9905828D10F9800179131 /* XCRemoteSwiftPackageReference "themis" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/cossacklabs/themis";
 			requirement = {
 				kind = exactVersion;
-				version = 0.13.7;
+				version = 0.14.9;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		6D445249263C2BA500871215 /* themis */ = {
+		1DC9905928D10F9800179131 /* themis */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 6D445248263C2BA500871215 /* XCRemoteSwiftPackageReference "themis" */;
+			package = 1DC9905828D10F9800179131 /* 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
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "themis",
-        "repositoryURL": "https://github.com/cossacklabs/themis",
-        "state": {
-          "branch": null,
-          "revision": "68b485b8017098fce723e0839ecb9543d32463f6",
-          "version": "0.13.7"
-        }
+  "pins" : [
+    {
+      "identity" : "themis",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/cossacklabs/themis",
+      "state" : {
+        "revision" : "b573ad970462e5ccc9dbafe5d954e57dcc386ba8",
+        "version" : "0.14.9"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/docs/examples/swift/iOS-CocoaPods/Podfile b/docs/examples/swift/iOS-CocoaPods/Podfile
@@ -23,6 +23,6 @@ use_frameworks!
 
 target :"ThemisSwift" do
 
-  pod 'themis', '0.13.10'
+  pod 'themis', '0.14.0'
 
 end
diff --git a/docs/examples/swift/iOS-CocoaPods/Podfile.lock b/docs/examples/swift/iOS-CocoaPods/Podfile.lock
@@ -1,19 +1,19 @@
 PODS:
   - CLOpenSSL-XCF (1.1.11101)
-  - themis (0.13.10):
-    - themis/openssl-1.1.1 (= 0.13.10)
-  - themis/openssl-1.1.1 (0.13.10):
+  - themis (0.14.0):
+    - themis/openssl-1.1.1 (= 0.14.0)
+  - themis/openssl-1.1.1 (0.14.0):
     - CLOpenSSL-XCF (= 1.1.11101)
-    - themis/openssl-1.1.1/core (= 0.13.10)
-    - themis/openssl-1.1.1/objcwrapper (= 0.13.10)
-  - themis/openssl-1.1.1/core (0.13.10):
+    - themis/openssl-1.1.1/core (= 0.14.0)
+    - themis/openssl-1.1.1/objcwrapper (= 0.14.0)
+  - themis/openssl-1.1.1/core (0.14.0):
     - CLOpenSSL-XCF (= 1.1.11101)
-  - themis/openssl-1.1.1/objcwrapper (0.13.10):
+  - themis/openssl-1.1.1/objcwrapper (0.14.0):
     - CLOpenSSL-XCF (= 1.1.11101)
     - themis/openssl-1.1.1/core
 
 DEPENDENCIES:
-  - themis (= 0.13.10)
+  - themis (= 0.14.0)
 
 SPEC REPOS:
   trunk:
@@ -22,8 +22,8 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   CLOpenSSL-XCF: 71ce1fb96734754ea5936e239e15999129413793
-  themis: 1fc3604d5efabec8e7f004701ba5413de9a52ccc
+  themis: 4bcef173f13a428822f8db4cb504e4c7b2c302b1
 
-PODFILE CHECKSUM: 3d107027b13215dd8aa60c37d5a59e4534d1be8f
+PODFILE CHECKSUM: 768444a6e78d64a8fa6d40159a19487b6c95f7f1
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.3
diff --git a/docs/examples/swift/iOS-CocoaPods/ThemisSwift/ThemisSwift.xcodeproj/project.pbxproj b/docs/examples/swift/iOS-CocoaPods/ThemisSwift/ThemisSwift.xcodeproj/project.pbxproj
@@ -170,7 +170,6 @@
 				TargetAttributes = {
 					739981161CC42C880095138F = {
 						CreatedOnToolsVersion = 7.3;
-						DevelopmentTeam = X6X7AHQ2D4;
 						LastSwiftMigration = 0910;
 						ProvisioningStyle = Automatic;
 					};
@@ -255,7 +254,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-ThemisSwift/Pods-ThemisSwift-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/themis/themis.framework",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/openssl/openssl.framework/openssl",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/CLOpenSSL-XCF/openssl.framework/openssl",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -420,8 +419,8 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = X6X7AHQ2D4;
-				ENABLE_BITCODE = YES;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/ThemisSwift/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -445,8 +444,8 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = X6X7AHQ2D4;
-				ENABLE_BITCODE = YES;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/ThemisSwift/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";