diff --git a/packages/device_info_plus/device_info_plus/android/build.gradle b/packages/device_info_plus/device_info_plus/android/build.gradle index 79a345a487..bbc3441cab 100644 --- a/packages/device_info_plus/device_info_plus/android/build.gradle +++ b/packages/device_info_plus/device_info_plus/android/build.gradle @@ -2,7 +2,7 @@ group 'dev.fluttercommunity.plus.device_info' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '2.2.0' + ext.kotlin_version = '2.2.20' repositories { google() mavenCentral() @@ -22,7 +22,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' + android { namespace 'dev.fluttercommunity.plus.device_info' @@ -33,9 +33,7 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } + defaultConfig { minSdk 19 @@ -50,3 +48,8 @@ android { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} \ No newline at end of file diff --git a/packages/device_info_plus/device_info_plus/example/android/app/build.gradle b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle index c6e51e660d..e49d320291 100644 --- a/packages/device_info_plus/device_info_plus/example/android/app/build.gradle +++ b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle @@ -1,6 +1,5 @@ plugins { id "com.android.application" - id "kotlin-android" id "dev.flutter.flutter-gradle-plugin" } @@ -25,16 +24,12 @@ if (flutterVersionName == null) { android { namespace 'io.flutter.plugins.deviceinfoexample.example' compileSdk = flutter.compileSdkVersion - + ndkVersion = "28.2.13676358" compileOptions { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } - sourceSets { main.java.srcDirs += 'src/main/kotlin' } @@ -59,7 +54,11 @@ android { } } } - +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} flutter { source '../..' } diff --git a/packages/device_info_plus/device_info_plus/example/android/gradle.properties b/packages/device_info_plus/device_info_plus/example/android/gradle.properties index d9cf55df7c..e514eeddca 100644 --- a/packages/device_info_plus/device_info_plus/example/android/gradle.properties +++ b/packages/device_info_plus/device_info_plus/example/android/gradle.properties @@ -1,2 +1,6 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties index f3dd2fa1bd..ed0d9c035b 100644 --- a/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 05 15:15:38 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/device_info_plus/device_info_plus/example/android/settings.gradle b/packages/device_info_plus/device_info_plus/example/android/settings.gradle index f1c2904d82..ff03f22be3 100644 --- a/packages/device_info_plus/device_info_plus/example/android/settings.gradle +++ b/packages/device_info_plus/device_info_plus/example/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.12.1" apply false - id "org.jetbrains.kotlin.android" version "2.2.0" apply false + id "com.android.application" version "8.11.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app"