From 03e4fee0e0362687e8bb2f3f49904dbf84653ca6 Mon Sep 17 00:00:00 2001 From: Mohamed Mostafa Date: Sat, 2 May 2026 00:16:48 +0300 Subject: [PATCH] feat(android): Migrate plugins to built-in Kotlin --- .../device_info_plus/android/build.gradle | 11 ++++++----- .../device_info_plus/example/pubspec.yaml | 6 ++---- .../device_info_plus/device_info_plus/pubspec.yaml | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) 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..7beca7b98b 100644 --- a/packages/device_info_plus/device_info_plus/android/build.gradle +++ b/packages/device_info_plus/device_info_plus/android/build.gradle @@ -22,7 +22,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.device_info' @@ -33,10 +32,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } - defaultConfig { minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -50,3 +45,9 @@ android { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/device_info_plus/device_info_plus/example/pubspec.yaml b/packages/device_info_plus/device_info_plus/example/pubspec.yaml index ae22980db4..32c22666e8 100644 --- a/packages/device_info_plus/device_info_plus/example/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/example/pubspec.yaml @@ -19,7 +19,5 @@ flutter: uses-material-design: true environment: - sdk: '>=3.10.0 <4.0.0' - flutter: '>=3.38.1' - - + sdk: ">=3.12.0-0 <4.0.0" + flutter: ">=3.44.0-0.0.pre" diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index 2e3d15ab4c..89222d4578 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -48,5 +48,5 @@ dev_dependencies: mockito: ^5.6.4 environment: - sdk: ">=3.10.0 <4.0.0" - flutter: ">=3.38.1" + sdk: ">=3.12.0-0 <4.0.0" + flutter: ">=3.44.0-0.0.pre"