Skip to content

Commit 5a83449

Browse files
authored
Workaround missing Android image in CI and upgrade dependencies (#234)
* Workaround missing default system image for Android API level 36 Google hasn't published an AOSP version of the Android system image for API level 36 yet: https://issuetracker.google.com/issues/432143095 Temporarily switch to the Google APIs variant to workaround this issue. * example: revert Android targetSdkVersion to Flutter default Version 31 no longer meets Google Play requirements. * Bump Kotlin version to 2.2.21 * example: upgrade AGP to version 8.13.0
1 parent a9027a3 commit 5a83449

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,16 @@ jobs:
192192
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
193193
sudo udevadm control --reload-rules
194194
sudo udevadm trigger --name-match=kvm
195-
- name: Run flutter test integration_test/webcrypto_test.dart -d android
195+
- name: Run flutter test integration_test/webcrypto_test.dart -d emulator
196196
uses: reactivecircus/android-emulator-runner@v2
197197
with:
198198
api-level: 36
199+
# TODO: switch back to default once this is issue resolved:
200+
# https://issuetracker.google.com/issues/432143095
201+
target: google_apis
202+
arch: x86_64
199203
working-directory: ./example
200-
script: flutter test integration_test/webcrypto_test.dart -d android
204+
script: flutter test integration_test/webcrypto_test.dart -d emulator
201205
linux-coverage:
202206
name: Linux desktop / Chrome / Firefox (coverage)
203207
runs-on: ubuntu-latest

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group 'com.example.webcrypto'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.6.10'
5+
ext.kotlin_version = '2.2.21'
66
repositories {
77
google()
88
mavenCentral()

example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4444
applicationId "com.example.webcrypto_example"
4545
minSdkVersion flutter.minSdkVersion
46-
targetSdkVersion 31
46+
targetSdkVersion flutter.targetSdkVersion
4747
versionCode flutterVersionCode.toInteger()
4848
versionName flutterVersionName
4949
}

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

example/android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "8.4.1" apply false
22-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
21+
id "com.android.application" version '8.13.0' apply false
22+
id "org.jetbrains.kotlin.android" version "2.2.21" apply false
2323
}
2424

2525
include ":app"

0 commit comments

Comments
 (0)