From 2c954ceea2039d15028a7550f1eac54b199e474d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Thu, 5 Oct 2023 14:25:18 +0200
Subject: [PATCH] Upgrade framework, build tools and dependencies
---
.gitlab-ci.yml | 2 +-
android/app/build.gradle | 3 +-
android/build.gradle | 4 +-
android/gradle.properties | 4 +-
.../gradle/wrapper/gradle-wrapper.properties | 3 +-
.../metadata/android/en-US/changelogs/17.txt | 1 +
.../metadata/android/fr-FR/changelogs/17.txt | 1 +
pubspec.lock | 122 ++++--------------
pubspec.yaml | 6 +-
9 files changed, 34 insertions(+), 112 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/17.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/17.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d0e11e..69e9954 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: cirrusci/flutter:latest
+image: ghcr.io/cirruslabs/flutter:latest
stages:
- update
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 126b1bb..c730254 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,7 +39,8 @@ if (keystorePropertiesFile.exists()) {
}
android {
- compileSdkVersion 31
+ compileSdkVersion 33
+ namespace "org.benoitharrault.puissance4"
defaultConfig {
applicationId "org.benoitharrault.puissance4"
diff --git a/android/build.gradle b/android/build.gradle
index c9e3db0..942b40b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.0'
+ classpath 'com.android.tools.build:gradle:7.2.2'
}
}
@@ -24,6 +24,6 @@ subprojects {
project.evaluationDependsOn(':app')
}
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
delete rootProject.buildDir
}
diff --git a/android/gradle.properties b/android/gradle.properties
index f7fb550..a910253 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=1.0.15
-app.versionCode=16
+app.versionName=1.0.16
+app.versionCode=17
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58a..b1159fc 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/fastlane/metadata/android/en-US/changelogs/17.txt b/fastlane/metadata/android/en-US/changelogs/17.txt
new file mode 100644
index 0000000..209bc5e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/17.txt
@@ -0,0 +1 @@
+Upgrade framework, build tools and dependencies
diff --git a/fastlane/metadata/android/fr-FR/changelogs/17.txt b/fastlane/metadata/android/fr-FR/changelogs/17.txt
new file mode 100644
index 0000000..f318ef5
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/17.txt
@@ -0,0 +1 @@
+Mise à jour du framework, des outils de construction et des dépendances
diff --git a/pubspec.lock b/pubspec.lock
index e15edce..840facd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,139 +1,63 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
- async:
- dependency: transitive
- description:
- name: async
- url: "https://pub.dartlang.org"
- source: hosted
- version: "2.9.0"
- boolean_selector:
- dependency: transitive
- description:
- name: boolean_selector
- url: "https://pub.dartlang.org"
- source: hosted
- version: "2.1.0"
characters:
dependency: transitive
description:
name: characters
- url: "https://pub.dartlang.org"
+ sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+ url: "https://pub.dev"
source: hosted
- version: "1.2.1"
- clock:
- dependency: transitive
- description:
- name: clock
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.1.1"
+ version: "1.3.0"
collection:
dependency: transitive
description:
name: collection
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.16.0"
- fake_async:
- dependency: transitive
- description:
- name: fake_async
- url: "https://pub.dartlang.org"
+ sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+ url: "https://pub.dev"
source: hosted
- version: "1.3.1"
+ version: "1.17.2"
flutter:
dependency: "direct main"
description: flutter
source: sdk
version: "0.0.0"
- flutter_test:
- dependency: "direct dev"
- description: flutter
- source: sdk
- version: "0.0.0"
- matcher:
- dependency: transitive
- description:
- name: matcher
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.12.12"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- url: "https://pub.dartlang.org"
+ sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+ url: "https://pub.dev"
source: hosted
- version: "0.1.5"
+ version: "0.5.0"
meta:
dependency: transitive
description:
name: meta
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.8.0"
- path:
- dependency: transitive
- description:
- name: path
- url: "https://pub.dartlang.org"
+ sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+ url: "https://pub.dev"
source: hosted
- version: "1.8.2"
+ version: "1.9.1"
sky_engine:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
- source_span:
- dependency: transitive
- description:
- name: source_span
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.9.0"
- stack_trace:
- dependency: transitive
- description:
- name: stack_trace
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.10.0"
- stream_channel:
- dependency: transitive
- description:
- name: stream_channel
- url: "https://pub.dartlang.org"
- source: hosted
- version: "2.1.0"
- string_scanner:
- dependency: transitive
- description:
- name: string_scanner
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.1.1"
- term_glyph:
- dependency: transitive
- description:
- name: term_glyph
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.2.1"
- test_api:
+ vector_math:
dependency: transitive
description:
- name: test_api
- url: "https://pub.dartlang.org"
+ name: vector_math
+ sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+ url: "https://pub.dev"
source: hosted
- version: "0.4.12"
- vector_math:
+ version: "2.1.4"
+ web:
dependency: transitive
description:
- name: vector_math
- url: "https://pub.dartlang.org"
+ name: web
+ sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+ url: "https://pub.dev"
source: hosted
- version: "2.1.2"
+ version: "0.1.4-beta"
sdks:
- dart: ">=2.17.0-0 <3.0.0"
+ dart: ">=3.1.0-185.0.dev <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index f9e000c..8856596 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,15 +4,11 @@ publish_to: 'none'
version: 1.0.0+1
environment:
- sdk: ">=2.16.1 <3.0.0"
+ sdk: '^3.0.0'
dependencies:
flutter:
sdk: flutter
-dev_dependencies:
- flutter_test:
- sdk: flutter
-
flutter:
uses-material-design: true
--
GitLab