diff --git a/Jenkinsfile b/Jenkinsfile index 60786a606..4d4e0ccc7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,9 +5,8 @@ node { stage 'Build' - sh "rm -rf build/libs/" sh "chmod +x gradlew" - sh "./gradlew build publish curseTools --refresh-dependencies --stacktrace" + sh "./gradlew clean build publish curseTools --refresh-dependencies --stacktrace" stage "Archive artifacts" diff --git a/build.conf b/build.conf index 4a8576e52..451ea5fc1 100644 --- a/build.conf +++ b/build.conf @@ -1,6 +1,4 @@ -minecraftVersion="1.13.2" -name="TechReborn-1.13.2" +minecraftVersion="1.14.4" +name="TechReborn-1.14.4" curseID="233564" -child-project="reborncore" -child-type="requiredLibrary" github-repo="TechReborn/TechReborn" diff --git a/build.gradle b/build.gradle index 4085221a5..b702a765e 100644 --- a/build.gradle +++ b/build.gradle @@ -92,14 +92,16 @@ dependencies { modCompile "io.github.prospector.silk:SilkAPI:1.2.4-43" modCompile "me.shedaniel:RoughlyEnoughItems:2.9.7+build.143" + def rcVersion = 'RebornCore:RebornCore-1.14.4:4.0.0.+' + //Hopefully this doesnt break too much eek if(Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))){ - compile 'RebornCore:RebornCore-1.14.4:4.0.0.46' + compile rcVersion } else { - modCompile ('RebornCore:RebornCore-1.14.4:4.0.0.46') + modCompile (rcVersion) } - include 'RebornCore:RebornCore-1.14.4:4.0.0.46' + include rcVersion compileOnly "com.google.code.findbugs:jsr305:+" }