From 1d3b82c3de5029081988d713fd123b3bc6927c66 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 7 Sep 2025 14:30:10 +0300 Subject: [PATCH 1/3] feat(android_alarm_manager_plus)!: Change Android compile SDK, update Android build config --- packages/android_alarm_manager_plus/README.md | 5 ++-- .../android/build.gradle | 11 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 6 ---- .../example/android/app/build.gradle | 30 +++++++++++++------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 4 +-- .../example/pubspec.yaml | 10 +++---- 7 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/android_alarm_manager_plus/README.md b/packages/android_alarm_manager_plus/README.md index 33311e2ece..52e36c9b02 100644 --- a/packages/android_alarm_manager_plus/README.md +++ b/packages/android_alarm_manager_plus/README.md @@ -19,10 +19,9 @@ Dart code in the background when alarms fire. - Flutter >=3.12.0 - Dart >=3.1.0 <4.0.0 -- Android `compileSDK` 34 - Java 17 -- Android Gradle Plugin >=8.3.0 -- Gradle wrapper >=8.4 +- Android Gradle Plugin >=8.9.1 +- Gradle wrapper >=8.11.1 ## Getting Started diff --git a/packages/android_alarm_manager_plus/android/build.gradle b/packages/android_alarm_manager_plus/android/build.gradle index 9cfc9732ff..ba26efc19b 100644 --- a/packages/android_alarm_manager_plus/android/build.gradle +++ b/packages/android_alarm_manager_plus/android/build.gradle @@ -2,14 +2,14 @@ group 'dev.fluttercommunity.plus.androidalarmmanager' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.9.23' + ext.kotlin_version = '2.2.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.1' + classpath 'com.android.tools.build:gradle:8.9.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -25,9 +25,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdk 34 - namespace 'dev.fluttercommunity.plus.androidalarmmanager' + compileSdk = flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_17 @@ -39,7 +38,7 @@ android { } defaultConfig { - minSdk 19 + minSdk 21 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -50,6 +49,6 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - api 'androidx.core:core-ktx:1.13.1' + api 'androidx.core:core-ktx:1.16.0' implementation 'androidx.appcompat:appcompat:1.7.0' } diff --git a/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 7825683d62..0000000000 --- a/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Oct 05 10:00:26 EEST 2021 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/packages/android_alarm_manager_plus/example/android/app/build.gradle b/packages/android_alarm_manager_plus/example/android/app/build.gradle index 1c776ac6f2..a7173e69e0 100644 --- a/packages/android_alarm_manager_plus/example/android/app/build.gradle +++ b/packages/android_alarm_manager_plus/example/android/app/build.gradle @@ -1,3 +1,16 @@ +buildscript { + ext.kotlin_version = '2.2.0' + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:8.9.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + plugins { id "com.android.application" id "kotlin-android" @@ -23,9 +36,8 @@ if (flutterVersionName == null) { } android { - compileSdk 34 - namespace 'com.example.example' + compileSdk = flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_17 @@ -45,13 +57,13 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.example" - minSdk 21 - targetSdk 34 + + minSdk flutter.minSdkVersion + targetSdk flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() versionName flutterVersionName - multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -71,7 +83,7 @@ flutter { dependencies { testImplementation 'junit:junit:4.13.2' testImplementation "com.google.truth:truth:1.4.4" - androidTestImplementation 'androidx.test:runner:1.6.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' - api 'androidx.test:core:1.6.1' + androidTestImplementation 'androidx.test:runner:1.7.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' + api 'androidx.test:core:1.7.0' } diff --git a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties index e1bda4fd50..6bc47cfd46 100644 --- a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 05 12:15:50 EEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/android_alarm_manager_plus/example/android/settings.gradle b/packages/android_alarm_manager_plus/example/android/settings.gradle index fa3b4d0878..c83ca031cc 100644 --- a/packages/android_alarm_manager_plus/example/android/settings.gradle +++ b/packages/android_alarm_manager_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.3.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.23" apply false + id "com.android.application" version "8.9.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false } include ":app" diff --git a/packages/android_alarm_manager_plus/example/pubspec.yaml b/packages/android_alarm_manager_plus/example/pubspec.yaml index 72a73c631b..d866f8aa04 100644 --- a/packages/android_alarm_manager_plus/example/pubspec.yaml +++ b/packages/android_alarm_manager_plus/example/pubspec.yaml @@ -2,18 +2,18 @@ name: android_alarm_manager_plus_example description: Demonstrates how to use the android_alarm_manager_plus plugin. environment: - sdk: ">=2.18.0 <4.0.0" - flutter: ">=3.3.0" + sdk: ">=3.1.0 <4.0.0" + flutter: ">=3.12.0" dependencies: flutter: sdk: flutter android_alarm_manager_plus: ^4.0.8 - permission_handler: ^11.3.0 - shared_preferences: ^2.2.2 + permission_handler: ^12.0.1 + shared_preferences: ^2.5.3 dev_dependencies: - espresso: ^0.3.0+7 + espresso: ^0.4.0+11 flutter_test: sdk: flutter integration_test: From 14aeef2082af2d8687a778686eab56f97c9e504e Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 7 Sep 2025 22:12:43 +0300 Subject: [PATCH 2/3] chore(android_alarm_manager_plus): Bump AGP to 8.12.1, fix integration test --- packages/android_alarm_manager_plus/README.md | 2 +- packages/android_alarm_manager_plus/example/lib/main.dart | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/android_alarm_manager_plus/README.md b/packages/android_alarm_manager_plus/README.md index 52e36c9b02..7c3404bded 100644 --- a/packages/android_alarm_manager_plus/README.md +++ b/packages/android_alarm_manager_plus/README.md @@ -20,7 +20,7 @@ Dart code in the background when alarms fire. - Flutter >=3.12.0 - Dart >=3.1.0 <4.0.0 - Java 17 -- Android Gradle Plugin >=8.9.1 +- Android Gradle Plugin >=8.12.1 - Gradle wrapper >=8.11.1 ## Getting Started diff --git a/packages/android_alarm_manager_plus/example/lib/main.dart b/packages/android_alarm_manager_plus/example/lib/main.dart index 2eefbc0353..061f5af4a6 100644 --- a/packages/android_alarm_manager_plus/example/lib/main.dart +++ b/packages/android_alarm_manager_plus/example/lib/main.dart @@ -82,6 +82,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> { void _checkExactAlarmPermission() async { final currentStatus = await Permission.scheduleExactAlarm.status; + if (!mounted) return; setState(() { _exactAlarmPermissionStatus = currentStatus; }); From e11df898e9be693b39776a9fdac477864dfc2d50 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 7 Sep 2025 23:10:17 +0300 Subject: [PATCH 3/3] chore(android_alarm_manager_plus): Bump AGP to 8.12.1, fix integration test --- packages/android_alarm_manager_plus/README.md | 3 ++- packages/android_alarm_manager_plus/android/build.gradle | 2 +- .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../android_alarm_manager_plus/example/android/settings.gradle | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/android_alarm_manager_plus/README.md b/packages/android_alarm_manager_plus/README.md index 7c3404bded..ef7f9d5248 100644 --- a/packages/android_alarm_manager_plus/README.md +++ b/packages/android_alarm_manager_plus/README.md @@ -20,8 +20,9 @@ Dart code in the background when alarms fire. - Flutter >=3.12.0 - Dart >=3.1.0 <4.0.0 - Java 17 +- Kotlin 2.2.0 - Android Gradle Plugin >=8.12.1 -- Gradle wrapper >=8.11.1 +- Gradle wrapper >=8.13 ## Getting Started diff --git a/packages/android_alarm_manager_plus/android/build.gradle b/packages/android_alarm_manager_plus/android/build.gradle index ba26efc19b..dd1a6e495d 100644 --- a/packages/android_alarm_manager_plus/android/build.gradle +++ b/packages/android_alarm_manager_plus/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.9.1' + classpath 'com.android.tools.build:gradle:8.12.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties index 6bc47cfd46..5fe58a5ed3 100644 --- a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 05 12:15:50 EEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/android_alarm_manager_plus/example/android/settings.gradle b/packages/android_alarm_manager_plus/example/android/settings.gradle index c83ca031cc..f1c2904d82 100644 --- a/packages/android_alarm_manager_plus/example/android/settings.gradle +++ b/packages/android_alarm_manager_plus/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.9.1" apply false + id "com.android.application" version "8.12.1" apply false id "org.jetbrains.kotlin.android" version "2.2.0" apply false }