diff --git a/packages/android_alarm_manager_plus/README.md b/packages/android_alarm_manager_plus/README.md index 33311e2ece..ef7f9d5248 100644 --- a/packages/android_alarm_manager_plus/README.md +++ b/packages/android_alarm_manager_plus/README.md @@ -19,10 +19,10 @@ 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 +- Kotlin 2.2.0 +- Android Gradle Plugin >=8.12.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 9cfc9732ff..dd1a6e495d 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.12.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..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.4-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 fa3b4d0878..f1c2904d82 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.12.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/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; }); 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: