From 1be0138cebfe2a6ea9f1c5d8889cb67dc7905922 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 18 Dec 2023 17:51:31 +0100 Subject: [PATCH] Upgraded gradle --- build.gradle | 20 ++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 3d398d1e..f8f156ff 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,7 @@ dependencies { mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" //1.19.3 modApi "vazkii.patchouli:Patchouli:${project.patchouli_version}" println "Using local BCLib: ${local_bclib}" @@ -93,15 +93,15 @@ dependencies { } else { modImplementation "com.github.quiqueck:BCLib:${project.bclib_version}" } - modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}" +// modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" +// modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}" //needed for trinkets, otherwise BetterEnd would require users to install trinkets - modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}" - modCompileOnly "dev.emi:trinkets:${project.trinkets_version}" - - modCompileOnly "dev.emi:emi-fabric:${emi_version}:api" - modLocalRuntime "dev.emi:emi-fabric:${emi_version}" +// modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}" +// modCompileOnly "dev.emi:trinkets:${project.trinkets_version}" +// +// modCompileOnly "dev.emi:emi-fabric:${emi_version}:api" +// modLocalRuntime "dev.emi:emi-fabric:${emi_version}" if (local_wunderlib) { println "Using local WunderLib" @@ -130,7 +130,7 @@ javadoc { } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } @@ -138,7 +138,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) { // if it is present. // If you remove this task, sources will not be generated. task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e..a5952066 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists