Skip to content

Commit 3108460

Browse files
committed
update
1 parent 15ac862 commit 3108460

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

.github/workflows/scripts/agp9-compatibility.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,22 @@ grep -q '^android.newDsl=false$' "$TEST_ANDROID_DIR/gradle.properties" || \
2323
perl -0pi -e 's/\n\s*id "kotlin-android"\n/\n/' "$TEST_ANDROID_DIR/app/build.gradle"
2424
perl -0pi -e 's/\n\s*kotlinOptions \{\n\s*jvmTarget = JavaVersion\.VERSION_17\n\s*\}\n/\n/' "$TEST_ANDROID_DIR/app/build.gradle"
2525

26+
# AGP 9 rejects older Espresso artifacts that share the same namespace.
27+
grep -q 'androidx.test.espresso:espresso-core:3.7.0' "$TEST_ANDROID_DIR/app/build.gradle" || cat <<'EOF' >> "$TEST_ANDROID_DIR/app/build.gradle"
28+
29+
dependencies {
30+
debugImplementation 'androidx.test.espresso:espresso-core:3.7.0'
31+
debugImplementation 'androidx.test.espresso:espresso-idling-resource:3.7.0'
32+
}
33+
EOF
34+
2635
grep -q "id \"com.android.application\" version \"$AGP_VERSION\" apply false" "$TEST_ANDROID_DIR/settings.gradle"
2736
grep -q "gradle-$GRADLE_VERSION-all.zip" "$TEST_ANDROID_DIR/gradle/wrapper/gradle-wrapper.properties"
2837
grep -q '^android.newDsl=false$' "$TEST_ANDROID_DIR/gradle.properties"
2938
! grep -q 'id "kotlin-android"' "$TEST_ANDROID_DIR/app/build.gradle"
3039
! grep -q 'kotlinOptions' "$TEST_ANDROID_DIR/app/build.gradle"
40+
grep -q 'androidx.test.espresso:espresso-core:3.7.0' "$TEST_ANDROID_DIR/app/build.gradle"
41+
grep -q 'androidx.test.espresso:espresso-idling-resource:3.7.0' "$TEST_ANDROID_DIR/app/build.gradle"
3142

3243
cd tests
3344
flutter build apk --debug --dart-define=CI=true --no-android-gradle-daemon

0 commit comments

Comments
 (0)