diff --git a/build.gradle b/build.gradle index 3041be10..7fe18ada 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1c18f850adb30b1b14861baf9f5c831841443bb0 +//version: 21647c763d3f6c90d59c900edae1248239c49dfb /* DO NOT CHANGE THIS FILE! @@ -25,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' @@ -37,8 +41,9 @@ plugins { id("com.palantir.git-version") version("0.12.3") } +apply plugin: 'scala' apply plugin: 'forge' -apply plugin: 'idea' +apply plugin: 'idea' java { toolchain { @@ -81,22 +86,28 @@ def checkPropertyExists(String propertyName) { } } -String targetPackage = "src/main/java/" + modGroup.toString().replaceAll("\\.", "/") -if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackage) + +String javaSourceDir = "src/main/java/" +String scalaSourceDir = "src/main/scala/" + +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 = "src/main/java/" + 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) } } @@ -105,21 +116,26 @@ if(usesMixins.toBoolean()) { throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!") } - targetPackage = "src/main/java/" + 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 = "src/main/java/" + 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" + String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" + if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) { + throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava) } } if(coreModClass) { - String targetFile = "src/main/java/" + 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" + String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" + if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) { + throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava) } } diff --git a/dependencies.gradle b/dependencies.gradle index 737a427d..d41453ad 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,9 +1,7 @@ // Add your dependencies here dependencies { - compile "mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf" - compile("codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev") + compile("mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf") compile("codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev") - compile("codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev") - compile "codechicken:ForgeMultipart:1.7.10-1.2.0.344:dev" + compile("com.github.GTNewHorizons:ForgeMultipart:unified-build-script-SNAPSHOT:dev") } diff --git a/repositories.gradle b/repositories.gradle index 0a09df69..0cc57ebc 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -13,4 +13,7 @@ repositories { name = 'code chicken lib' url 'https://maven.cil.li/' } + maven { + url = "https://jitpack.io" + } }