Add ability to run build with JDK8, because Gradle Publishing Plugin …

…has problems with JDK9...
zyxist · Oct 7, 2017 · 55aa46c · 55aa46c
1 parent 1fe6cd6
commit 55aa46c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ plugins {
 group = 'com.zyxist'
 version = '0.1.2'
 
-targetCompatibility = '1.9'
-sourceCompatibility = '1.9'
+targetCompatibility = '1.8'
+sourceCompatibility = '1.8'
 
 // Fix a bad interaction with IntelliJ and Gradle > 4.0
 idea.module.inheritOutputDirs = true
@@ -37,7 +37,7 @@ pluginBundle {
 	website = 'https://github.com/zyxist/chainsaw'
 	vcsUrl = 'https://github.com/zyxist/chainsaw'
 	plugins {
-		experimentalJigsawPlugin {
+		chainsawPlugin {
 			id = 'com.zyxist.chainsaw'
 			displayName = 'Chainsaw: Java 9 Jigsaw support'
 			description = 'A plugin that adds the support for building and testing modular JDK9 applications with Gradle. '

diff --git a/src/test/groovy/com/zyxist/chainsaw/ChainsawPluginSpec.groovy b/src/test/groovy/com/zyxist/chainsaw/ChainsawPluginSpec.groovy
@@ -26,6 +26,7 @@ import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 class ChainsawPluginSpec extends Specification {
 	@Rule
 	final TemporaryFolder tmpDir = new TemporaryFolder()
+	static final NOT_JAVA_9 = !System.getProperty("java.version").startsWith("9")
 
 	def setup() {
 		def buildFile = tmpDir.newFile("build.gradle")
@@ -96,6 +97,7 @@ public class AClassTest {
 """
 	}
 
+	@IgnoreIf({NOT_JAVA_9})
 	def "can assemble a module"() {
 		when:
 		def result = GradleRunner.create()
@@ -111,6 +113,7 @@ public class AClassTest {
 		new File(tmpDir.root, "build/classes/java/main/com/example/AClass.class").exists()
 	}
 
+	@IgnoreIf({NOT_JAVA_9})
 	def "can check a module"() {
 		when:
 		def result = GradleRunner.create()
@@ -124,6 +127,7 @@ public class AClassTest {
 		result.task(":test").outcome == SUCCESS
 	}
 
+	@IgnoreIf({NOT_JAVA_9})
 	def "can run with a module"() {
 		when:
 		def result = GradleRunner.create()

diff --git a/src/test/groovy/com/zyxist/chainsaw/JUnit4TestSpec.groovy b/src/test/groovy/com/zyxist/chainsaw/JUnit4TestSpec.groovy
@@ -18,12 +18,14 @@ package com.zyxist.chainsaw
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
 class JUnit4TestSpec extends Specification {
 	final static MOCKITO_MODULE = 'mockito.core'
+	static final NOT_JAVA_9 = !System.getProperty("java.version").startsWith("9")
 
 	@Rule
 	final TemporaryFolder tmpDir = new TemporaryFolder()
@@ -80,6 +82,7 @@ public class AClassTest {
 """
 	}
 
+	@IgnoreIf({NOT_JAVA_9})
 	def "run JUnit4 tests with Mockito - java plugin way"() {
 		given:
 		def buildFile = tmpDir.newFile("build.gradle")
@@ -113,6 +116,7 @@ javaModule.extraTestModules = ['${MOCKITO_MODULE}']
 		result.task(":test").outcome == SUCCESS
 	}
 
+	@IgnoreIf({NOT_JAVA_9})
 	def "run JUnit4 tests with Mockito - new way"() {
 		given:
 		def buildFile = tmpDir.newFile("build.gradle")

diff --git a/src/test/groovy/com/zyxist/chainsaw/JUnit5TestSpec.groovy b/src/test/groovy/com/zyxist/chainsaw/JUnit5TestSpec.groovy
@@ -18,12 +18,14 @@ package com.zyxist.chainsaw
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
 class JUnit5TestSpec extends Specification {
 	final static MOCKITO_MODULE = 'mockito.core'
+	static final NOT_JAVA_9 = !System.getProperty("java.version").startsWith("9")
 
 	@Rule
 	final TemporaryFolder tmpDir = new TemporaryFolder()
@@ -80,6 +82,7 @@ public class AClassTest {
 """
 	}
 
+	@IgnoreIf({NOT_JAVA_9})
 	def "run JUnit5 tests with Mockito - java plugin way"() {
 		given:
 		def buildFile = tmpDir.newFile("build.gradle")
@@ -127,6 +130,7 @@ javaModule.extraTestModules = ['${MOCKITO_MODULE}']
 		result.task(":junitPlatformTest").outcome == SUCCESS
 	}
 
+	@IgnoreIf({NOT_JAVA_9})
 	def "run JUnit5 tests with Mockito - new way"() {
 		given:
 		def buildFile = tmpDir.newFile("build.gradle")