diff --git a/fabric/build.gradle b/fabric/build.gradle index fda3e0485..118d593fb 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -134,17 +134,9 @@ shadowJar { // SVG relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg' - classifier "dev-shadow" mergeServiceFiles() } -remapJar { - // FIXME: AccessWidener -// injectAccessWidener = true - input.set shadowJar.archiveFile - dependsOn shadowJar - classifier null -} task deleteResources(type: Delete) { delete file("build/resources/main") @@ -162,9 +154,9 @@ runClient { finalizedBy(deleteResources) } -jar { - classifier "dev" -} +//jar { +// classifier "dev" +//} sourcesJar { def commonSources = project(":common").sourcesJar diff --git a/forge/build.gradle b/forge/build.gradle index 0e41d49e7..108ba1c99 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -159,7 +159,6 @@ shadowJar { // svg relocate "com.kitfox.svg", "distanthorizons.libraries.kitfox.svg" - classifier "dev-shadow" mergeServiceFiles() } @@ -169,9 +168,6 @@ shadowJar { // classifier null //} -jar { - classifier "dev" -} sourcesJar { def commonSources = project(":common").sourcesJar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb702f..9502e869d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME 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 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists