From 7f06746a645947cf8d40cfca95d9562517457093 Mon Sep 17 00:00:00 2001 From: Oleksii Radetskyi Date: Thu, 14 Sep 2023 07:05:10 +0300 Subject: [PATCH] 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 --- CHANGELOG.md | 7 +++ Cartfile | 5 ++- Cartfile.resolved | 2 +- Package.swift | 4 +- Themis.xcodeproj/project.pbxproj | 44 +++++++++++-------- .../ThemisTest.xcodeproj/project.pbxproj | 26 +++++------ .../xcshareddata/swiftpm/Package.resolved | 4 +- .../ThemisTest.xcodeproj/project.pbxproj | 18 ++++---- .../xcshareddata/swiftpm/Package.resolved | 4 +- .../ThemisTest.xcodeproj/project.pbxproj | 18 ++++---- .../xcshareddata/swiftpm/Package.resolved | 4 +- .../ThemisTest.xcodeproj/project.pbxproj | 18 ++++---- .../xcshareddata/swiftpm/Package.resolved | 4 +- tests/objcthemis/Podfile | 2 +- themis.podspec | 10 ++--- 15 files changed, 93 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 268e28602..6137c1e80 100644 --- 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 index 48af3bd59..98f658e1a 100644 --- 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 index f47126628..d51b67b62 100644 --- 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 index 14817383a..5a02cd76d 100644 --- 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 index ea0ac397d..16b126261 100644 --- 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 index 9b245a15a..829cc8703 100644 --- 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/docs/examples/objc/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/docs/examples/objc/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e47c2d834..c997d014d 100644 --- a/docs/examples/objc/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/docs/examples/objc/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 index 93d7aabf3..e06292e5c 100644 --- 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/docs/examples/objc/macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/docs/examples/objc/macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e47c2d834..c997d014d 100644 --- a/docs/examples/objc/macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/docs/examples/objc/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" } } ], diff --git a/docs/examples/swift/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/swift/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj index c5d711634..0d2c73c25 100644 --- a/docs/examples/swift/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj +++ b/docs/examples/swift/iOS-SPM/ThemisTest.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 1DEB1C2428D0B13A00663915 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1DEB1C2328D0B13A00663915 /* themis */; }; + 1D8D39FC2AB0EBBB00531935 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1D8D39FB2AB0EBBB00531935 /* themis */; }; 6D445264263C2D1600871215 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D445263263C2D1600871215 /* AppDelegate.swift */; }; 6D445266263C2D1600871215 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D445265263C2D1600871215 /* SceneDelegate.swift */; }; 6D445268263C2D1600871215 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D445267263C2D1600871215 /* ViewController.swift */; }; @@ -40,7 +40,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1DEB1C2428D0B13A00663915 /* themis in Frameworks */, + 1D8D39FC2AB0EBBB00531935 /* themis in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -106,7 +106,7 @@ ); name = ThemisTest; packageProductDependencies = ( - 1DEB1C2328D0B13A00663915 /* themis */, + 1D8D39FB2AB0EBBB00531935 /* themis */, ); productName = ThemisTest; productReference = 6D445260263C2D1600871215 /* ThemisTest.app */; @@ -136,7 +136,7 @@ ); mainGroup = 6D445257263C2D1600871215; packageReferences = ( - 1DEB1C2228D0B13A00663915 /* XCRemoteSwiftPackageReference "themis" */, + 1D8D39FA2AB0EBBB00531935 /* XCRemoteSwiftPackageReference "themis" */, ); productRefGroup = 6D445261263C2D1600871215 /* Products */; projectDirPath = ""; @@ -379,20 +379,20 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 1DEB1C2228D0B13A00663915 /* XCRemoteSwiftPackageReference "themis" */ = { + 1D8D39FA2AB0EBBB00531935 /* 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 */ - 1DEB1C2328D0B13A00663915 /* themis */ = { + 1D8D39FB2AB0EBBB00531935 /* themis */ = { isa = XCSwiftPackageProductDependency; - package = 1DEB1C2228D0B13A00663915 /* XCRemoteSwiftPackageReference "themis" */; + package = 1D8D39FA2AB0EBBB00531935 /* XCRemoteSwiftPackageReference "themis" */; productName = themis; }; /* End XCSwiftPackageProductDependency section */ diff --git a/docs/examples/swift/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/docs/examples/swift/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e47c2d834..c997d014d 100644 --- a/docs/examples/swift/iOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/docs/examples/swift/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/swift/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/swift/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj index 6b87507a1..d90d087e9 100644 --- a/docs/examples/swift/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj +++ b/docs/examples/swift/macOS-SPM/ThemisTest.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 1D67338B28D0F79A007FA7A5 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1D67338A28D0F79A007FA7A5 /* themis */; }; + 1DC827E42AB18ABB00CD51D1 /* themis in Frameworks */ = {isa = PBXBuildFile; productRef = 1DC827E32AB18ABB00CD51D1 /* themis */; }; 6DFBC499263C2DB300DC8865 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DFBC498263C2DB300DC8865 /* AppDelegate.swift */; }; 6DFBC49B263C2DB300DC8865 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DFBC49A263C2DB300DC8865 /* ViewController.swift */; }; 6DFBC49D263C2DB600DC8865 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6DFBC49C263C2DB600DC8865 /* Assets.xcassets */; }; @@ -37,7 +37,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1D67338B28D0F79A007FA7A5 /* themis in Frameworks */, + 1DC827E42AB18ABB00CD51D1 /* themis in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -102,7 +102,7 @@ ); name = ThemisTest; packageProductDependencies = ( - 1D67338A28D0F79A007FA7A5 /* themis */, + 1DC827E32AB18ABB00CD51D1 /* themis */, ); productName = ThemisTest; productReference = 6DFBC495263C2DB300DC8865 /* ThemisTest.app */; @@ -132,7 +132,7 @@ ); mainGroup = 6DFBC48C263C2DB300DC8865; packageReferences = ( - 1D67338928D0F79A007FA7A5 /* XCRemoteSwiftPackageReference "themis" */, + 1DC827E22AB18ABB00CD51D1 /* XCRemoteSwiftPackageReference "themis" */, ); productRefGroup = 6DFBC496263C2DB300DC8865 /* Products */; projectDirPath = ""; @@ -360,20 +360,20 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 1D67338928D0F79A007FA7A5 /* XCRemoteSwiftPackageReference "themis" */ = { + 1DC827E22AB18ABB00CD51D1 /* 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 */ - 1D67338A28D0F79A007FA7A5 /* themis */ = { + 1DC827E32AB18ABB00CD51D1 /* themis */ = { isa = XCSwiftPackageProductDependency; - package = 1D67338928D0F79A007FA7A5 /* XCRemoteSwiftPackageReference "themis" */; + package = 1DC827E22AB18ABB00CD51D1 /* XCRemoteSwiftPackageReference "themis" */; productName = themis; }; /* End XCSwiftPackageProductDependency section */ diff --git a/docs/examples/swift/macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/docs/examples/swift/macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e47c2d834..c997d014d 100644 --- a/docs/examples/swift/macOS-SPM/ThemisTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/docs/examples/swift/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" } } ], diff --git a/tests/objcthemis/Podfile b/tests/objcthemis/Podfile index cd7a901e8..27d6557d6 100644 --- a/tests/objcthemis/Podfile +++ b/tests/objcthemis/Podfile @@ -16,7 +16,7 @@ source 'https://cdn.cocoapods.org/' -platform :ios, '10.0' +platform :ios, '11.0' inhibit_all_warnings! target "objthemis" do diff --git a/themis.podspec b/themis.podspec index b050cb082..f048ae753 100644 --- a/themis.podspec +++ b/themis.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "themis" - s.version = "0.14.0" + s.version = "0.15.1" s.summary = "Data security library for network communication and data storage for iOS and mac OS" s.description = "Themis is a convenient cryptographic library for data protection. It provides secure messaging with forward secrecy and secure data storage. Themis is aimed at modern development practices and has a unified API across 12 platforms, including iOS/macOS, Ruby, JavaScript, Python, and Java/Android." s.homepage = "https://cossacklabs.com" @@ -13,8 +13,8 @@ Pod::Spec.new do |s| s.module_name = 'themis' s.default_subspec = 'openssl-1.1.1' - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.11' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.13' s.ios.frameworks = 'UIKit', 'Foundation' # TODO(ilammy, 2020-03-02): resolve "pod spec lint" warnings due to dependencies @@ -23,8 +23,8 @@ Pod::Spec.new do |s| # This variant uses the current stable, non-legacy version of OpenSSL. s.subspec 'openssl-1.1.1' do |so| - # OpenSSL 1.1.1k - so.dependency 'CLOpenSSL-XCF', '1.1.11101' + # OpenSSL 1.1.1u + so.dependency 'CLOpenSSL-XCF', '1.1.12201' # Enable bitcode for OpenSSL in a very specific way, but it works, thanks to @deszip so.ios.pod_target_xcconfig = {