From c6742987ca65c228ea462f33862063a296562eae Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 5 Aug 2024 10:06:00 +0800
Subject: [PATCH 1/3] Try out com.gradleup.shadow

---
 build.gradle.kts | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1b441d2..ed834b3 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,24 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+buildscript {
+  repositories {
+    mavenCentral()
+    maven("https://oss.sonatype.org/content/repositories/snapshots/")
+  }
+  dependencies {
+    classpath("com.gradleup.shadow:shadow-gradle-plugin:8.3.0-SNAPSHOT")
+  }
+}
+
 plugins {
   kotlin("jvm") version "2.0.0"
   id("com.github.gmazzo.buildconfig") version "5.4.0"
-  id("io.github.goooler.shadow") version "8.1.8"
   id("com.diffplug.spotless") version "7.0.0.BETA1"
   id("com.android.lint") version "8.5.1"
 }
 
+apply(plugin = "com.gradleup.shadow")
+
 version = "0.3.0-SNAPSHOT"
 val baseName = "string-res-exporter"
 
@@ -23,7 +36,7 @@ tasks.withType<Jar>().configureEach {
   }
 }
 
-tasks.shadowJar {
+val shadowJar = tasks.named("shadowJar", ShadowJar::class) {
   dependsOn(tasks.jar)
 
   exclude(
@@ -52,9 +65,9 @@ tasks.shadowJar {
 val r8File = layout.buildDirectory.file("libs/$baseName-$version-r8.jar").map { it.asFile }
 val rulesFile = project.file("src/main/rules.pro")
 val r8Jar by tasks.registering(JavaExec::class) {
-  dependsOn(tasks.shadowJar)
+  dependsOn(shadowJar)
 
-  val fatJarFile = tasks.shadowJar.get().archiveFile
+  val fatJarFile = shadowJar.get().archiveFile
   inputs.file(fatJarFile)
   inputs.file(rulesFile)
   outputs.file(r8File)

From 99d366c7c3fa88d8e630e2d7888f4de23d06f410 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 5 Aug 2024 20:25:59 +0800
Subject: [PATCH 2/3] Migrate to snapshot plugin marker

---
 build.gradle.kts    | 21 ++++-----------------
 settings.gradle.kts |  1 +
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ed834b3..641b5b5 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,24 +1,11 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-buildscript {
-  repositories {
-    mavenCentral()
-    maven("https://oss.sonatype.org/content/repositories/snapshots/")
-  }
-  dependencies {
-    classpath("com.gradleup.shadow:shadow-gradle-plugin:8.3.0-SNAPSHOT")
-  }
-}
-
 plugins {
   kotlin("jvm") version "2.0.0"
   id("com.github.gmazzo.buildconfig") version "5.4.0"
+  id("com.gradleup.shadow") version "8.3.0-SNAPSHOT"
   id("com.diffplug.spotless") version "7.0.0.BETA1"
   id("com.android.lint") version "8.5.1"
 }
 
-apply(plugin = "com.gradleup.shadow")
-
 version = "0.3.0-SNAPSHOT"
 val baseName = "string-res-exporter"
 
@@ -36,7 +23,7 @@ tasks.withType<Jar>().configureEach {
   }
 }
 
-val shadowJar = tasks.named("shadowJar", ShadowJar::class) {
+tasks.shadowJar {
   dependsOn(tasks.jar)
 
   exclude(
@@ -65,9 +52,9 @@ val shadowJar = tasks.named("shadowJar", ShadowJar::class) {
 val r8File = layout.buildDirectory.file("libs/$baseName-$version-r8.jar").map { it.asFile }
 val rulesFile = project.file("src/main/rules.pro")
 val r8Jar by tasks.registering(JavaExec::class) {
-  dependsOn(shadowJar)
+  dependsOn(tasks.shadowJar)
 
-  val fatJarFile = shadowJar.get().archiveFile
+  val fatJarFile = tasks.shadowJar.get().archiveFile
   inputs.file(fatJarFile)
   inputs.file(rulesFile)
   outputs.file(r8File)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 103721e..a2a433a 100755
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,6 +9,7 @@ pluginManagement {
       }
     }
     gradlePluginPortal()
+    maven("https://oss.sonatype.org/content/repositories/snapshots/")
   }
 }
 

From 5e95f7af10e66e1b0aeb13d3760b7c8d75e3edc5 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Thu, 8 Aug 2024 02:21:33 -0400
Subject: [PATCH 3/3] Final

---
 build.gradle.kts    | 2 +-
 settings.gradle.kts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 641b5b5..78f9208 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   kotlin("jvm") version "2.0.0"
   id("com.github.gmazzo.buildconfig") version "5.4.0"
-  id("com.gradleup.shadow") version "8.3.0-SNAPSHOT"
+  id("com.gradleup.shadow") version "8.3.0"
   id("com.diffplug.spotless") version "7.0.0.BETA1"
   id("com.android.lint") version "8.5.1"
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a2a433a..103721e 100755
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,6 @@ pluginManagement {
       }
     }
     gradlePluginPortal()
-    maven("https://oss.sonatype.org/content/repositories/snapshots/")
   }
 }