From 2d5b113661b92d54e4eb4a7e79a8a96d9854d7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danny=20B=C3=A9dard?= Date: Wed, 19 Jun 2024 15:06:57 -0400 Subject: [PATCH] chore: update iOS deployment target to 16.0 --- .github/workflows/publish.yml | 84 ++++++++++++++++++----------------- Slauth.podspec | 2 +- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3b064d5..0566ffb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -170,44 +170,46 @@ jobs: - name: Build iOS libraries run: sh wrappers/swift/build.sh - - name: Setup CocoaPods Trunk Token - run: | - echo -e "machine trunk.cocoapods.org\n login bot@devolutions.net\n password ${{ secrets.COCOAPODS_TRUNK_TOKEN }}" > ~/.netrc - chmod 0600 ~/.netrc - - - name: Setup version - id: version - run: | - VERSION=$(grep -E "^\s*s\.version\s*=\s*['\"][0-9]+\.[0-9]+\.[0-9]+['\"]" Slauth.podspec | awk -F"[\"\']" '{print $2}') - echo "version=$VERSION" >> $GITHUB_OUTPUT - - - name: Push to a new branch - run: | - git checkout --orphan release/cocoapods-v${{ steps.version.outputs.version }} - git rm -rf . - git checkout master -- LICENSE wrappers/swift/classes slauth.h Slauth.podspec - - git add LICENSE wrappers/swift/classes/** slauth.h Slauth.podspec - find target/universal/release -name "*.a" -exec git add {} \; - find target/x86_64-apple-ios/release -name "*.a" -exec git add {} \; - find target/aarch64-apple-ios/release -name "*.a" -exec git add {} \; - - git commit -m "Set up CocoaPods release branch" - git push origin release/cocoapods-v${{ steps.version.outputs.version }} - - git tag '${{ steps.version.outputs.version }}' - git push --tags - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Publish to CocoaPods - run: pod trunk push Slauth.podspec --skip-import-validation --use-libraries --allow-warnings - env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} - - - name: Delete branch - run: | - git fetch - git switch master - git branch -D release/cocoapods-v${{ steps.version.outputs.version }} - git push origin --delete release/cocoapods-v${{ steps.version.outputs.version }} + # - name: Setup CocoaPods Trunk Token + # run: | + # echo -e "machine trunk.cocoapods.org\n login bot@devolutions.net\n password ${{ secrets.COCOAPODS_TRUNK_TOKEN }}" > ~/.netrc + # chmod 0600 ~/.netrc + + # - name: Setup version + # id: version + # run: | + # VERSION=$(grep -E "^\s*s\.version\s*=\s*['\"][0-9]+\.[0-9]+\.[0-9]+['\"]" Slauth.podspec | awk -F"[\"\']" '{print $2}') + # echo "version=$VERSION" >> $GITHUB_OUTPUT + + # - name: Push to a new branch + # run: | + # git checkout --orphan release/cocoapods-v${{ steps.version.outputs.version }} + # git rm -rf . + # git checkout master -- LICENSE wrappers/swift/classes slauth.h Slauth.podspec + + # git add LICENSE wrappers/swift/classes/** slauth.h Slauth.podspec + # find target/universal/release -name "*.a" -exec git add {} \; + # find target/x86_64-apple-ios/release -name "*.a" -exec git add {} \; + + # git commit -m "Set up CocoaPods release branch" + # git push origin release/cocoapods-v${{ steps.version.outputs.version }} + + # git tag '${{ steps.version.outputs.version }}' + # git push --tags + # env: + # GITHUB_TOKEN: ${{ github.token }} + + - name: Validate podspec + run: pod spec lint --skip-import-validation --use-libraries --allow-warnings + + # - name: Publish to CocoaPods + # run: pod trunk push Slauth.podspec --skip-import-validation --use-libraries --allow-warnings + # env: + # COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} + + # - name: Delete branch + # run: | + # git fetch + # git switch master + # git branch -D release/cocoapods-v${{ steps.version.outputs.version }} + # git push origin --delete release/cocoapods-v${{ steps.version.outputs.version }} diff --git a/Slauth.podspec b/Slauth.podspec index ba6a121..5feb63b 100644 --- a/Slauth.podspec +++ b/Slauth.podspec @@ -12,7 +12,7 @@ TODO: Add long description of the pod here. s.source = { :git => 'https://github.com/Devolutions/Slauth.git', :tag => s.version.to_s } s.swift_version = '5.0' - s.ios.deployment_target = '17.0' + s.ios.deployment_target = '16.0' s.source_files = 'wrappers/swift/classes/**/*', 'slauth.h' s.vendored_libraries = 'target/universal/release/*.a', 'target/x86_64-apple-io/release/*.a', 'target/aarch64-apple-ios/release/*.a'