From d8eb8aaa92d8a701520eba6003142fdcd7325170 Mon Sep 17 00:00:00 2001 From: MatsG23 Date: Mon, 11 Dec 2023 18:14:11 +0100 Subject: [PATCH 1/6] Upgrade Flutter dependencies --- pubspec.lock | 64 ++++++++++++++++++++++++++-------------------------- pubspec.yaml | 10 ++++---- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index a245d7dd..6fa4a416 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: "direct main" description: name: android_alarm_manager_plus - sha256: "82fb28c867c4b3dd7e9157728e46426b8916362f977dbba46b949210f00099f4" + sha256: "84720c8ad2758aabfbeafd24a8c355d8c8dd3aa52b01eaf3bb827c7210f61a91" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" args: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c" + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+6" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: dbus - sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263" + sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" url: "https://pub.dev" source: hosted - version: "0.7.8" + version: "0.7.10" fake_async: dependency: transitive description: @@ -114,10 +114,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "6d11ea777496061e583623aaf31923f93a9409ef8fcaeeefdd6cd78bf4fe5bb3" + sha256: bb5cd63ff7c91d6efe452e41d0d0ae6348925c82eafd10ce170ef585ea04776e url: "https://pub.dev" source: hosted - version: "16.1.0" + version: "16.2.0" flutter_local_notifications_linux: dependency: transitive description: @@ -241,10 +241,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" + sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" path_provider_foundation: dependency: transitive description: @@ -297,18 +297,18 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.7" provider: dependency: "direct main" description: name: provider - sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.1" rxdart: dependency: "direct main" description: @@ -470,42 +470,42 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27" + sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 url: "https://pub.dev" source: hosted - version: "6.1.14" + version: "6.2.2" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330 + sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f" + sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 url: "https://pub.dev" source: hosted - version: "6.1.5" + version: "6.2.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e + sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd" url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.1.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88 + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.1.0" url_launcher_platform_interface: dependency: transitive description: @@ -518,26 +518,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "043a0d5b83bb7a6f4f0040763dd7b23e75c8e1979cc1109a545054b6dcf56d17" + sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.0" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069" + sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc" url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.1.0" uuid: dependency: transitive description: name: uuid - sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7 + sha256: df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921 url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.2.1" vector_math: dependency: transitive description: @@ -558,10 +558,10 @@ packages: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.1.1" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b869db93..69860e8a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,15 +12,15 @@ dependencies: flutter_localizations: sdk: flutter http: ^1.1.0 - flutter_local_notifications: ^16.1.0 + flutter_local_notifications: ^16.2.0 shared_preferences: ^2.2.2 shared_preferences_android: ^2.2.1 - provider: ^6.0.5 + provider: ^6.1.1 rxdart: ^0.27.7 - url_launcher: ^6.1.14 + url_launcher: ^6.2.2 share_plus: ^7.2.1 - android_alarm_manager_plus: ^3.0.3 - intl: ^0.18.1 # for localizations + android_alarm_manager_plus: ^3.0.4 + intl: any # for localizations #icons_launcher: ^2.1.6 From a20246bc13714dda1f884b7e7d86c45f3bd83b37 Mon Sep 17 00:00:00 2001 From: MatsG23 Date: Mon, 11 Dec 2023 18:15:14 +0100 Subject: [PATCH 2/6] Upgrade Gradle version --- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 4d6272d9..559efb4c 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip From 13a7b5b07482798a61884e3e0a75c34dcc0f7d6c Mon Sep 17 00:00:00 2001 From: MatsG23 Date: Mon, 11 Dec 2023 18:15:53 +0100 Subject: [PATCH 3/6] Raise Kotlin and AGP version --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index cbb2c09f..f9d29e7d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = "1.9.10" + ext.kotlin_version = "1.9.21" repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" + classpath "com.android.tools.build:gradle:8.2.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 803f3ce687ba4038dc8e4762b134f95a623e4ecb Mon Sep 17 00:00:00 2001 From: MatsG23 Date: Mon, 11 Dec 2023 18:17:13 +0100 Subject: [PATCH 4/6] Setup flutter_local_notifications correctly --- android/app/build.gradle | 6 ++++++ android/app/src/main/AndroidManifest.xml | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 9680f97a..de7454e3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,6 +38,9 @@ android { compileOptions { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 + + // for flutter_local_notification: Flag to enable support for the new language APIs + coreLibraryDesugaringEnabled true } kotlin { @@ -95,4 +98,7 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + + // for flutter_local_notification plugin + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4" } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index bcdd9806..ea83347a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -52,6 +52,19 @@ + + + + + + + + + + + + + Date: Mon, 11 Dec 2023 18:18:54 +0100 Subject: [PATCH 5/6] Raise compileSdk and targetSdk to 34 (A14) --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index de7454e3..937b3751 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) { android { namespace "de.nucleus.foss_warn" - compileSdk 33 + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_17 @@ -54,7 +54,7 @@ android { defaultConfig { applicationId "de.nucleus.foss_warn" minSdkVersion 23 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } From 8a829da3253e63d670ba7900603c97b7bcfb97ff Mon Sep 17 00:00:00 2001 From: MatsG23 Date: Mon, 11 Dec 2023 18:19:17 +0100 Subject: [PATCH 6/6] Remove package name from manifest --- android/app/src/main/AndroidManifest.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ea83347a..6bd216e1 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,4 @@ - +