Skip to content

Commit

Permalink
chore: update example to flutter 3.24.2
Browse files Browse the repository at this point in the history
  • Loading branch information
matiasleyba committed Sep 12, 2024
1 parent a2f960e commit 7dc39cc
Show file tree
Hide file tree
Showing 42 changed files with 185 additions and 194 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ads_consent_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/app_ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/article_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/authentication_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/deep_link_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/email_launcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/firebase_authentication_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/firebase_notifications_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/flutter_news_example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: subosito/[email protected]
with:
channel: ${{matrix.channel}}
flutter-version: "3.22.2"
flutter-version: "3.24.2"
cache: false

- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/form_inputs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/in_app_purchase_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/news_blocks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/news_blocks_ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/news_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/notifications_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/notifications_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/one_signal_notifications_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/package_info_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/permission_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/persistent_storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/purchase_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/secure_storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/share_launcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/token_storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/user_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions codemagic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
16 changes: 6 additions & 10 deletions flutter_news_example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -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()) {
Expand All @@ -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'
Expand All @@ -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

Expand Down Expand Up @@ -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'
Expand Down
15 changes: 0 additions & 15 deletions flutter_news_example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
32 changes: 22 additions & 10 deletions flutter_news_example/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 1 addition & 3 deletions flutter_news_example/lib/article/view/article_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ environment:

dependencies:
equatable: ^2.0.0
firebase_analytics: ^11.0.0
firebase_analytics: ^11.3.1
flutter:
sdk: flutter

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions flutter_news_example/packages/deep_link_client/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion flutter_news_example/packages/share_launcher/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading

0 comments on commit 7dc39cc

Please sign in to comment.