diff --git a/packages/android_alarm_manager_plus/CHANGELOG.md b/packages/android_alarm_manager_plus/CHANGELOG.md index b753464af6..85e2ac6af2 100644 --- a/packages/android_alarm_manager_plus/CHANGELOG.md +++ b/packages/android_alarm_manager_plus/CHANGELOG.md @@ -1,12 +1,16 @@ +## 2.0.1 + +- Update Android related dependencies and bump targetSDK to 30 (Android 11) + ## 2.0.0 - Remove deprecated method `registerWith` (of Android v1 embedding) +- Update Android related dependencies and bump targetSDK to 30 (Android 11) ## 1.3.3 - Fix for periodic alarm being not being exact after some time by adding `allowWhileIdle` parameter - ## 1.3.2 - Fix build issue introduced in 1.3.1. diff --git a/packages/android_alarm_manager_plus/android/build.gradle b/packages/android_alarm_manager_plus/android/build.gradle index de223d961b..0423d790c7 100644 --- a/packages/android_alarm_manager_plus/android/build.gradle +++ b/packages/android_alarm_manager_plus/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.2' } } @@ -22,7 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 30 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -37,6 +37,6 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.0' - api 'androidx.core:core:1.0.1' + implementation 'androidx.appcompat:appcompat:1.3.1' + api 'androidx.core:core:1.6.0' } diff --git a/packages/android_alarm_manager_plus/android/gradle.properties b/packages/android_alarm_manager_plus/android/gradle.properties index 7be3d8b468..d9cf55df7c 100644 --- a/packages/android_alarm_manager_plus/android/gradle.properties +++ b/packages/android_alarm_manager_plus/android/gradle.properties @@ -1,2 +1,2 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true +android.useAndroidX=true 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 index 01a286e96a..4c48f748fd 100644 --- a/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Oct 05 10:00:26 EEST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +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 a63ec3d587..1e7ed3a606 100644 --- a/packages/android_alarm_manager_plus/example/android/app/build.gradle +++ b/packages/android_alarm_manager_plus/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 30 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.example" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName multiDexEnabled true @@ -61,12 +61,11 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:multidex:1.0.3' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation 'junit:junit:4.12' - testImplementation "com.google.truth:truth:1.0" - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - api 'androidx.test:core:1.2.0' + testImplementation 'junit:junit:4.13.2' + testImplementation "com.google.truth:truth:1.1.3" + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + api 'androidx.test:core:1.4.0' } diff --git a/packages/android_alarm_manager_plus/example/android/build.gradle b/packages/android_alarm_manager_plus/example/android/build.gradle index 1c3dabf72d..319ffbb049 100644 --- a/packages/android_alarm_manager_plus/example/android/build.gradle +++ b/packages/android_alarm_manager_plus/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.31' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/android_alarm_manager_plus/example/android/gradle.properties b/packages/android_alarm_manager_plus/example/android/gradle.properties index 38c8d4544f..d9cf55df7c 100644 --- a/packages/android_alarm_manager_plus/example/android/gradle.properties +++ b/packages/android_alarm_manager_plus/example/android/gradle.properties @@ -1,4 +1,2 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true -android.enableJetifier=true 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 296b146b73..4f7d42a327 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 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Tue Oct 05 12:15:50 EEST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/packages/android_alarm_manager_plus/pubspec.yaml b/packages/android_alarm_manager_plus/pubspec.yaml index 01e5946c81..b8e99c5472 100644 --- a/packages/android_alarm_manager_plus/pubspec.yaml +++ b/packages/android_alarm_manager_plus/pubspec.yaml @@ -1,7 +1,7 @@ name: android_alarm_manager_plus description: Flutter plugin for accessing the Android AlarmManager service, and running Dart code in the background when alarms fire. -version: 2.0.0 +version: 2.0.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/