From 07bb2263052396f0553ff5956cb878bd8746e6cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Thu, 22 Feb 2024 09:32:18 +0100
Subject: [PATCH] Remove deprecation in flutter gradle plugin
---
android/app/build.gradle | 14 ++++-----
android/build.gradle | 13 +-------
android/gradle.properties | 4 +--
android/settings.gradle | 31 ++++++++++++++-----
.../metadata/android/en-US/changelogs/14.txt | 1 +
.../metadata/android/fr-FR/changelogs/14.txt | 1 +
pubspec.lock | 16 +++++-----
pubspec.yaml | 2 +-
8 files changed, 43 insertions(+), 39 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/14.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/14.txt
diff --git a/android/app/build.gradle b/android/app/build.gradle
index fef81b8..21a9eb1 100644
--- a/android/app/build.gradle
+++ b/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()) {
@@ -14,11 +20,6 @@ if (gradlePropertiesFile.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 appVersionCode = gradleProperties.getProperty('app.versionCode')
if (appVersionCode == null) {
appVersionCode = '1'
@@ -29,9 +30,6 @@ if (appVersionName == null) {
appVersionName = '1.0'
}
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
diff --git a/android/build.gradle b/android/build.gradle
index 942b40b..bc157bd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,18 +1,7 @@
-buildscript {
- repositories {
- google()
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:7.2.2'
- }
-}
-
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
}
}
diff --git a/android/gradle.properties b/android/gradle.properties
index 6638812..81949df 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.13
-app.versionCode=13
+app.versionName=0.0.14
+app.versionCode=14
diff --git a/android/settings.gradle b/android/settings.gradle
index 44e62bc..8cc46c0 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,11 +1,26 @@
-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
+ }
+ settings.ext.flutterSdkPath = flutterSdkPath()
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+ includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+ repositories {
+ google()
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+ id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+ id "com.android.application" version "7.2.2" apply false
+ id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+}
+
+include ":app"
diff --git a/fastlane/metadata/android/en-US/changelogs/14.txt b/fastlane/metadata/android/en-US/changelogs/14.txt
new file mode 100644
index 0000000..93da4f9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/14.txt
@@ -0,0 +1 @@
+Update flutter gradle plugin.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/14.txt b/fastlane/metadata/android/fr-FR/changelogs/14.txt
new file mode 100644
index 0000000..6ae0c1e
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/14.txt
@@ -0,0 +1 @@
+Mise à jour du plugin gradle pour flutter.
diff --git a/pubspec.lock b/pubspec.lock
index a8b4df1..c876a73 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -63,10 +63,10 @@ packages:
dependency: "direct main"
description:
name: http
- sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
+ sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
url: "https://pub.dev"
source: hosted
- version: "1.2.0"
+ version: "1.2.1"
http_parser:
dependency: transitive
description:
@@ -207,10 +207,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_web
- sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+ sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
url: "https://pub.dev"
source: hosted
- version: "2.2.2"
+ version: "2.3.0"
shared_preferences_windows:
dependency: transitive
description:
@@ -268,10 +268,10 @@ packages:
dependency: transitive
description:
name: web
- sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
+ sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
url: "https://pub.dev"
source: hosted
- version: "0.4.2"
+ version: "0.5.0"
win32:
dependency: transitive
description:
@@ -289,5 +289,5 @@ packages:
source: hosted
version: "1.0.4"
sdks:
- dart: ">=3.3.0-279.1.beta <4.0.0"
- flutter: ">=3.16.0"
+ dart: ">=3.3.0 <4.0.0"
+ flutter: ">=3.19.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5a06a4f..fe5c8ff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: plotter
description: A plotter helper application.
publish_to: 'none'
-version: 0.0.13+13
+version: 0.0.14+14
environment:
sdk: '^3.0.0'
--
GitLab