Merge branch 'release/0.31'

Author: dai0304

.version

@@ -0,0 +1 @@
+0.31

build.gradle

@@ -15,9 +15,11 @@ buildscript {
 }
 
 plugins {
-	id "com.github.hierynomus.license" version "0.12.1"
+	id "com.jfrog.bintray" version "1.7.1"
 }
 
+apply from: 'gradle/resolveDependencies.gradle'
+
 ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
 
 defaultTasks "clean", "build"
@@ -37,8 +39,7 @@ subprojects {
 	apply plugin: "java"
 	apply plugin: "maven"
 
-	sourceCompatibility = 1.8
-	targetCompatibility = 1.8
+	sourceCompatibility = targetCompatibility = 1.8
 
 	// ======== code quality ========
 	apply plugin: "checkstyle"
@@ -49,165 +50,26 @@ subprojects {
 	apply plugin: "de.thetaphi.forbiddenapis"
 	apply plugin: "com.diffplug.gradle.spotless"
 
-	// compiler
-	compileJava {
-		options.compilerArgs << "-Xlint"
-	}
-	
-	// jacoco
-	jacocoTestReport {
-		reports {
-			xml.enabled false
-			csv.enabled false
-		}
-	}
-	
-	// checkstyle
-	checkstyle {
-		toolVersion = "7.1.2"
-		configFile = rootProject.file('config/checkstyle/checkstyle.xml')
-	}
-	checkstyleTest {
-		configFile = rootProject.file("config/checkstyle/checkstyle-test.xml")
-	}
+	// code quality configuration
+	apply from: "${rootProject.projectDir}/gradle/quality/checkstyle.gradle"
+	apply from: "${rootProject.projectDir}/gradle/quality/findbugs.gradle"
+	apply from: "${rootProject.projectDir}/gradle/quality/pmd.gradle"
+	apply from: "${rootProject.projectDir}/gradle/quality/cpd.gradle"
+	apply from: "${rootProject.projectDir}/gradle/quality/jacoco.gradle"
+	apply from: "${rootProject.projectDir}/gradle/quality/forbiddenapis.gradle"
+	apply from: "${rootProject.projectDir}/gradle/quality/spotless.gradle"
 
-	// workaround: see https://issues.gradle.org/browse/GRADLE-2888
-	task verifyNoCheckstyleWarningsInMain {
-		group = "verification"
-		description = "Fail if checkstyleMain result contains warnings"
-		doLast {
-			File warningsFile = file('build/reports/checkstyle/main.xml')
-			if (warningsFile.exists() && warningsFile.text.contains("<error ")) {
-				throw new GradleException("There were checkstyle warnings! For more info check $warningsFile")
-			}
-		}
-	}
-	checkstyleMain.finalizedBy verifyNoCheckstyleWarningsInMain
-	task verifyNoCheckstyleWarningsInTest {
-		group = "verification"
-		description = "Fail if checkstyleTest result contains warnings"
-		doLast {
-			File warningsFile = file('build/reports/checkstyle/test.xml')
-			if (warningsFile.exists() && warningsFile.text.contains("<error ")) {
-				throw new GradleException("There were checkstyle warnings! For more info check $warningsFile")
-			}
-		}
-	}
-	checkstyleTest.finalizedBy verifyNoCheckstyleWarningsInTest
-	
-	// findbugs
-	findbugs {
-		effort = "max"
-		includeFilter = file("../config/findbugs/includeFilter.xml")
-		excludeFilter = file("../config/findbugs/excludeFilter.xml")
-	}
-	tasks.withType(FindBugs) {
-		reports {
-			xml.enabled = false
-			html.enabled = true
-		}
-	}
-	
-	// pmd
-	pmd {
-		consoleOutput = true
-	}
-	pmdMain {
-		ruleSetFiles = files("../config/pmd/pmd-settings.xml")
-		ruleSets = []  // To apply only the custom rules
-	}
-	pmdTest {
-		ruleSetFiles = files("../config/pmd/pmd-settings-test.xml")
-		ruleSets = []  // To apply only the custom rules
-	}
-	cpdCheck {
-		reports {
-			text.enabled = true
-			xml.enabled = false
-		}
-		source = sourceSets.main.allJava // only main source
-		ignoreFailures = true
-	}
+	apply from: "${rootProject.projectDir}/gradle/sourceArtifact.gradle"
+	apply from: "${rootProject.projectDir}/gradle/bintray.gradle"
 
-	// forbiddenapis
-	forbiddenApisMain {
-		bundledSignatures += [
-			'jdk-system-out',
-			'jdk-unsafe-' + project.sourceCompatibility,
-			'jdk-internal-' + project.sourceCompatibility
-		]
-		signaturesFiles = fileTree(dir: "../config/forbiddenapis", include: "*.txt")
-		ignoreFailures = false
-	}
-	forbiddenApisTest {
-		bundledSignatures += [
-			'jdk-system-out',
-			'jdk-internal-' + project.sourceCompatibility
-		]
-		ignoreFailures = false
+	// compiler
+	tasks.withType(AbstractCompile) each {
+		it.options.encoding = "UTF-8"
 	}
-	
-	// spotless
-	spotless {
-		java {
-			licenseHeaderFile '../config/spotless/spotless.license.java'
-			importOrderFile   '../config/spotless/spotless.importorder'
-			eclipseFormatFile '../config/spotless/spotless.eclipseformat.xml'
-			
-			// Eclipse formatter screws up long literals with underscores inside of annotations (see issue #14)
-			//    @Max(value = 9_999_999 L) // what Eclipse does
-			//    @Max(value = 9_999_999L)  // what I wish Eclipse did
-			custom 'Long literal fix', { it.replaceAll('([0-9_]+) [Ll]', '$1L') }
-			
-			// Eclipse formatter puts excess whitespace after lambda blocks
-			//    funcThatTakesLambdas(x -> {} , y -> {} )	// what Eclipse does
-			//    funcThatTakesLambdas(x -> {}, y -> {})	// what I wish Eclipse did
-			custom 'Lambda fix', { it.replace('} )', '})').replace('} ,', '},') }
-			
-			indentWithTabs()
-			endWithNewline()
-			
-			customReplaceRegex 'Add space before comment asterisk', '^(\\t*)\\*', '$1 *'
-	//		customReplaceRegex 'Remove indent before line comment', '^\\t*//', '//'
-		}
-		
-		// this will create two tasks: spotlessMiscCheck and spotlessMiscApply
-		format 'misc', {
-			// target determines which files this format will apply to
-			// - if you pass a string or a list of strings, they will be treated
-			//	   as 'include' parameters to a fileTree in the root directory
-			// - if you pass a FileCollection, it will pass through untouched
-			//	   e.g. project.files('build.gradle', 'settings.gradle')
-			// - if you pass anything else, it will be sent to project.files(yourArg)
-			target '**/*.gradle', '**/*.md', '**/.gitignore'
-			
-			// spotless has built-in rules for the most basic formatting tasks
-			indentWithTabs() // or spaces. Takes an integer argument if you don't like 4
-			endWithNewline()
-		}
+	compileJava {
+		options.compilerArgs << "-Xlint"
 	}
 
-
-	// ======== create source and javadoc bundles ========
-	task sourcesJar(type: Jar, dependsOn: classes) {
-		classifier = "sources"
-		from sourceSets.main.allSource
-	}
-
-	task javadocJar(type: Jar, dependsOn: javadoc) {
-		classifier = "javadoc"
-		from javadoc.destinationDir
-	}
-
-	javadoc {
-		failOnError = false
-	}
-
-	artifacts {
-		archives sourcesJar
-		archives javadocJar
-	}
-
 	configurations {
 		deployerJars
 	}
@@ -228,19 +90,6 @@ subprojects {
 	}
 
 
-	// ======== License =======
-	apply plugin: "license"
-	license {
-		ext.year = Calendar.getInstance().get(Calendar.YEAR)
-		header rootProject.file("copyright/HEADER")
-		strictCheck true
-		mapping {
-			java = "SLASHSTAR_STYLE"
-		}
-		exclude "**/*.json"
-	}
-	
-	
 	// ======== Publishing =======
 	apply plugin: 'maven-publish'
 	publishing {
@@ -278,29 +127,8 @@ subprojects {
 			}
 		}
 	}
-	
-	if (project.hasProperty("bintrayUser") && project.hasProperty("bintrayKey")) {
-		apply plugin: "com.jfrog.bintray"
-		bintray {
-			user = project.bintrayUser
-			key = project.bintrayKey
-			publications = ["mavenJava"]
-			pkg {
-				repo = "spar-wings"
-				name = project.name
-				desc = project.description
-				websiteUrl = "https://github.com/dai0304/spar-wings"
-				issueTrackerUrl = "https://github.com/dai0304/spar-wings/issues"
-				vcsUrl = "https://github.com/dai0304/spar-wings.git"
-				licenses = ["Apache-2.0"]
-				labels = ["AWS", "Spring framework"]
-			}
-		}
-	}
 }
 
-
-
 // ======== wrapper ========
 task wrapper(type: Wrapper) {
 	gradleVersion = "2.12"

circle.yml

@@ -5,7 +5,7 @@ checkout:
 dependencies:
   override:
     - ./gradlew -v
-    - ./gradlew testClasses
+    - ./gradlew resolveDependencies
 
 general:
   artifacts:
@@ -14,7 +14,6 @@ general:
 machine:
   environment:
     _JAVA_OPTIONS: -Xmx3G
-    GRADLE_OPTS: -Dorg.gradle.daemon=true
     TERM: dumb
   java:
     version: oraclejdk8

copyright/HEADER

@@ -1,5 +1,5 @@
 # artifact version
-currentVersion = 0.30
+currentVersion = 0.31
 
 # dependency versions
 springBootVersion = 1.3.3.RELEASE

gradle.properties

@@ -0,0 +1,19 @@
+// -*- coding: utf-8; mode: groovy -*-
+
+if (project.hasProperty("bintrayUser") && project.hasProperty("bintrayKey")) {
+	bintray {
+		user = project.bintrayUser
+		key = project.bintrayKey
+		publications = ["mavenJava"]
+		pkg {
+			repo = "spar-wings"
+			name = project.name
+			desc = project.description
+			websiteUrl = "https://github.com/dai0304/spar-wings"
+			issueTrackerUrl = "https://github.com/dai0304/spar-wings/issues"
+			vcsUrl = "https://github.com/dai0304/spar-wings.git"
+			licenses = ["Apache-2.0"]
+			labels = ["AWS", "Spring framework"]
+		}
+	}
+}

gradle/bintray.gradle

@@ -0,0 +1,32 @@
+checkstyle {
+	toolVersion = "7.1.2"
+	configFile = rootProject.file("${rootProject.projectDir}/config/checkstyle/checkstyle.xml")
+}
+
+checkstyleTest {
+	configFile = file("${rootProject.projectDir}/config/checkstyle/checkstyle-test.xml")
+}
+
+// workaround: see https://issues.gradle.org/browse/GRADLE-2888
+task verifyNoCheckstyleWarningsInMain {
+	group = "verification"
+	description = "Fail if checkstyleMain result contains warnings"
+	doLast {
+		File warningsFile = file('build/reports/checkstyle/main.xml')
+		if (warningsFile.exists() && warningsFile.text.contains("<error ")) {
+			throw new GradleException("There were checkstyle warnings! For more info check $warningsFile")
+		}
+	}
+}
+checkstyleMain.finalizedBy verifyNoCheckstyleWarningsInMain
+task verifyNoCheckstyleWarningsInTest {
+	group = "verification"
+	description = "Fail if checkstyleTest result contains warnings"
+	doLast {
+		File warningsFile = file('build/reports/checkstyle/test.xml')
+		if (warningsFile.exists() && warningsFile.text.contains("<error ")) {
+			throw new GradleException("There were checkstyle warnings! For more info check $warningsFile")
+		}
+	}
+}
+checkstyleTest.finalizedBy verifyNoCheckstyleWarningsInTest

gradle/quality/checkstyle.gradle

@@ -0,0 +1,8 @@
+cpdCheck {
+	reports {
+		text.enabled = true
+		xml.enabled = false
+	}
+	source = sourceSets.main.allJava // only main source
+	ignoreFailures = true
+}

gradle/quality/cpd.gradle

@@ -0,0 +1,12 @@
+findbugs {
+	effort = "max"
+	includeFilter = file("${rootProject.projectDir}/config/findbugs/includeFilter.xml")
+	excludeFilter = file("${rootProject.projectDir}/config/findbugs/excludeFilter.xml")
+}
+
+tasks.withType(FindBugs) {
+	reports {
+		xml.enabled = false
+		html.enabled = true
+	}
+}

gradle/quality/findbugs.gradle

@@ -0,0 +1,16 @@
+forbiddenApisMain {
+	bundledSignatures += [
+		'jdk-system-out',
+		'jdk-unsafe-' + project.sourceCompatibility,
+		'jdk-internal-' + project.sourceCompatibility
+	]
+	signaturesFiles = fileTree(dir: "${rootProject.projectDir}/config/forbiddenapis", include: "*.txt")
+	ignoreFailures = false
+}
+forbiddenApisTest {
+	bundledSignatures += [
+		'jdk-system-out',
+		'jdk-internal-' + project.sourceCompatibility
+	]
+	ignoreFailures = false
+}