diff --git a/build.gradle b/build.gradle index fd4d93e05..87b15c63e 100644 --- a/build.gradle +++ b/build.gradle @@ -64,6 +64,7 @@ repositories { maven { name "Mobius Repo" url "http://mobiusstrip.eu/maven" + allowInsecureProtocol true metadataSources { mavenPom() artifact() @@ -84,13 +85,16 @@ repositories { ivy { name 'gtnh_download_source' artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]" + allowInsecureProtocol true } maven { // GalacticGreg, YAMCore,.. name 'UsrvDE' url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/" + allowInsecureProtocol true } maven { url "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/" + allowInsecureProtocol true } maven { name = "jitpack" @@ -115,6 +119,11 @@ configFile.withReader { project.ext.config = new ConfigSlurper().parse prop } +configurations { + embedded + implementation.extendsFrom embedded +} + dependencies { compileOnly "com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev" compileOnly "com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev" @@ -153,9 +162,9 @@ dependencies { compileOnly name: 'BloodMagic', version: project.config.bloodmagic.version, ext: 'jar' compileOnly name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' - implementation 'com.google.code.findbugs:jsr305:1.3.9' // Annotations used by google libs. + implementation 'com.google.code.findbugs:jsr305:3.0.2' // Annotations used by google libs. - //embedded files('libs/OpenComputers-JNLua.jar', 'libs/OpenComputers-LuaJ.jar') + embedded files('libs/OpenComputers-JNLua.jar', 'libs/OpenComputers-LuaJ.jar') testCompile "org.mockito:mockito-all:1.10.19" testCompile "org.scalactic:scalactic_2.11:2.2.6" @@ -211,8 +220,6 @@ configurations { implementation.extendsFrom embedded } - - minecraft { version = config.minecraft_version + "-" + config.forge_version + "-" + config.minecraft_version