From ab2dd035ca425d9a7d7e9a4086df8d8da3c18557 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 00:57:39 +0000 Subject: [PATCH 1/6] chore(deps): update flutter to v3.19.3 --- pubspec.lock | 42 +++++++++++++++++++++++++++++++++--------- pubspec.yaml | 2 +- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 3b340fd5..249db66b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -461,6 +461,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -489,26 +513,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: transitive description: @@ -577,10 +601,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_provider: dependency: transitive description: @@ -1100,4 +1124,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.16.9" + flutter: ">=3.19.3" diff --git a/pubspec.yaml b/pubspec.yaml index 8d1596a8..3e00032f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ version: 2.5.2 environment: sdk: '>=3.0.0 <4.0.0' - flutter: '3.16.9' + flutter: '3.19.3' dependencies: animated_toggle_switch: ^0.8.0 From 83aad267c7b8bbfa705b3f6c3355d77e5cbbbf65 Mon Sep 17 00:00:00 2001 From: Valentin REVERSAT Date: Mon, 11 Mar 2024 22:21:02 +0100 Subject: [PATCH 2/6] chore(gradle): bump gradle version --- android/app/build.gradle | 24 +++++++-------- android/app/src/main/AndroidManifest.xml | 3 +- android/build.gradle | 13 -------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 30 ++++++++++++++----- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8baaa39f..34f6b876 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,11 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + +ext.kotlin_version = '1.7.10' + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +14,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +24,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file('key.properties') if (keystorePropertiesFile.exists()) { @@ -32,6 +31,7 @@ if (keystorePropertiesFile.exists()) { } android { + namespace = "fr.vareversat.chabo" compileSdkVersion 33 @@ -42,8 +42,8 @@ android { // https://pub.dev/packages/flutter_local_notifications/ compileOptions { coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } defaultConfig { @@ -83,5 +83,5 @@ dependencies { // https://github.com/flutter/flutter/issues/110658 coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' // https://pub.dev/packages/flutter_local_notifications/ - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23" } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index bf7a5b14..1ba64e3a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/build.gradle b/android/build.gradle index be98ba87..bc157bd1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.23' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index cb576305..89e56bdb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 44e62bcf..1cd7bccc 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.2" apply false + id "org.jetbrains.kotlin.android" version "1.9.23" apply false +} + +include ":app" From c2e6d2fb878fbbafa1934dded1172bd12423ee4f Mon Sep 17 00:00:00 2001 From: Valentin REVERSAT Date: Mon, 11 Mar 2024 22:29:28 +0100 Subject: [PATCH 3/6] fix(ci): set correct version for Flutter --- .github/workflows/default.yaml | 4 ++-- .github/workflows/dev.yaml | 4 ++-- .github/workflows/main.yaml | 4 ++-- .github/workflows/tag.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index d83224b6..f6e6dad2 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -10,14 +10,14 @@ jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' secrets: passphrase: ${{ secrets.PASSPHRASE }} flutter-build: needs: [flutter-test-analyze] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' android_output: 'apk' env: 'dev' secrets: diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index d3cbaf5d..a04576b8 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -9,7 +9,7 @@ jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' secrets: passphrase: ${{ secrets.PASSPHRASE }} page: @@ -18,7 +18,7 @@ jobs: needs: [flutter-test-analyze] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' android_output: 'aab' env: 'dev' secrets: diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9a151c39..ec32bb05 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,14 +9,14 @@ jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' secrets: passphrase: ${{ secrets.PASSPHRASE }} flutter-build: needs: [flutter-test-analyze] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' android_output: 'aab' env: 'prd' secrets: diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml index f3313ff3..d605df06 100644 --- a/.github/workflows/tag.yaml +++ b/.github/workflows/tag.yaml @@ -9,14 +9,14 @@ jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' secrets: passphrase: ${{ secrets.PASSPHRASE }} flutter-build: needs: [flutter-test-analyze] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.9' + flutter_version: '3.19.3' android_output: 'aab' env: 'beta' secrets: From dfb913413b0b5fecba8fc04e5590b694b324cdf7 Mon Sep 17 00:00:00 2001 From: Valentin REVERSAT Date: Mon, 11 Mar 2024 22:36:57 +0100 Subject: [PATCH 4/6] fix(lint): remove use_build_context_synchronously linting error --- lib/bloc/scroll_status/scroll_status_bloc.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bloc/scroll_status/scroll_status_bloc.dart b/lib/bloc/scroll_status/scroll_status_bloc.dart index 925aaafa..0c1639a8 100644 --- a/lib/bloc/scroll_status/scroll_status_bloc.dart +++ b/lib/bloc/scroll_status/scroll_status_bloc.dart @@ -65,7 +65,7 @@ class ScrollStatusBloc extends Bloc { ); } - // ignore: use_build_context_synchronously + if (!targetContext.mounted) return; Scrollable.ensureVisible( targetContext, duration: const Duration(seconds: 1), From c8299d9829aecc9fbb355a79b88f331997f1506f Mon Sep 17 00:00:00 2001 From: Valentin REVERSAT Date: Mon, 11 Mar 2024 22:37:33 +0100 Subject: [PATCH 5/6] fix(android): add missing package name --- android/app/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1ba64e3a..bf7a5b14 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,5 @@ - + From 151a70b16dafe22d81d50bd86cbe2f6fce72c1bb Mon Sep 17 00:00:00 2001 From: Valentin REVERSAT Date: Mon, 11 Mar 2024 22:37:59 +0100 Subject: [PATCH 6/6] chore(ci): bump JAVA version to 17 --- .github/workflows/flutter.build.action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter.build.action.yaml b/.github/workflows/flutter.build.action.yaml index b9524bd4..2605f455 100644 --- a/.github/workflows/flutter.build.action.yaml +++ b/.github/workflows/flutter.build.action.yaml @@ -43,7 +43,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '11.x' + java-version: '17.x' - name: 'Setup Flutter' uses: subosito/flutter-action@v2.13.0 with: