build updates

jpenilla · Nov 29, 2023 · 4273907 · 4273907
1 parent b501d50
commit 4273907
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   `build-logic`
+  alias(libs.plugins.shadow)
 }
 
 group = "xyz.jpenilla"
@@ -12,9 +13,7 @@ repositories {
 
 dependencies {
   compileOnlyApi(libs.checker.qual)
-  implementation(libs.mapping.io) {
-    exclude("org.ow2.asm")
-  }
+  implementation(libs.mapping.io)
 
   // testing dependencies
   testImplementation(libs.memoryMeasurer)
@@ -23,3 +22,7 @@ dependencies {
   testImplementation(libs.junit.jupiter.api)
   testRuntimeOnly(libs.junit.jupiter.engine)
 }
+
+tasks.shadowJar {
+  relocate("net.fabricmc.mappingio", "xyz.jpenilla.reflectionremapper.internal.lib.mappingio")
+}
diff --git a/buildSrc/src/main/kotlin/ExtractMappings.kt b/buildSrc/src/main/kotlin/ExtractMappings.kt
@@ -1,16 +1,16 @@
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
+import org.gradle.work.DisableCachingByDefault
 import java.net.URI
 import java.nio.file.FileSystems
 import java.nio.file.Files
 
-@CacheableTask
+@DisableCachingByDefault(because = "Not worth caching")
 abstract class ExtractMappings : DefaultTask() {
   @get:InputFile
   @get:PathSensitive(PathSensitivity.NONE)

diff --git a/buildSrc/src/main/kotlin/base-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
@@ -31,7 +31,7 @@ tasks {
       )
     }
   }
-  withType<Jar> {
+  withType<Jar>().configureEach {
     from(rootProject.file("LICENSE")) {
       rename("LICENSE", "META-INF/LICENSE_${rootProject.name}")
     }

diff --git a/buildSrc/src/main/kotlin/build-logic.gradle.kts b/buildSrc/src/main/kotlin/build-logic.gradle.kts
@@ -19,7 +19,7 @@ tasks {
   processTestResources {
     dependsOn(extractMappings)
   }
-  withType<Test> {
+  withType<Test>().configureEach {
     if (!name.contains("Java8")) {
       inputs.files(memoryMeasurer)
       doFirst {

diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -17,10 +17,5 @@ indra {
       }
     }
   }
-}
-
-signing {
-  val signingKey: String? by project
-  val signingPassword: String? by project
-  useInMemoryPgpKeys(signingKey, signingPassword)
+  signWithKeyFromProperties("signingKey", "signingPassword")
 }