Switch to Xcode 12 (cossacklabs#721, cossacklabs#722, cossacklabs#723, …

…cossacklabs#724, cossacklabs#726) * Switch github actions to Xcode12 [ios, macos] (cossacklabs#721) - update github actions xcode12 - update changelog - update swift ios cocoapods project (cherry picked from commit d22bbab) * Updates of example projects for Xcode12.0.1 (cossacklabs#722) - github actions -> use xcode 12.0 - updating ios swift cocoapods example for themis 0.13.3 - disable openssl-1.1.1 subspec - "fix" carthage build by disabling arm64 - github actions: carthage, exclude arm64 architecture - update changelog (cherry picked from commit 1ae32a3) * update ios objc and server examples for themis 0.13.3 (cossacklabs#723) - update ios objc and server examples for themis 0.13.3 - updated changelog (cherry picked from commit dc336bb) * update iOS carthage examples for themis 0.13.3 (cossacklabs#724) - update iOS carthage examples for themis 0.13.3 - updated changelog (cherry picked from commit 0577424) * updated macOS examples for themis 0.13.3 (cossacklabs#726) - updated macOS examples for themis 0.13.3 - updated changelog (cherry picked from commit 9f14a5e) I've squashed all commits in one as conceptually this is a single change migrating the build to Xcode 12 and examples to Themis 0.13.3 which supports Xcode 12. The changes do not include CHANGELOG.md, but that will be synced later during the next major release. Signed-off-by: Alexei Lozovsky <[email protected]> Co-authored-by: julepka <[email protected]> Co-authored-by: vixentael <[email protected]>
ilammy · Oct 26, 2020 · 9cff3f6 · 9cff3f6
1 parent 2b39486
commit 9cff3f6
Show file tree

Hide file tree

Showing 80 changed files with 473 additions and 915 deletions.
diff --git a/.github/workflows/test-objc.yaml b/.github/workflows/test-objc.yaml
@@ -58,6 +58,12 @@ env:
   HACK_REPOSITORY: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}
   HACK_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
+  # let's use Xcode 12 to test Xcode12-specifics
+  # TODO: change on default Xcode later
+  # the list is here
+  # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md
+  DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
+
 jobs:
   unit-tests-cocoapods:
     name: Unit tests (CocoaPods)
@@ -167,8 +173,22 @@ jobs:
         uses: actions/checkout@v2
       - name: Pull Carthage dependencies
         run: carthage bootstrap
-      - name: Build Carthage projects
-        run: carthage build --no-skip-current
+      - name: Build Carthage projects - excluding arm64
+        run: |
+          # ------ beginning of workaround
+          # from https://github.com/Carthage/Carthage/issues/3019#issuecomment-699143260
+          # supports Xcode 12.0.1
+          set -euo pipefail
+          xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+          trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+          # For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
+          # the build will fail on lipo due to duplicate architectures.
+          echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
+          echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+          export XCODE_XCCONFIG_FILE="$xcconfig"          
+          # ------ end of workaround
+
+          carthage build --no-skip-current
 
   project-cocoapods:
     name: CocoaPods project
@@ -273,11 +293,26 @@ jobs:
       #
       # App samples: Objective-C
       #
-      - name: Build sample app (Objective-C, Carthage, iOS)
+      - name: Build sample app (Objective-C, Carthage, iOS) - excluding arm64
         if: always()
         run: |
           cd $GITHUB_WORKSPACE/docs/examples/objc/iOS-Carthage
+
+          # ------ beginning of workaround
+          # from https://github.com/Carthage/Carthage/issues/3019#issuecomment-699143260
+          # supports Xcode 12.0.1
+          set -euo pipefail
+          xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+          trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+          # For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
+          # the build will fail on lipo due to duplicate architectures.
+          echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
+          echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+          export XCODE_XCCONFIG_FILE="$xcconfig"          
+          # ------ end of workaround
+
           carthage bootstrap --platform iOS
+
           rm -rf DerivedData
           xcodebuild \
             -derivedDataPath DerivedData \
@@ -313,10 +348,24 @@ jobs:
       #
       # App samples: Swift
       #
-      - name: Build sample app (Swift, Carthage, iOS)
+      - name: Build sample app (Swift, Carthage, iOS) - excluding arm64
         if: always()
         run: |
           cd $GITHUB_WORKSPACE/docs/examples/swift/iOS-Carthage
+
+          # ------ beginning of workaround
+          # from https://github.com/Carthage/Carthage/issues/3019#issuecomment-699143260
+          # supports Xcode 12.0.1
+          set -euo pipefail
+          xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+          trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+          # For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
+          # the build will fail on lipo due to duplicate architectures.
+          echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
+          echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+          export XCODE_XCCONFIG_FILE="$xcconfig"          
+          # ------ end of workaround
+
           carthage bootstrap --platform iOS
           rm -rf DerivedData
           xcodebuild \

diff --git a/docs/examples/Themis-server/Obj-C/Podfile b/docs/examples/Themis-server/Obj-C/Podfile
@@ -16,13 +16,13 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
 
-platform :ios, '10.0'
+platform :ios, '12.0'
 project 'WorkingWithThemisServer/WorkingWithThemisServer.xcodeproj'
 inhibit_all_warnings!
 use_frameworks!
 
 target :"WorkingWithThemisServer" do
 
-  pod 'themis', '0.13.0'
+  pod 'themis', '0.13.3'
 
 end
diff --git a/docs/examples/Themis-server/Obj-C/Podfile.lock b/docs/examples/Themis-server/Obj-C/Podfile.lock
@@ -1,19 +1,19 @@
 PODS:
   - GRKOpenSSLFramework (1.0.2.18)
-  - themis (0.12.2):
-    - themis/themis-openssl (= 0.12.2)
-  - themis/themis-openssl (0.12.2):
+  - themis (0.13.3):
+    - themis/themis-openssl (= 0.13.3)
+  - themis/themis-openssl (0.13.3):
     - GRKOpenSSLFramework (= 1.0.2.18)
-    - themis/themis-openssl/core (= 0.12.2)
-    - themis/themis-openssl/objcwrapper (= 0.12.2)
-  - themis/themis-openssl/core (0.12.2):
+    - themis/themis-openssl/core (= 0.13.3)
+    - themis/themis-openssl/objcwrapper (= 0.13.3)
+  - themis/themis-openssl/core (0.13.3):
     - GRKOpenSSLFramework (= 1.0.2.18)
-  - themis/themis-openssl/objcwrapper (0.12.2):
+  - themis/themis-openssl/objcwrapper (0.13.3):
     - GRKOpenSSLFramework (= 1.0.2.18)
     - themis/themis-openssl/core
 
 DEPENDENCIES:
-  - themis (= 0.12.2)
+  - themis (= 0.13.3)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
@@ -22,8 +22,8 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   GRKOpenSSLFramework: 1d65e55d569af7b23074373041a92cc8bc768a92
-  themis: f4ef6d942670146ad08dca8cc99a34ae040878c0
+  themis: 00b56e2cdcc5ab1fc846aa0271ef0c2895a1c476
 
-PODFILE CHECKSUM: 0a484fd4a2a45b6c10bd42ee2fabc1b848bf01e4
+PODFILE CHECKSUM: 0842a68f8ee33c7a8170ce4747df4dd7e9ee1480
 
-COCOAPODS: 1.8.0
+COCOAPODS: 1.9.3