@@ -24,24 +24,25 @@ cp -r $ROOT_DIR/canaries/lib .
2424cp $ROOT_DIR /build-support/dummy_amplifyconfiguration.dart lib/amplifyconfiguration.dart
2525
2626# Android
27- sed -i ' ' -e " s/id \" com.android.application\" .*/id \" com.android.application\" version \" 8.9.0\" apply false/" ./android/settings.gradle.kts
28- sed -i ' ' -e " s/id \" org.jetbrains.kotlin.android\" .*/id \" org.jetbrains.kotlin.android\" version \" 1.9.10\" apply false/" ./android/settings.gradle.kts
29- cat ./android/settings.gradle.kts
27+ # TODO(tyllark): replace 'gradle*'' with 'gradle.kts' Flutter version is updated to 2.29.0 or higher
28+ sed -i ' ' -e " s/id \" com.android.application\" .*/id \" com.android.application\" version \" 8.9.0\" apply false/" ./android/settings.gradle*
29+ sed -i ' ' -e " s/id \" org.jetbrains.kotlin.android\" .*/id \" org.jetbrains.kotlin.android\" version \" 1.9.10\" apply false/" ./android/settings.gradle*
30+ cat ./android/settings.gradle*
3031
3132# TODO(khatruong2009): remove this line after the next stable release (3.22.0 or 4.0)
32- sed -i ' ' -e " s/minSdkVersion = .*/minSdkVersion = 24/" ./android/app/build.gradle.kts
33- sed -i ' ' -e " s/minSdk = .*/minSdk = 24/" ./android/app/build.gradle.kts
33+ sed -i ' ' -e " s/minSdkVersion = .*/minSdkVersion = 24/" ./android/app/build.gradle*
34+ sed -i ' ' -e " s/minSdk = .*/minSdk = 24/" ./android/app/build.gradle*
3435sed -i ' ' -e ' /id "kotlin-android"/a\
35- id ' \' ' kotlin-parcelize' \' ' ' ./android/app/build.gradle.kts
36- sed -i ' ' -e " s/compileSdk = .*/compileSdk = 35/" ./android/app/build.gradle.kts
37- sed -i ' ' -e " s/sourceCompatibility = .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts
38- sed -i ' ' -e " s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts
36+ id ' \' ' kotlin-parcelize' \' ' ' ./android/app/build.gradle*
37+ sed -i ' ' -e " s/compileSdk = .*/compileSdk = 35/" ./android/app/build.gradle*
38+ sed -i ' ' -e " s/sourceCompatibility = .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle*
39+ sed -i ' ' -e " s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle*
3940# TODO(equartey): remove this line after the next stable release (3.22.0 or 4.0)
40- sed -i ' ' -e ' /kotlinOptions {/,/}/ s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17.toString()/' ./android/app/build.gradle.kts
41+ sed -i ' ' -e ' /kotlinOptions {/,/}/ s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17.toString()/' ./android/app/build.gradle*
4142
42- sed -i ' ' -e " s/compileOptions {.*/compileOptions {\n\t\tisCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle.kts
43- sed -i ' ' -e " s/flutter {.*/dependencies {\n\tcoreLibraryDesugaring(\" com.android.tools:desugar_jdk_libs:2.0.3\" )\n}\n\nflutter {/" ./android/app/build.gradle.kts
44- cat ./android/app/build.gradle.kts
43+ sed -i ' ' -e " s/compileOptions {.*/compileOptions {\n\t\tisCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle*
44+ sed -i ' ' -e " s/flutter {.*/dependencies {\n\tcoreLibraryDesugaring(\" com.android.tools:desugar_jdk_libs:2.0.3\" )\n}\n\nflutter {/" ./android/app/build.gradle*
45+ cat ./android/app/build.gradle*
4546
4647sed -i ' ' -e " s#distributionUrl=.*#distributionUrl=https\\ ://services.gradle.org/distributions/gradle-8.9-all.zip#" ./android/gradle/wrapper/gradle-wrapper.properties
4748cat ./android/gradle/wrapper/gradle-wrapper.properties
0 commit comments