From 4b573241088b14a7a6f0f5407bd2296f99283638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr> Date: Mon, 14 Feb 2022 21:20:54 +0100 Subject: [PATCH] Upgrade flutter framework and dependencies --- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 11 ----------- android/gradle.properties | 4 ++-- pubspec.lock | 11 ++--------- pubspec.yaml | 2 +- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index beec0ce..e68f940 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -44,7 +44,7 @@ android { defaultConfig { applicationId "org.benoitharrault.wordguessing" minSdkVersion 16 - targetSdkVersion 31 + targetSdkVersion 30 versionCode appVersionCode.toInteger() versionName appVersionName archivesBaseName = "$applicationId" + "_" + "$versionCode" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7f72236..06c148f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -10,19 +10,10 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> - <!-- Specifies an Android theme to apply to this Activity as soon as - the Android process has started. This theme is visible to the user - while the Flutter UI initializes. After that, this theme continues - to determine the Window background behind the Flutter UI. --> <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" /> - <!-- Displays an Android View that continues showing the launch screen - Drawable until Flutter paints its first frame, then this splash - screen fades out. A splash screen is useful to avoid any visual - gap between the end of Android's launch screen and the painting of - Flutter's first frame. --> <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" @@ -32,8 +23,6 @@ <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> - <!-- Don't delete the meta-data below. - This is used by the Flutter tool to generate GeneratedPluginRegistrant.java --> <meta-data android:name="flutterEmbedding" android:value="2" /> diff --git a/android/gradle.properties b/android/gradle.properties index ebc8b56..54efb93 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.1.21 -app.versionCode=45 +app.versionName=0.1.22 +app.versionCode=46 diff --git a/pubspec.lock b/pubspec.lock index ea35171..6f3d123 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -66,7 +66,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.2" + version: "0.13.4" http_parser: dependency: transitive description: @@ -109,20 +109,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.0" provider: dependency: "direct main" description: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.2" sky_engine: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 3673be2..6d45b4d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: flutter: sdk: flutter http: ^0.13.1 - provider: ^5.0.0 + provider: ^6.0.2 dev_dependencies: flutter_test: -- GitLab