Removed classifier's as they are no longer needed in gradle 18

This commit is contained in:
coolGi
2023-02-24 19:08:53 +10:30
parent d1670673f2
commit 981d9a095d
3 changed files with 4 additions and 15 deletions
+3 -11
View File
@@ -134,17 +134,9 @@ shadowJar {
// SVG // SVG
relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg' relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg'
classifier "dev-shadow"
mergeServiceFiles() mergeServiceFiles()
} }
remapJar {
// FIXME: AccessWidener
// injectAccessWidener = true
input.set shadowJar.archiveFile
dependsOn shadowJar
classifier null
}
task deleteResources(type: Delete) { task deleteResources(type: Delete) {
delete file("build/resources/main") delete file("build/resources/main")
@@ -162,9 +154,9 @@ runClient {
finalizedBy(deleteResources) finalizedBy(deleteResources)
} }
jar { //jar {
classifier "dev" // classifier "dev"
} //}
sourcesJar { sourcesJar {
def commonSources = project(":common").sourcesJar def commonSources = project(":common").sourcesJar
-4
View File
@@ -159,7 +159,6 @@ shadowJar {
// svg // svg
relocate "com.kitfox.svg", "distanthorizons.libraries.kitfox.svg" relocate "com.kitfox.svg", "distanthorizons.libraries.kitfox.svg"
classifier "dev-shadow"
mergeServiceFiles() mergeServiceFiles()
} }
@@ -169,9 +168,6 @@ shadowJar {
// classifier null // classifier null
//} //}
jar {
classifier "dev"
}
sourcesJar { sourcesJar {
def commonSources = project(":common").sourcesJar def commonSources = project(":common").sourcesJar
+1
View File
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
# TODO: Wait for forge to fix gradle 8 support, once it did change gradle to a newer version
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists