From 2bb020ee3d44dbed81977d6a279de839c341cdaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Mon, 14 Feb 2022 23:39:37 +0100
Subject: [PATCH] Upgrade flutter framework and dependencies
---
android/app/build.gradle | 2 +-
android/app/src/main/AndroidManifest.xml | 11 --------
android/gradle.properties | 4 +--
.../metadata/android/en-US/changelogs/39.txt | 1 +
.../metadata/android/fr-FR/changelogs/39.txt | 1 +
pubspec.lock | 25 ++++++++++++-------
pubspec.yaml | 2 +-
7 files changed, 22 insertions(+), 24 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/39.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/39.txt
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 745fc7c..56ca393 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,7 +39,7 @@ if (keystorePropertiesFile.exists()) {
}
android {
- compileSdkVersion 30
+ compileSdkVersion 31
defaultConfig {
applicationId "org.benoitharrault.puzzlegame"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7ac541b..a9b03a7 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 604fc08..c8bbff9 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.0.38
-app.versionCode=38
+app.versionName=0.0.39
+app.versionCode=39
diff --git a/fastlane/metadata/android/en-US/changelogs/39.txt b/fastlane/metadata/android/en-US/changelogs/39.txt
new file mode 100644
index 0000000..c292287
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39.txt
@@ -0,0 +1 @@
+Upgrade flutter framework and dependencies
diff --git a/fastlane/metadata/android/fr-FR/changelogs/39.txt b/fastlane/metadata/android/fr-FR/changelogs/39.txt
new file mode 100644
index 0000000..7c82ad0
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/39.txt
@@ -0,0 +1 @@
+Mise à jour du framework flutter et de ses dépendances
diff --git a/pubspec.lock b/pubspec.lock
index e7b6bfe..5124f45 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
- version: "3.1.2"
+ version: "3.2.0"
async:
dependency: transitive
description:
@@ -28,7 +28,7 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.2.0"
charcode:
dependency: transitive
description:
@@ -80,7 +80,7 @@ packages:
name: image
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.2"
+ version: "3.1.1"
matcher:
dependency: transitive
description:
@@ -88,6 +88,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.3"
meta:
dependency: transitive
description:
@@ -115,14 +122,14 @@ packages:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
- version: "4.1.0"
+ version: "4.4.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
@@ -169,7 +176,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.3"
+ version: "0.4.8"
typed_data:
dependency: transitive
description:
@@ -183,14 +190,14 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
- version: "5.1.1"
+ version: "5.3.1"
sdks:
- dart: ">=2.12.0 <3.0.0"
+ dart: ">=2.14.0 <3.0.0"
flutter: ">=1.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index bb894db..dbeeb10 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
flutter:
sdk: flutter
image: ^3.0.2
- provider: ^5.0.0
+ provider: ^6.0.2
dev_dependencies:
flutter_test:
--
GitLab