Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build environment upgrades #35

Merged
merged 5 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:
env:
JAVA_VERSION: "17"
JAVA_DISTRIBUTION: "zulu"
XCODE_VERSION: "13.3"
XCODE_VERSION: "16.2"
XCODE_CACHE: "CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++"
IOS_SIMULATOR: "platform=iOS Simulator,name=iPhone 11,OS=15.4"
IOS_SIMULATOR: "platform=iOS Simulator,name=iPhone 16,OS=18.2"
ANDROID_COMPILE_SDK: "31"
ANDROID_EMULATOR_ARCHITECTURE: "x86_64"
GUARDIAN_API_KEY: ${{ secrets.GUARDIAN_API_KEY }}
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
**/TEST-*.xml

ios-check-build:
runs-on: macos-12
runs-on: macos-15
concurrency:
group: ${{ github.ref }}-ios-check-build
cancel-in-progress: true
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
**/secrets.properties

ios-check-test:
runs-on: macos-12
runs-on: macos-15
concurrency:
group: ${{ github.ref }}-ios-check-test
cancel-in-progress: true
Expand Down Expand Up @@ -194,13 +194,18 @@ jobs:
**/secrets.properties

android-check-test:
runs-on: macos-11 # Allows Android emulator hardware acceleration
runs-on: ubuntu-20.04
concurrency:
group: ${{ github.ref }}-android-check-test
cancel-in-progress: true
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Enable KVM group perms
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
- name: Set up Java
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -243,7 +248,7 @@ jobs:
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
script: set -o pipefail && ./gradlew connectedAndroidTest
script: ./gradlew connectedAndroidTest
- name: Artifacts
uses: actions/upload-artifact@v4
if: always() # Ensure all artifacts are collected, even after errors
Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
android-gradlePlugin = "8.3.1"
android-gradlePlugin = "8.7.2"
kotlin = "1.9.22"
kotlinx-coroutines = "1.7.3"
kotlinx-datetime = "0.4.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists