Upgrade to Xcode 15.2 and Android Studio Giraffle

authgear · Mar 22, 2024 · 58d8a92 · 58d8a92
2 parents 019d410 + 3607d47
commit 58d8a92
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,6 +11,56 @@ on:
     - '!gh-pages'
 
 jobs:
+  test-ios:
+    runs-on: macos-13
+    if: ${{ github.event_name == 'pull_request' }}
+    defaults:
+      run:
+        working-directory: "./example"
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+    - run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
+    - uses: subosito/flutter-action@v2
+      with:
+        # Use the latest stable release
+        flutter-version: '3.x'
+        channel: 'stable'
+    - run: flutter pub get
+    - run: flutter test
+    - run: flutter analyze --no-fatal-infos
+    - run: dart format --set-exit-if-changed lib
+    - run: flutter build ipa --no-codesign
+
+  test-android:
+    runs-on: macos-13
+    if: ${{ github.event_name == 'pull_request' }}
+    defaults:
+      run:
+        working-directory: "./example"
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#java
+    - name: Set java version
+      run: |
+        echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+    - uses: subosito/flutter-action@v2
+      with:
+        # Use the latest stable release
+        flutter-version: '3.x'
+        channel: 'stable'
+    - run: echo "$ANDROID_HOME/tools/bin" >> $GITHUB_PATH
+    - run: flutter pub get
+    - run: flutter test
+    - run: flutter analyze --no-fatal-infos
+    - run: dart format --set-exit-if-changed lib
+    - run: flutter build apk --debug
+
   deploy:
     runs-on: ubuntu-22.04
     steps:
@@ -36,8 +86,9 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_dir: ./doc/api
+
   deploy-ios:
-    runs-on: macos-12
+    runs-on: macos-13
     needs: "deploy"
     if: ${{ github.ref == 'refs/heads/main' }}
     defaults:
@@ -48,6 +99,7 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: 16
+    - run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
     - run: npm install -g appcenter-cli
     - uses: subosito/flutter-action@v2
       with:
@@ -89,7 +141,7 @@ jobs:
       run: appcenter distribute release --debug --silent --file "./build/ios/ipa/Authgear Flutter.ipa" --store "App Store Connect Users" --app "Oursky/Authgear-Demo-Flutter-iOS" --release-notes "no release notes"
 
   deploy-android:
-    runs-on: macos-12
+    runs-on: macos-13
     needs: "deploy"
     if: ${{ github.ref == 'refs/heads/main' }}
     defaults:
@@ -100,6 +152,10 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: 16
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#java
+    - name: Set java version
+      run: |
+        echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
     - run: npm install -g appcenter-cli
     - uses: subosito/flutter-action@v2
       with:

diff --git a/android/build.gradle b/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip