chore: update example to flutter 3.24.2

matiasleyba · matiasleyba · commit 7dc39cce5f96 · 2024-09-12T10:27:26.000-03:00
diff --git a/.github/workflows/ads_consent_client.yaml b/.github/workflows/ads_consent_client.yaml
@@ -16,6 +16,6 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/ads_consent_client
       coverage_excludes: "lib/src/generated/*.dart"
diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
@@ -16,7 +16,7 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/api
       analyze_directories: "routes lib test"
       coverage_excludes: "**/*.g.dart"
diff --git a/.github/workflows/app_ui.yaml b/.github/workflows/app_ui.yaml
@@ -16,6 +16,6 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/app_ui
       coverage_excludes: "lib/src/generated/*.dart"
diff --git a/.github/workflows/article_repository.yaml b/.github/workflows/article_repository.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/packages/article_repository
diff --git a/.github/workflows/authentication_client.yaml b/.github/workflows/authentication_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/packages/authentication_client/authentication_client
diff --git a/.github/workflows/deep_link_client.yaml b/.github/workflows/deep_link_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/deep_link_client
diff --git a/.github/workflows/email_launcher.yaml b/.github/workflows/email_launcher.yaml
@@ -16,6 +16,6 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/email_launcher
       coverage_excludes: "lib/src/generated/*.dart"
diff --git a/.github/workflows/firebase_authentication_client.yaml b/.github/workflows/firebase_authentication_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/authentication_client/firebase_authentication_client
diff --git a/.github/workflows/firebase_notifications_client.yaml b/.github/workflows/firebase_notifications_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/notifications_client/firebase_notifications_client
diff --git a/.github/workflows/flutter_news_example.yaml b/.github/workflows/flutter_news_example.yaml
@@ -36,7 +36,7 @@ jobs:
       - uses: subosito/flutter-action@v2.16.0
         with:
           channel: ${{matrix.channel}}
-          flutter-version: "3.22.2"
+          flutter-version: "3.24.2"
           cache: false
 
       - name: Install Dependencies
diff --git a/.github/workflows/form_inputs.yaml b/.github/workflows/form_inputs.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/packages/form_inputs
diff --git a/.github/workflows/in_app_purchase_repository.yaml b/.github/workflows/in_app_purchase_repository.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/in_app_purchase_repository
diff --git a/.github/workflows/news_blocks.yaml b/.github/workflows/news_blocks.yaml
@@ -17,5 +17,5 @@ jobs:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
       coverage_excludes: "**/*.g.dart"
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/api/packages/news_blocks
diff --git a/.github/workflows/news_blocks_ui.yaml b/.github/workflows/news_blocks_ui.yaml
@@ -16,6 +16,6 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/news_blocks_ui
       coverage_excludes: "lib/src/generated/*.dart"
diff --git a/.github/workflows/news_repository.yaml b/.github/workflows/news_repository.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/news_repository
diff --git a/.github/workflows/notifications_client.yaml b/.github/workflows/notifications_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/packages/notifications_client/notifications_client
diff --git a/.github/workflows/notifications_repository.yaml b/.github/workflows/notifications_repository.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/notifications_repository
diff --git a/.github/workflows/one_signal_notifications_client.yaml b/.github/workflows/one_signal_notifications_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/notifications_client/one_signal_notifications_client
diff --git a/.github/workflows/package_info_client.yaml b/.github/workflows/package_info_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/packages/package_info_client
diff --git a/.github/workflows/permission_client.yaml b/.github/workflows/permission_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/permission_client
diff --git a/.github/workflows/persistent_storage.yaml b/.github/workflows/persistent_storage.yaml
@@ -17,5 +17,5 @@ jobs:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
       coverage_excludes: "**/*.g.dart"
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/storage/persistent_storage
diff --git a/.github/workflows/purchase_client.yaml b/.github/workflows/purchase_client.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/purchase_client
diff --git a/.github/workflows/secure_storage.yaml b/.github/workflows/secure_storage.yaml
@@ -17,5 +17,5 @@ jobs:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
       coverage_excludes: "**/*.g.dart"
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/storage/secure_storage
diff --git a/.github/workflows/share_launcher.yaml b/.github/workflows/share_launcher.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/share_launcher
diff --git a/.github/workflows/storage.yaml b/.github/workflows/storage.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/packages/storage/storage
diff --git a/.github/workflows/token_storage.yaml b/.github/workflows/token_storage.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
     with:
-      dart_sdk: 3.4.3
+      dart_sdk: 3.5.0
       working_directory: flutter_news_example/packages/authentication_client/token_storage
diff --git a/.github/workflows/user_repository.yaml b/.github/workflows/user_repository.yaml
@@ -16,5 +16,5 @@ jobs:
   build:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
-      flutter_version: 3.22.2
+      flutter_version: 3.24.2
       working_directory: flutter_news_example/packages/user_repository
diff --git a/codemagic.yaml b/codemagic.yaml
@@ -48,7 +48,7 @@ workflows:
     working_directory: flutter_news_example
     max_build_duration: 60
     environment:
-      flutter: 3.22.2
+      flutter: 3.24.2
       xcode: latest
       cocoapods: default
       vars:
@@ -144,7 +144,7 @@ workflows:
     working_directory: flutter_news_example
     max_build_duration: 60
     environment:
-      flutter: 3.22.2
+      flutter: 3.24.2
       xcode: latest
       cocoapods: default
       vars:
diff --git a/flutter_news_example/android/app/build.gradle b/flutter_news_example/android/app/build.gradle
@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,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'
@@ -27,10 +28,6 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     compileSdkVersion 34
 
@@ -108,7 +105,6 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.guava:guava:27.0.1-android'
     implementation 'com.google.firebase:firebase-analytics:17.4.4'
     implementation 'com.google.firebase:firebase-crashlytics:17.1.1'
diff --git a/flutter_news_example/android/build.gradle b/flutter_news_example/android/build.gradle
@@ -1,18 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/flutter_news_example/android/settings.gradle b/flutter_news_example/android/settings.gradle
@@ -1,15 +1,27 @@
-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 flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.4.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+    id "com.google.gms.google-services" version "4.3.4" apply false
+    id "com.google.firebase.crashlytics" version "2.9.9" apply false
 }
+
+include ":app"
diff --git a/flutter_news_example/lib/article/view/article_page.dart b/flutter_news_example/lib/article/view/article_page.dart
@@ -89,9 +89,7 @@ class ArticleView extends StatelessWidget {
         context.select<AppBloc, bool>((bloc) => bloc.state.isUserSubscribed);
 
     return PopScope(
-      onPopInvoked: (_) async {
-        _onPop(context);
-      },
+      onPopInvokedWithResult: (_, __) => _onPop(context),
       child: HasToShowInterstitialAdListener(
         interstitialAdBehavior: interstitialAdBehavior,
         child: HasReachedArticleLimitListener(
diff --git a/flutter_news_example/lib/subscriptions/dialog/view/purchase_subscription_dialog.dart b/flutter_news_example/lib/subscriptions/dialog/view/purchase_subscription_dialog.dart
@@ -94,7 +94,13 @@ class PurchaseSubscriptionDialogView extends StatelessWidget {
                               context: context,
                               builder: (context) =>
                                   const PurchaseCompletedDialog(),
-                            ).then((_) => Navigator.maybePop(context));
+                            ).then(
+                              (_) {
+                                if (context.mounted) {
+                                  Navigator.maybePop<void>(context);
+                                }
+                              },
+                            );
                           }
                         },
                         builder: (context, state) {
diff --git a/flutter_news_example/packages/analytics_repository/pubspec.yaml b/flutter_news_example/packages/analytics_repository/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   equatable: ^2.0.0
-  firebase_analytics: ^11.0.0
+  firebase_analytics: ^11.3.1
   flutter:
     sdk: flutter
 
diff --git a/flutter_news_example/packages/authentication_client/firebase_authentication_client/pubspec.yaml b/flutter_news_example/packages/authentication_client/firebase_authentication_client/pubspec.yaml
@@ -9,14 +9,14 @@ environment:
 dependencies:
   authentication_client:
     path: ../authentication_client
-  firebase_auth: ^5.0.0
+  firebase_auth: ^5.2.1
   firebase_auth_platform_interface: ^7.0.9
-  firebase_core: ^3.0.0
+  firebase_core: ^3.4.1
   firebase_core_platform_interface: ^5.0.0
   flutter:
     sdk: flutter
-  flutter_facebook_auth: ^7.0.0
-  google_sign_in: ^6.0.2
+  flutter_facebook_auth: ^7.1.1
+  google_sign_in: ^6.2.1
   plugin_platform_interface: ^2.1.3
   sign_in_with_apple: ^6.1.0
   token_storage:
diff --git a/flutter_news_example/packages/deep_link_client/pubspec.yaml b/flutter_news_example/packages/deep_link_client/pubspec.yaml
@@ -7,8 +7,8 @@ environment:
 
 dependencies:
   equatable: ^2.0.3
-  firebase_core: ^3.0.0
-  firebase_dynamic_links: ^6.0.0
+  firebase_core: ^3.4.1
+  firebase_dynamic_links: ^6.0.6
   plugin_platform_interface: ^2.1.3
   rxdart: ^0.27.3
 
diff --git a/flutter_news_example/packages/notifications_client/firebase_notifications_client/pubspec.yaml b/flutter_news_example/packages/notifications_client/firebase_notifications_client/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  firebase_messaging: ^15.0.0
+  firebase_messaging: ^15.1.1
   flutter:
     sdk: flutter
   notifications_client:
diff --git a/flutter_news_example/packages/share_launcher/pubspec.yaml b/flutter_news_example/packages/share_launcher/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   equatable: ^2.0.3
   flutter:
     sdk: flutter
-  share_plus: ^10.0.0
+  share_plus: ^10.0.2
   share_plus_platform_interface: ^5.0.0
 
 dev_dependencies:
diff --git a/flutter_news_example/packages/storage/secure_storage/pubspec.yaml b/flutter_news_example/packages/storage/secure_storage/pubspec.yaml
diff --git a/flutter_news_example/pubspec.lock b/flutter_news_example/pubspec.lock
diff --git a/flutter_news_example/pubspec.yaml b/flutter_news_example/pubspec.yaml
diff --git a/flutter_news_example/test/subscriptions/dialog/view/purchase_subscription_dialog_test.dart b/flutter_news_example/test/subscriptions/dialog/view/purchase_subscription_dialog_test.dart
