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" diff --git a/packages/package_info_plus/package_info_plus/android/build.gradle b/packages/package_info_plus/package_info_plus/android/build.gradle index f03c20d32f..bfbfc778c6 100644 --- a/packages/package_info_plus/package_info_plus/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/android/build.gradle @@ -23,7 +23,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.packageinfo' @@ -34,10 +33,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } - defaultConfig { minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -51,3 +46,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/package_info_plus/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/package_info_plus/example/pubspec.yaml index f9209b2f96..8e55e5340a 100644 --- a/packages/package_info_plus/package_info_plus/example/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/example/pubspec.yaml @@ -4,7 +4,8 @@ version: 1.2.3+4 publish_to: "none" environment: - sdk: ">=3.10.0 <4.0.0" + sdk: ">=3.12.0-0 <4.0.0" + flutter: ">=3.44.0-0.0.pre" dependencies: clock: ^1.1.1 diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index d8405776a8..fae18d3b1c 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -47,5 +47,5 @@ dev_dependencies: sdk: flutter 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/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle index 64eb5f8fa4..cac5d88367 100644 --- a/packages/sensors_plus/sensors_plus/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/android/build.gradle @@ -22,7 +22,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.sensors' @@ -33,10 +32,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } - defaultConfig { minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -49,3 +44,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/sensors_plus/sensors_plus/pubspec.yaml b/packages/sensors_plus/sensors_plus/pubspec.yaml index 2638919d1e..3c7e1e37d6 100644 --- a/packages/sensors_plus/sensors_plus/pubspec.yaml +++ b/packages/sensors_plus/sensors_plus/pubspec.yaml @@ -36,5 +36,5 @@ dev_dependencies: flutter_lints: ">=4.0.0 <6.0.0" environment: - sdk: ">=3.3.0 <4.0.0" - flutter: ">=3.19.0" + sdk: ">=3.12.0-0 <4.0.0" + flutter: ">=3.44.0-0.0.pre" diff --git a/packages/share_plus/share_plus/android/build.gradle b/packages/share_plus/share_plus/android/build.gradle index d8b6e6c022..20cbc4f08c 100644 --- a/packages/share_plus/share_plus/android/build.gradle +++ b/packages/share_plus/share_plus/android/build.gradle @@ -22,7 +22,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.share' @@ -33,10 +32,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } - defaultConfig { minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -52,3 +47,9 @@ android { implementation 'androidx.annotation:annotation:1.9.1' } } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/share_plus/share_plus/example/pubspec.yaml b/packages/share_plus/share_plus/example/pubspec.yaml index a42d302c99..7559b37460 100644 --- a/packages/share_plus/share_plus/example/pubspec.yaml +++ b/packages/share_plus/share_plus/example/pubspec.yaml @@ -24,5 +24,5 @@ flutter: - assets/flutter_logo.png 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/share_plus/share_plus/pubspec.yaml b/packages/share_plus/share_plus/pubspec.yaml index 17af4a514e..13b4cc728a 100644 --- a/packages/share_plus/share_plus/pubspec.yaml +++ b/packages/share_plus/share_plus/pubspec.yaml @@ -51,6 +51,5 @@ dev_dependencies: flutter_lints: ^6.0.0 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"