Migrated gradle build scripts to work with latest Flutter

Author: sveinbjornt

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()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -64,9 +61,7 @@ android {
             minifyEnabled false
 
             signingConfig signingConfigs.debug
-
-
-            // signingConfig signingConfigs.release
+            //signingConfig signingConfigs.release
         }
     }
 }

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.9.25'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        // classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.android.tools.build:gradle:8.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
 
 allprojects {
     repositories {

android/settings.gradle

@@ -1,11 +1,25 @@
-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
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$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 "8.1.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.25" apply false
+}
+
+include ":app"

lib/info.dart

@@ -26,7 +26,7 @@ import 'package:flutter/material.dart';
 
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:platform_device_id/platform_device_id.dart';
+// import 'package:platform_device_id/platform_device_id.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:embla_core/embla_core.dart' show kEmblaCoreVersion;
 
@@ -73,7 +73,7 @@ Future<String> getMarketingVersion() async {
 /// On both iOS and Android, this is unique for all apps from
 /// a single vendor.
 Future<String> getUniqueDeviceIdentifier() async {
-  return await PlatformDeviceId.getDeviceId ?? "";
+  return ""; // await PlatformDeviceId.getDeviceId ?? "";
 }
 
 /// Return canonical client type string (e.g. 'ios_native', 'android_flutter', etc.)

pubspec.yaml

@@ -1,7 +1,7 @@
 name: embla
 description: Cross-platform mobile Icelandic-language voice assistant.
 publish_to: 'none'
-version: 1.4.1+1
+version: 1.4.1+596
 homepage: https://embla.is
 repository: https://github.com/mideind/EmblaFlutterApp
 
@@ -19,10 +19,10 @@ dependencies:
   package_info_plus: ^8.0.1
   device_info_plus: ^10.1.1
   url_launcher: '^6.3.0'
-  platform_device_id:
-    git:
-      url: https://github.com/tommysolsen/platform_device_id.git
-      path: platform_device_id
+  # platform_device_id:
+  #   git:
+  #     url: https://github.com/tommysolsen/platform_device_id.git
+  #     path: platform_device_id
   connectivity_plus: '>=5.0.2'
   webview_flutter: ^4.8.0
   path_provider: '^2.1.4'