From 2406e0394fe58d99d8acdde5197ec63b437c9d50 Mon Sep 17 00:00:00 2001 From: Jared Date: Sun, 11 Jun 2023 03:40:13 +0200 Subject: [PATCH] general buildscript cleanup --- build.gradle | 9 +++------ fabric/build.gradle | 2 +- forge/build.gradle | 3 +-- gradle.properties | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index e640d74..2d923ab 100644 --- a/build.gradle +++ b/build.gradle @@ -39,16 +39,13 @@ subprojects { } repositories { - mavenCentral() - maven { name = 'Sponge / Mixin' url = 'https://repo.spongepowered.org/repository/maven-public/' } - maven { - name = 'BlameJared Maven (CrT / Bookshelf)' + name = 'BlameJared Maven (JEI / CraftTweaker / Bookshelf)' url = 'https://maven.blamejared.com' } } @@ -56,7 +53,7 @@ subprojects { tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' - it.options.release = 17 + it.options.getRelease().set(17) } processResources { @@ -68,7 +65,7 @@ subprojects { // Disables Gradle's custom module metadata from being published to maven. The // metadata includes mapped dependencies which are not reasonably consumable by // other mod developers. - tasks.withType(GenerateModuleMetadata) { + tasks.withType(GenerateModuleMetadata).configureEach { enabled = false } diff --git a/fabric/build.gradle b/fabric/build.gradle index da28214..e7d04df 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -43,7 +43,7 @@ processResources { from project(":common").sourceSets.main.resources } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { source(project(":common").sourceSets.main.allSource) } diff --git a/forge/build.gradle b/forge/build.gradle index 141f44e..4b943c9 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -78,7 +78,7 @@ dependencies { annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor") } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { source(project(":common").sourceSets.main.allSource) } @@ -86,7 +86,6 @@ processResources { from project(":common").sourceSets.main.resources } - jar.finalizedBy('reobfJar') publishing { diff --git a/gradle.properties b/gradle.properties index dfc5493..ed00d7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ fabric_version=0.68.1+1.19.3 fabric_loader_version=0.14.11 # Mod options -mod_name=MultiLoader +mod_name=Example Mod mod_author=Jared mod_id=examplemod