diff --git a/embrace/example/android/app/build.gradle b/embrace/example/android/app/build.gradle index 15788acf..7716deb7 100644 --- a/embrace/example/android/app/build.gradle +++ b/embrace/example/android/app/build.gradle @@ -1,6 +1,5 @@ plugins { id "com.android.application" - id "org.jetbrains.kotlin.android" id "dev.flutter.flutter-gradle-plugin" } @@ -25,7 +24,11 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { jvmTarget = '1.8' } + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + } + } sourceSets { main.java.srcDirs += 'src/main/kotlin' } diff --git a/embrace/example/android/build.gradle b/embrace/example/android/build.gradle index 3b10fb51..8b12eb55 100644 --- a/embrace/example/android/build.gradle +++ b/embrace/example/android/build.gradle @@ -1,5 +1,4 @@ buildscript { - ext.kotlin_version = '2.3.0' repositories { google() mavenCentral() @@ -7,8 +6,6 @@ buildscript { dependencies { classpath "io.embrace:embrace-gradle-plugin:${findProject(':embrace_android').properties['emb_android_sdk']}" - classpath 'com.android.tools.build:gradle:9.0.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/embrace/example/android/gradle.properties b/embrace/example/android/gradle.properties index 9dfbd7bb..d211482d 100644 --- a/embrace/example/android/gradle.properties +++ b/embrace/example/android/gradle.properties @@ -2,3 +2,5 @@ org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g org.gradle.parallel=true android.useAndroidX=true android.enableJetifier=true +android.newDsl=false +android.uniquePackageNames=false diff --git a/embrace/example/android/settings.gradle b/embrace/example/android/settings.gradle index e2b2bd83..8540fa4a 100644 --- a/embrace/example/android/settings.gradle +++ b/embrace/example/android/settings.gradle @@ -8,9 +8,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.13.2" apply false - id "com.android.library" version "8.13.2" apply false - id "org.jetbrains.kotlin.android" version "2.3.0" apply false + id "com.android.application" version "9.0.0" apply false + id "com.android.library" version "9.0.0" apply false } include(":app") diff --git a/embrace_android/android/build.gradle b/embrace_android/android/build.gradle index eec46180..58bfd4cb 100644 --- a/embrace_android/android/build.gradle +++ b/embrace_android/android/build.gradle @@ -1,6 +1,5 @@ plugins { id "com.android.library" - id "org.jetbrains.kotlin.android" } group = "io.embrace.flutter" @@ -16,7 +15,11 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { jvmTarget = "1.8" } + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + } + } sourceSets { main.java.srcDirs += "src/main/kotlin" } }