From 87fcae194c78ffe70c24c401fca73e81b6920ced Mon Sep 17 00:00:00 2001 From: Tyler-Larkin Date: Tue, 18 Feb 2025 16:16:36 -0800 Subject: [PATCH] chore90: Update build_canary.sh --- build-support/build_canary.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build-support/build_canary.sh b/build-support/build_canary.sh index 239abf588a..e8c86a29a6 100755 --- a/build-support/build_canary.sh +++ b/build-support/build_canary.sh @@ -42,9 +42,11 @@ then sed -i '' -e "s/sourceCompatibility = .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts - # TODO(equartey): remove this line after the next stable release (3.22.0 or 4.0) sed -i '' -e "s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts + # TODO(equartey): remove this line after the next stable release (3.22.0 or 4.0) + sed -i '' -e "s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17.toString()/" ./android/app/build.gradle.kts + sed -i '' -e "s/compileOptions {.*/compileOptions {\n\t\tisCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle.kts 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 cat ./android/app/build.gradle.kts @@ -69,7 +71,9 @@ else sed -i '' -e "s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle - sed -i '' -e "s/compileOptions {.*/compileOptions {\n\t\tisCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle + sed -i '' -e "s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17/" ./android/app/build.gradle + + #sed -i '' -e "s/compileOptions {.*/compileOptions {\n\t\tCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle sed -i '' -e "s/flutter {.*/dependencies {\n\tcoreLibraryDesugaring(\"com.android.tools:desugar_jdk_libs:2.0.3\")\n}\n\nflutter {/" ./android/app/build.gradle cat ./android/app/build.gradle