Skip to content

Commit

Permalink
Merge pull request #2001 from get10101/chore/bump-xcode
Browse files Browse the repository at this point in the history
fix/chore: upgrade xcode version and macos version in CI to remove Apple warning
  • Loading branch information
bonomat authored Feb 11, 2024
2 parents e79554a + 18ff8cd commit 1c2297a
Show file tree
Hide file tree
Showing 8 changed files with 111 additions and 289 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/android-fastlane.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ jobs:
fetch-depth: 0
ref: ${{ inputs.tag }}

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: "14.2"
- name: List installations Xcode version
run: sudo ls -1 /Applications | grep "Xcode"
- name: List used Xcode version
run: /usr/bin/xcodebuild -version

- uses: subosito/flutter-action@v2
with:
Expand Down
25 changes: 21 additions & 4 deletions .github/workflows/ios-fastlane.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,22 @@ env:

jobs:
build:
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v3
with:
# fetch the complete history to correctly calculate build_number
fetch-depth: 0
ref: ${{ inputs.tag }}

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: "14.2"
- name: List installations Xcode version
run: sudo ls -1 /Applications | grep "Xcode"
- name: List used Xcode version
run: /usr/bin/xcodebuild -version
- name: Select different xcode version
run: sudo xcode-select -s '/Applications/Xcode_15.2.app/Contents/Developer'
- name: List used Xcode version
run: /usr/bin/xcodebuild -version

- uses: subosito/flutter-action@v2
with:
Expand All @@ -107,6 +112,13 @@ jobs:
cache-key: flutter-${{ env.FLUTTER_VERSION }}
cache-path: ${{ runner.tool_cache }}/flutter

- name: Check cocoapods version
run: /usr/local/bin/pod --version
- name: Re-install cocoapods
run: sudo gem install cocoapods
- name: Check cocoapods version
run: /usr/local/bin/pod --version

- uses: actions/cache@v3
id: cache-deps
with:
Expand Down Expand Up @@ -191,4 +203,9 @@ jobs:
just publish-testflight-fastlane
- name: Check for COCOAPODS bug
if: always()
run: cat mobile/ios/Pods/Target\ Support\ Files/Pods-Runner/Pods-Runner-frameworks.sh

- name: Print fastlane gym logs
if: always()
run: cat /Users/runner/Library/Logs/gym/10101-test.log
202 changes: 0 additions & 202 deletions .github/workflows/ios.yml

This file was deleted.

2 changes: 1 addition & 1 deletion mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b

COCOAPODS: 1.13.0
COCOAPODS: 1.15.2
18 changes: 12 additions & 6 deletions mobile/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
Expand All @@ -470,6 +470,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V3D64P9D6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -539,7 +540,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -590,7 +591,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
Expand Down Expand Up @@ -618,6 +619,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V3D64P9D6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -656,6 +658,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V3D64P9D6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -725,7 +728,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -750,6 +753,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V3D64P9D6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -814,7 +818,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
Expand Down Expand Up @@ -842,6 +846,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V3D64P9D6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -905,7 +910,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
Expand All @@ -931,6 +936,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V3D64P9D6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
2 changes: 1 addition & 1 deletion mobile/ios/fastlane/Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "https://rubygems.org"

gem "fastlane"
gem "cocoapods"
gem "cocoapods", "1.15.2"
Loading

0 comments on commit 1c2297a

Please sign in to comment.