From 783f322edfd8cc46ae275b1f7a11305a13d97ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Thu, 22 Feb 2024 08:52:54 +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/59.txt  |  1 +
 .../metadata/android/fr-FR/changelogs/59.txt  |  1 +
 pubspec.yaml                                  |  2 +-
 7 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/59.txt
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/59.txt

diff --git a/android/app/build.gradle b/android/app/build.gradle
index ae56e97..789da53 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 ecb37da..375d32e 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.58
-app.versionCode=58
+app.versionName=0.0.59
+app.versionCode=59
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/59.txt b/fastlane/metadata/android/en-US/changelogs/59.txt
new file mode 100644
index 0000000..93da4f9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/59.txt
@@ -0,0 +1 @@
+Update flutter gradle plugin.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/59.txt b/fastlane/metadata/android/fr-FR/changelogs/59.txt
new file mode 100644
index 0000000..6ae0c1e
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/59.txt
@@ -0,0 +1 @@
+Mise à jour du plugin gradle pour flutter.
diff --git a/pubspec.yaml b/pubspec.yaml
index a3d41eb..3da8cf2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: puzzlegame
 description: A puzzle game application.
 publish_to: 'none'
-version: 0.0.58+58
+version: 0.0.59+59
 
 environment:
   sdk: '^3.0.0'
-- 
GitLab