Procházet zdrojové kódy

Fix common remap

Signed-off-by: shedaniel <daniel@shedaniel.me>
shedaniel před 4 roky
rodič
revize
8f075842c9
2 změnil soubory, kde provedl 14 přidání a 12 odebrání
  1. 1 1
      build.gradle
  2. 13 11
      common/build.gradle

+ 1 - 1
build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "architectury-plugin" version "3.0-SNAPSHOT"
+    id "architectury-plugin" version "3.1-SNAPSHOT"
     id "forgified-fabric-loom" version "0.6-SNAPSHOT" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "maven-publish"

+ 13 - 11
common/build.gradle

@@ -8,7 +8,7 @@ loom {
 }
 
 configurations {
-    shadow
+    shadowCommon
 }
 
 dependencies {
@@ -23,11 +23,11 @@ dependencies {
     compileOnly("blue.endless:jankson:${rootProject.jankson_version}")
     compileOnly("com.moandjiezana.toml:toml4j:${rootProject.toml4j_version}")
     compileOnly("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
-    shadow("blue.endless:jankson:${rootProject.jankson_version}")
-    shadow("com.moandjiezana.toml:toml4j:${rootProject.toml4j_version}") {
+    shadowCommon("blue.endless:jankson:${rootProject.jankson_version}")
+    shadowCommon("com.moandjiezana.toml:toml4j:${rootProject.toml4j_version}") {
         exclude(module: "gson")
     }
-    shadow("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
+    shadowCommon("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
 }
 
 architectury {
@@ -44,21 +44,23 @@ shadowJar {
     relocate "com.moandjiezana.toml", "${rootProject.maven_group}.clothconfig.shadowed.com.moandjiezana.toml"
     relocate "org.yaml.snakeyaml", "${rootProject.maven_group}.clothconfig.shadowed.org.yaml.snakeyaml"
 
-    configurations = [project.configurations.shadow]
-    classifier null
+    configurations = [project.configurations.shadowCommon]
+    archiveClassifier = "shadow"
 }
 
-build {
-    dependsOn shadowJar
+remapJar {
+    dependsOn(shadowJar)
+    input.set(shadowJar.archiveFile)
+    archiveClassifier = null
+
+    from rootProject.file("LICENSE.md")
 }
 
 publishing {
     publications {
         mavenCommon(MavenPublication) {
             artifactId = rootProject.archives_base_name
-            artifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) {
-                builtBy shadowJar
-            }
+            artifact(remapJar)
             artifact(sourcesJar) {
                 builtBy remapSourcesJar
             }