From 6499301f84f66089a7a481c8c39fae91f6d97730 Mon Sep 17 00:00:00 2001
From: Tyler-Larkin <tyllark@amazon.com>
Date: Fri, 14 Feb 2025 15:34:28 -0800
Subject: [PATCH] chore(analytics): Migrate Analytics Gradle to declarative
 plugin blocks

---
 .../android/build.gradle                      | 21 +++++++++----
 .../android/settings.gradle                   | 26 +---------------
 .../example/android/app/build.gradle          | 16 ++++------
 .../example/android/build.gradle              | 13 --------
 .../example/android/settings.gradle           | 30 ++++++++++++++-----
 5 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/packages/analytics/amplify_analytics_pinpoint/android/build.gradle b/packages/analytics/amplify_analytics_pinpoint/android/build.gradle
index ed68d36584..584850470f 100644
--- a/packages/analytics/amplify_analytics_pinpoint/android/build.gradle
+++ b/packages/analytics/amplify_analytics_pinpoint/android/build.gradle
@@ -1,17 +1,24 @@
 group 'com.amazonaws.amplify.amplify_analytics_pinpoint'
 version '1.0-SNAPSHOT'
 
-rootProject.allprojects {
+buildscript {
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
     }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
 }
 
-plugins {
-    id "com.android.library"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
+rootProject.allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
 }
 
 apply plugin: 'com.android.library'
@@ -40,5 +47,7 @@ android {
     namespace 'com.amazonaws.amplify.amplify_analytics_pinpoint'
 }
 
-dependencies {}
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
 
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/settings.gradle b/packages/analytics/amplify_analytics_pinpoint/android/settings.gradle
index 276cdabf9c..828ffda158 100644
--- a/packages/analytics/amplify_analytics_pinpoint/android/settings.gradle
+++ b/packages/analytics/amplify_analytics_pinpoint/android/settings.gradle
@@ -1,25 +1 @@
-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
-    }()
-
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
-}
-
-include ":app"
+rootProject.name = 'amplify_analytics_pinpoint'
diff --git a/packages/analytics/amplify_analytics_pinpoint/example/android/app/build.gradle b/packages/analytics/amplify_analytics_pinpoint/example/android/app/build.gradle
index a824c4943f..9b3fde71cc 100644
--- a/packages/analytics/amplify_analytics_pinpoint/example/android/app/build.gradle
+++ b/packages/analytics/amplify_analytics_pinpoint/example/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 GradleException("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"
-
 android {
     namespace 'com.amazonaws.amplify.amplify_analytics_pinpoint_example'
     compileSdk flutter.compileSdkVersion
@@ -66,5 +63,4 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle b/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle
index 070b4ffbfd..bc157bd1a1 100644
--- a/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle
+++ b/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.9.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/packages/analytics/amplify_analytics_pinpoint/example/android/settings.gradle b/packages/analytics/amplify_analytics_pinpoint/example/android/settings.gradle
index 44e62bcf06..276cdabf9c 100644
--- a/packages/analytics/amplify_analytics_pinpoint/example/android/settings.gradle
+++ b/packages/analytics/amplify_analytics_pinpoint/example/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.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
+}
+
+include ":app"