From f186161e1703d8ade6ff37f185531f4d63649b99 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 5 Oct 2021 12:05:46 +0300 Subject: [PATCH 1/6] Update Android dependencies, Gradle wrapper properties, add useAndroidX flag --- packages/android_alarm_manager_plus/android/build.gradle | 6 +++--- .../android_alarm_manager_plus/android/gradle.properties | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/android_alarm_manager_plus/android/build.gradle b/packages/android_alarm_manager_plus/android/build.gradle index de223d961b..fa245aaa46 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' } } @@ -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 From 8494eed4b82bab6cc2bfd449ba6fc2a41b6fb941 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 5 Oct 2021 12:26:10 +0300 Subject: [PATCH 2/6] Update Android dependencies for Alarm manager example --- .../example/android/app/build.gradle | 13 ++++++------- .../example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 2 -- .../gradle/wrapper/gradle-wrapper.properties | 6 +++--- 4 files changed, 11 insertions(+), 14 deletions(-) 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..49f7cbc589 100644 --- a/packages/android_alarm_manager_plus/example/android/app/build.gradle +++ b/packages/android_alarm_manager_plus/example/android/app/build.gradle @@ -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 From c31ce80eb7200e1d1df44dfafcc606f8cfbda68a Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 5 Oct 2021 12:32:39 +0300 Subject: [PATCH 3/6] Bump target and compile SDK version for Alarm manager plugin and example to 30 --- packages/android_alarm_manager_plus/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../example/ios/Flutter/Debug.xcconfig | 1 + .../example/ios/Flutter/Release.xcconfig | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/android_alarm_manager_plus/android/build.gradle b/packages/android_alarm_manager_plus/android/build.gradle index fa245aaa46..0423d790c7 100644 --- a/packages/android_alarm_manager_plus/android/build.gradle +++ b/packages/android_alarm_manager_plus/android/build.gradle @@ -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 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 49f7cbc589..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 diff --git a/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig b/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig index 592ceee85b..ec97fc6f30 100644 --- a/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig +++ b/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig b/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig index 592ceee85b..c4855bfe20 100644 --- a/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig +++ b/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" From 3a9e06b55a14d7277a12e340d4559cdf15453e84 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 5 Oct 2021 12:37:40 +0300 Subject: [PATCH 4/6] Update changelog --- packages/android_alarm_manager_plus/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/android_alarm_manager_plus/CHANGELOG.md b/packages/android_alarm_manager_plus/CHANGELOG.md index f3415dda42..664d8b7025 100644 --- a/packages/android_alarm_manager_plus/CHANGELOG.md +++ b/packages/android_alarm_manager_plus/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.3.4 + +- 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. From 395071d08f64d28ec8676a014dd72d8f1f1ebc18 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 5 Oct 2021 13:14:12 +0300 Subject: [PATCH 5/6] Revert changes to ios configs --- .../example/ios/Flutter/Debug.xcconfig | 1 - .../example/ios/Flutter/Release.xcconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig b/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig index ec97fc6f30..592ceee85b 100644 --- a/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig +++ b/packages/android_alarm_manager_plus/example/ios/Flutter/Debug.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig b/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig index c4855bfe20..592ceee85b 100644 --- a/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig +++ b/packages/android_alarm_manager_plus/example/ios/Flutter/Release.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" From c6e8c1ae760fd4a37d988db9deb4a7a69b67bb49 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 5 Oct 2021 14:28:14 +0300 Subject: [PATCH 6/6] Bump android alarm version --- packages/android_alarm_manager_plus/CHANGELOG.md | 4 ++++ packages/android_alarm_manager_plus/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/android_alarm_manager_plus/CHANGELOG.md b/packages/android_alarm_manager_plus/CHANGELOG.md index 1fa062d8bd..85e2ac6af2 100644 --- a/packages/android_alarm_manager_plus/CHANGELOG.md +++ b/packages/android_alarm_manager_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 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) 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/