1 files changed, 56 insertions, 86 deletions
diff --git a/gradle/convention.gradle b/gradle/convention.gradle
index ed20c86..8dd086e 100644
--- a/gradle/convention.gradle
+++ b/gradle/convention.gradle
@@ -1,88 +1,58 @@
-apply plugin: 'java' // Plugin as major conventions, overwrites status
-apply plugin: 'errorprone'
-
-sourceCompatibility = 1.5
-targetCompatibility = 1.5
-
-// GRADLE-2087 workaround, perform after java plugin
-status = project.hasProperty('preferredStatus')?project.preferredStatus:(version.contains('SNAPSHOT')?'snapshot':'release')
-
-// Indenting to align with multi-project branch
-    task sourcesJar(type: Jar, dependsOn:classes) {
-        from sourceSets.main.allSource
-        classifier 'sources'
-        extension 'jar'
-    }
-
-    task javadocJar(type: Jar, dependsOn:javadoc) {
-        from javadoc.destinationDir
-        classifier 'javadoc'
-        extension 'jar'
-    }
-
-    configurations.add('sources')
-    configurations.add('javadoc')
-    configurations.archives {
-        extendsFrom configurations.sources
-        extendsFrom configurations.javadoc
-    }
-
-    // When outputing to an Ivy repo, we want to use the proper type field
-    gradle.taskGraph.whenReady {
-        def isNotMaven = !it.hasTask(project.uploadMavenCentral)
-        if (isNotMaven) {
-            def artifacts = project.configurations.sources.artifacts
-            def sourceArtifact = artifacts.iterator().next()
-            sourceArtifact.type = 'sources'
-        }
-    }
-
-    artifacts {
-        sources(sourcesJar) {
-            // Weird Gradle quirk where type will be used for the extension, but only for sources
-            type 'jar'
-        }
-        javadoc(javadocJar) {
-            type 'javadoc'
-        }
-    }
-
-    configurations {
-        provided {
-            description = 'much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive.'
-            transitive = true
-            visible = true
-        }
-    }
-
-    project.sourceSets {
-        main.compileClasspath += project.configurations.provided
-        main.runtimeClasspath -= project.configurations.provided
-        test.compileClasspath += project.configurations.provided
-        test.runtimeClasspath += project.configurations.provided
-    }
-
-apply plugin: 'github-pages' // Used to create publishGhPages task
-
-def docTasks = [:]
-[Javadoc,ScalaDoc,Groovydoc].each{ Class docClass ->
-    tasks.withType(docClass).each { docTask ->
-        docTasks[docTask.name] = docTask
-        processGhPages.dependsOn(docTask)
-    }
-}
-
-githubPages {
-    repoUri = "[email protected]:shevek/${rootProject.githubProjectName}.git"
-    pages {
-        docTasks.each { shortName, docTask ->
-            from(docTask.outputs.files) {
-                into "docs/${shortName}"
-            }
-        }
-    }
-}
-
+	apply plugin: 'java' // Plugin as major conventions
+	apply plugin: 'errorprone'
+	apply plugin: 'info'
+
+	sourceCompatibility = 1.5
+
+	// GRADLE-2087 workaround, perform after java plugin
+	status = project.hasProperty('preferredStatus')?project.preferredStatus:(version.contains('SNAPSHOT')?'snapshot':'release')
+
+	repositories {
+		// mavenLocal()
+		mavenCentral()
+		// jcenter()
+	}
+
+	dependencies {
+		compile 'com.google.code.findbugs:jsr305:2.0.2'
+		compile 'org.slf4j:slf4j-api:1.7.7'
+
+		testCompile 'junit:junit:4.11'
+
+		testRuntime 'org.slf4j:slf4j-simple:1.7.7'
+	}
+
+	tasks.withType(JavaCompile) {
+		options.incremental = true
+	}
+
+	test {
+		systemProperty 'org.apache.commons.logging.Log', 'org.apache.commons.logging.impl.SimpleLog'
+		systemProperty 'org.apache.commons.logging.simplelog.defaultlog', 'debug'
+		systemProperty 'org.apache.commons.logging.diagnostics.dest', 'STDERR'
+		systemProperty 'org.slf4j.simpleLogger.logFile', 'System.out'
+		systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug'
+		systemProperty 'jna.nosys', 'true'
+
+		testLogging {
+			if (System.properties['test.single']) {
+				// events "passed", "skipped", "failed"
+				events "started", "passed", "skipped", "failed"
+				showExceptions true
+				exceptionFormat "full"
+				showStandardStreams true
+			} else {
+				events "started", "skipped", "failed"
+			}
+
+			debug {
+				events "started", "passed", "skipped", "failed", "standard_out", "standard_error"
+				exceptionFormat "full"
+			}
+		}
+	}
+
+// Generate wrapper, which is distributed as part of source to alleviate the need of installing gradle
 wrapper {
-	gradleVersion = '1.10'
+	gradleVersion = '2.2.1'
 }