From a286d36d5df2bd042dc93db63268a27d66b5ac11 Mon Sep 17 00:00:00 2001 From: julepka Date: Mon, 26 Jul 2021 11:39:54 +0300 Subject: [PATCH 1/2] removed arm64 from exluded archs --- Package.swift | 4 ++-- Themis.xcodeproj/project.pbxproj | 10 ++++------ themis.podspec | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index 21896d43a..1baef0d74 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.13.10/themis.xcframework.zip", + url: "https://github.com/cossacklabs/themis/releases/download/0.13.12/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: "2c77a19be873f306ed0fc997794d564f0ff32633c3596b81e8bb9d684ccfc049"), + checksum: "c74f65d4918884220efe99c3195001fa8aabc8030ad85f8ef30d2bfed11065a3"), ] ) diff --git a/Themis.xcodeproj/project.pbxproj b/Themis.xcodeproj/project.pbxproj index 112a0d6f7..bc74d5286 100644 --- a/Themis.xcodeproj/project.pbxproj +++ b/Themis.xcodeproj/project.pbxproj @@ -1492,7 +1492,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.13.9; + MARKETING_VERSION = 0.13.12; PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis; PRODUCT_MODULE_NAME = themis; PRODUCT_NAME = themis; @@ -1534,7 +1534,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.13.9; + MARKETING_VERSION = 0.13.12; PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis; PRODUCT_MODULE_NAME = themis; PRODUCT_NAME = themis; @@ -1558,7 +1558,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = YES; EXCLUDED_ARCHS = ""; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/wrappers/themis/Obj-C/exported.symbols"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1578,7 +1577,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.13.10; + MARKETING_VERSION = 0.13.12; PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis; PRODUCT_MODULE_NAME = themis; PRODUCT_NAME = themis; @@ -1607,7 +1606,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = YES; EXCLUDED_ARCHS = ""; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/wrappers/themis/Obj-C/exported.symbols"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1627,7 +1625,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.13.10; + MARKETING_VERSION = 0.13.12; PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis; PRODUCT_MODULE_NAME = themis; PRODUCT_NAME = themis; diff --git a/themis.podspec b/themis.podspec index a80f36cb4..69088f706 100644 --- a/themis.podspec +++ b/themis.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "themis" - s.version = "0.13.10" + s.version = "0.13.12" 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" From a95ceb2d0cb0b243b7a15cf40fefb612a35dca26 Mon Sep 17 00:00:00 2001 From: julepka Date: Mon, 26 Jul 2021 12:16:06 +0300 Subject: [PATCH 2/2] updated changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1afab9541..95446a430 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ Changes that are currently in development and have not been released yet. +## [0.13.12](https://github.com/cossacklabs/themis/releases/tag/0.13.12), July 26th 2021 + +**Hotfix for Apple arm64 simulators for M1** + +- Fixed issue [864](https://github.com/cossacklabs/themis/issues/864): Themis XCFramework now includes arm64 slice for simulators ([865](https://github.com/cossacklabs/themis/pull/865)). + +_Code:_ + + - Fixed `Themis.xcodeproj` build settings: removed arm64 from exluded architectures ([865](https://github.com/cossacklabs/themis/pull/865)). + ## [0.13.11](https://github.com/cossacklabs/themis/releases/tag/0.13.11), July 6th 2021