From bb87fc6046226adc8c995e7e9167ea2b7e3aaed6 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 22 Oct 2015 18:58:35 -0700 Subject: [PATCH] Add Java 7 check, clean up build.gradle --- .gitignore | 2 +- build.gradle | 88 ++++++--------------- application.properties => gradle.properties | 0 3 files changed, 23 insertions(+), 67 deletions(-) rename application.properties => gradle.properties (100%) diff --git a/.gitignore b/.gitignore index a0abcab4a..2f45b64e5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ !/LICENSE.txt !/license-header.txt !/README.md -!/application.properties +!/gradle.properties !/build.gradle !/build.xml !/gradlew diff --git a/build.gradle b/build.gradle index 12badd7bd..fb87b0d9d 100755 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,6 @@ apply plugin: 'forge' apply plugin: 'maven' apply plugin: 'java' -loadProperties() - version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber() if (project.hasProperty('buildQualifier')) { version = project.version + '-' + project.buildQualifier @@ -46,6 +44,8 @@ minecraft { replace '@VERSION@', project.version replace '@BUILD_NUMBER@', getBuildNumber() + + srgExtra "PK: chylex/javacheck forestry/shade/javacheck" } sourceSets { @@ -73,11 +73,17 @@ repositories { name = "chickenbones" url = "http://chickenbones.net/maven/" } + maven{ + name "tterrag Repo" + url "http://maven.tterrag.com/" + } } configurations { api compile.extendsFrom api + shade + compile.extendsFrom shade } dependencies { @@ -92,6 +98,9 @@ dependencies { compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:dev" compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:src" + // http://maven.tterrag.com/ + shade "chylex.javacheck:JavaChecker:v1.2-b1" + testCompile 'junit:junit:4.12' } @@ -134,45 +143,6 @@ debugClient { } } -task echoVersion << { - printNextVersion() -} - -def saveVersion() { - ant.propertyfile( - file: "application.properties") { - entry( key:"version_major", type:"int", value: version_major) - entry( key:"version_minor", type:"int", value: version_minor) - entry( key:"version_patch", type:"int", value: version_patch) - } - project.version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber() - printNextVersion() -} - -def printNextVersion() { - println '*************************************************************' - println 'The next build will be version: ' + project.version - println '*************************************************************' -} - -task bumpMajor << { - project.version_major = Integer.parseInt(project.version_major) + 1 - project.version_minor = "0" - project.version_patch = "0" - saveVersion() -} - -task bumpMinor << { - project.version_minor = Integer.parseInt(project.version_minor) + 1 - project.version_patch = "0" - saveVersion() -} - -task bumpPatch << { - project.version_patch = Integer.parseInt(project.version_patch) + 1 - saveVersion() -} - jar { destinationDir = file("build/tmp") archiveName = "main.jar" @@ -184,6 +154,12 @@ jar { into ('cofh/api') { from project.apiRedstoneFlux + "/LICENSE - LGPLv3.txt" } + + configurations.shade.each{ dep -> + from(project.zipTree(dep)){ + exclude 'META-INF', 'META-INF/**', 'mcmod.info' + } + } } task mainJar(type: Jar, dependsOn: 'reobf') { @@ -196,6 +172,10 @@ task mainJar(type: Jar, dependsOn: 'reobf') { destinationDir = file(dirDest) duplicatesStrategy = DuplicatesStrategy.EXCLUDE includeEmptyDirs = false + + manifest{ + attributes 'TweakClass': 'forestry.shade.javacheck.Java7Checker' + } } task devJar(type: Jar, dependsOn: 'classes') { @@ -237,20 +217,9 @@ task sourceJar(type: Jar, dependsOn: 'classes') { classifier = 'sources' } -task releaseInit << { - println '*************************************************************' - println 'This build will be version: ' + rootProject.version - println '*************************************************************' +task release (dependsOn: [mainJar, apiJar, devJar, sourceJar]) { } -task release (dependsOn: [releaseInit, mainJar, apiJar, devJar, sourceJar]) { -} - -mainJar.shouldRunAfter releaseInit -devJar.shouldRunAfter releaseInit -apiJar.shouldRunAfter releaseInit -sourceJar.shouldRunAfter releaseInit - artifacts { archives apiJar archives devJar @@ -279,19 +248,6 @@ uploadArchives { } } -def loadProperties() { - println('loading application.properties') - - file("application.properties").withReader { reader -> - def userProps = new Properties() - userProps.load(reader) - - for (Map.Entry property in userProps) { - project.ext[property.getKey()] = property.getValue() - } - } -} - def getBuildNumber() { return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0" } diff --git a/application.properties b/gradle.properties similarity index 100% rename from application.properties rename to gradle.properties