diff options
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/build.gradle b/build.gradle index 54e7628..fc4276a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,10 @@ plugins { - id 'fabric-loom' version '0.9-SNAPSHOT' - id 'io.github.juuxel.loom-quiltflower' version '1.3.0' + id 'fabric-loom' version '0.10-SNAPSHOT' + id 'io.github.juuxel.loom-quiltflower-mini' version '1.0.0' id 'maven-publish' id 'checkstyle' } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 - if(rootProject.file('private.gradle').exists()) { //Publishing details apply from: 'private.gradle' } @@ -22,15 +19,8 @@ configurations { repositories { maven { url "https://server.bbkr.space/artifactory/libs-release" } - /*maven { - url = "https://maven.terraformersmc.com/releases" - content { - includeGroup "com.terraformersmc" - } - }*/ maven { - name = "TerraformersMC archive" - url = "https://raw.githubusercontent.com/TerraformersMC/Archive/main/releases/" + url = "https://maven.terraformersmc.com/releases" content { includeGroup "com.terraformersmc" } @@ -48,7 +38,7 @@ dependencies { // Using modApi instead of api because of https://github.com/FabricMC/fabric-loom/issues/200 include modApi("io.github.juuxel:libninepatch:${project.libninepatch_version}") - modRuntime(modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { + modLocalRuntime(modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { exclude group: 'net.fabricmc.fabric-api' }) @@ -68,12 +58,28 @@ java { withJavadocJar() } +allprojects { + plugins.withId('java') { // when the java plugin is applied in the project + java { + // Use Java 17 toolchain if running on older version of Java, but allow newer versions + if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } else { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + } + } +} + tasks.withType(JavaCompile) { // ensure that the encoding is set to UTF-8, no matter what the system default is // this fixes some edge cases with special characters not displaying correctly // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html options.encoding = "UTF-8" - options.release.set 16 + options.release.set 17 } jar { @@ -91,8 +97,8 @@ javadoc { dependsOn project(':javadoc').tasks.jar options { - links "https://maven.fabricmc.net/docs/yarn-$project.yarn_mappings", - 'https://javadoc.io/doc/org.jetbrains/annotations/19.0.0' + // TODO: check again in 1.18 proper; links "https://maven.fabricmc.net/docs/yarn-$project.yarn_mappings" + links 'https://javadoc.io/doc/org.jetbrains/annotations/19.0.0' taglets 'io.github.cottonmc.cotton.gui.jd.ExperimentalTaglet', 'io.github.cottonmc.cotton.gui.jd.PropertyTaglet' tagletPath project(':javadoc').tasks.jar.outputs.files.singleFile @@ -105,15 +111,7 @@ javadoc { publishing { publications { maven(MavenPublication) { - artifact(remapJar) { - builtBy remapJar - } - - artifact(sourcesJar) { - builtBy remapSourcesJar - } - - artifact(javadocJar) + from components.java } } |