diff --git a/build.gradle b/build.gradle index e6b7173df..9655f88cb 100755 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,10 @@ ext.apiForestry = "./api/forestry" ext.apiRedstoneFlux = "./api/redstoneflux" // java version -sourceCompatibility = 1.7 -targetCompatibility = 1.7 +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 minecraft { version = mcversion + "-" + forgeversion @@ -82,8 +84,8 @@ repositories { configurations { api compile.extendsFrom api - shade - compile.extendsFrom shade + //shade + //compile.extendsFrom shade } dependencies { @@ -99,7 +101,7 @@ dependencies { compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:src" // http://maven.tterrag.com/ - shade "chylex.javacheck:JavaChecker:v1.2-b1" + //shade "chylex.javacheck:JavaChecker:v1.2-b1" testCompile 'junit:junit:4.12' } @@ -158,11 +160,11 @@ jar { from "./src/main/java/invtweaks/LICENSE.txt" } - configurations.shade.each{ dep -> - from(project.zipTree(dep)){ - exclude 'META-INF', 'META-INF/**', 'mcmod.info' - } - } + //configurations.shade.each{ dep -> + // from(project.zipTree(dep)){ + // exclude 'META-INF', 'META-INF/**', 'mcmod.info' + // } + //} } task mainJar(type: Jar, dependsOn: 'reobf') { @@ -177,7 +179,7 @@ task mainJar(type: Jar, dependsOn: 'reobf') { includeEmptyDirs = false manifest{ - attributes 'TweakClass': 'forestry.shade.javacheck.Java7Checker' + //attributes 'TweakClass': 'forestry.shade.javacheck.Java7Checker' } } diff --git a/gradle.properties b/gradle.properties index 20645093c..327e5f61a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.7.10 -forgeversion=10.13.4.1566-1.7.10 +forgeversion=10.13.4.1614-1.7.10 version_major=4 version_minor=2 version_patch=16 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8de..aae599bbf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip