From 34e90cf606bad20c2dc2aa13cbd6097762b9f8ac Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Fri, 19 Nov 2021 23:55:34 +0100 Subject: [PATCH] Update unified buid script --- build.gradle | 101 ++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 3e5ad14..54ac397 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1c18f850adb30b1b14861baf9f5c831841443bb0 +//version: 312034ef596897f9ec9605b2ebb23c4077c9b5ef /* DO NOT CHANGE THIS FILE! @@ -13,10 +13,6 @@ import java.util.concurrent.TimeUnit buildscript { repositories { - maven { - name = "Scala dependencies" - url = "https://repo1.maven.org/maven2/" - } maven { name = "jitpack" url = "https://jitpack.io" @@ -29,6 +25,10 @@ buildscript { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { + name = "Scala CI dependencies" + url = "https://repo1.maven.org/maven2/" + } } dependencies { classpath 'com.github.TheElan:ForgeGradle:1.2.2' @@ -43,7 +43,7 @@ plugins { apply plugin: 'scala' apply plugin: 'forge' -apply plugin: 'idea' +apply plugin: 'idea' java { toolchain { @@ -87,35 +87,27 @@ def checkPropertyExists(String propertyName) { } -String sourcesDir = "" String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" -if(new File(scalaSourceDir).exists()) { - sourcesDir = scalaSourceDir -} -if(new File(javaSourceDir).exists()) { - sourcesDir = javaSourceDir -} -if(sourcesDir.isEmpty()) { - throw new GradleException("Could not find sources directory! Neither " + javaSourceDir + " or " + scalaSourceDir) -} -String targetPackage = sourcesDir + modGroup.toString().replaceAll("\\.", "/") -if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackage + " or " + targetPackageScala) +String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") +String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") +if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala) } if(apiPackage) { - targetPackage = sourcesDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") - if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackage) + targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala) } } if(accessTransformersFile) { - targetPackage = "src/main/resources/META-INF/" + accessTransformersFile - if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetPackage) + String targetFile = "src/main/resources/META-INF/" + accessTransformersFile + if(new File(targetFile).exists() == false) { + throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) } } @@ -124,21 +116,24 @@ if(usesMixins.toBoolean()) { throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!") } - targetPackage = sourcesDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") - if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackage) + targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") + targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") + if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala) } - String targetFile = sourcesDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" - if(new File(targetFile).exists() == false) { - throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFile) + String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" + String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala" + if((new File(targetFileJava).exists() || new File(targetFileScala).exists()) == false) { + throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala) } } if(coreModClass) { - String targetFile = sourcesDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" - if(new File(targetFile).exists() == false) { - throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFile) + String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" + String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala" + if((new File(targetFileJava).exists() || new File(targetFileScala).exists()) == false) { + throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFile + " or " + targetFileScala) } } @@ -365,27 +360,27 @@ runServer { } processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' - // replace version and mcversion - expand "minecraftVersion": project.minecraft.version, - "modVersion": versionDetails().lastTag, - "modId": modId, - "modName": modName - } + // replace version and mcversion + expand "minecraftVersion": project.minecraft.version, + "modVersion": versionDetails().lastTag, + "modId": modId, + "modName": modName + } - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + } task sourcesJar(type: Jar) { from (sourceSets.main.allJava) @@ -526,4 +521,4 @@ static String getVersionHash(String buildScriptContent) { configure(updateBuildScript) { group = 'forgegradle' description = 'Updates the build script to the latest version' -} +} \ No newline at end of file