Merge pull request functionaljava#302 from jbgi/gradle-java8-classifier

mperry · web-flow · commit 68e8a73592e3 · 2017-03-16T20:29:06.000+10:00
Build against java 1.7 and publish artifacts targetting java 1.8 (suffixed by "_1.8")
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,6 @@ before_script:
   - sudo service x11-common stop || true
 
 script:
-  - jdk_switcher use openjdk6 && export JAVA6_HOME=$JAVA_HOME
   - jdk_switcher use oraclejdk7 && export JAVA7_HOME=$JAVA_HOME
   - jdk_switcher use oraclejdk8 && export JAVA8_HOME=$JAVA_HOME
   - ./gradlew build coverage -s -i
diff --git a/build.gradle b/build.gradle
@@ -6,9 +6,9 @@ ext {
 
 buildscript {
     ext {
-		uptodateVersion = "1.6.0"
-        retrolambdaPluginVersion = "3.2.5"
-        retrolambdaVersion = "2.3.0"
+		uptodateVersion = "1.6.2"
+        retrolambdaPluginVersion = "3.5.0"
+        retrolambdaVersion = "2.5.1"
     }
 
     repositories {
@@ -77,8 +77,8 @@ allprojects {
         displayCompilerWarnings = true
 
         newJdkEnvVar = "JAVA8_HOME"
-        oldJdkEnvVar = "JAVA6_HOME"
-        retroLambdaTarget = JavaVersion.VERSION_1_6
+        oldJdkEnvVar = "JAVA7_HOME"
+        retroLambdaTarget = JavaVersion.VERSION_1_7
     }
 
     repositories {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Dec 06 21:53:19 EST 2016
+#Mon Feb 27 21:23:04 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/java-core/build.gradle b/java-core/build.gradle
@@ -1,5 +1,6 @@
 
 archivesBaseName = "${project.projectName}-${project.name}"
+configureAllRetroLambda()
 
 ext {
     signModule = true
@@ -13,4 +14,7 @@ dependencies {
 performSigning(signingEnabled, signModule)
 configureUpload(signingEnabled, signModule)
 
+
 uploadArchives.enabled = true
+
+configureAllRetroLambda()
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -13,4 +13,6 @@ dependencies {
 performSigning(signingEnabled, signModule)
 configureUpload(signingEnabled, signModule)
 
-uploadArchives.enabled = true
+if (!useRetroLambda) {
+    uploadArchives.enabled = true
+}
diff --git a/lib.gradle b/lib.gradle
@@ -94,6 +94,8 @@ void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String ol
         dependencies {
             retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"
         }
+    } else {
+        project.archivesBaseName = "${project.archivesBaseName}_1.8"
     }
 }
 
diff --git a/props-core-scalacheck/build.gradle b/props-core-scalacheck/build.gradle
@@ -4,16 +4,12 @@ archivesBaseName = "${project.projectName}-${project.name}"
 apply plugin: 'scala'
 
 ext {
-    scalaVersion = "2.11.7"
+    scalaVersion = "2.11.8"
     scalacheckScalaVersion = "2.11"
-    scalacheckVersion = "1.12.4"
+    scalacheckVersion = "1.12.5"
     signModule = true
 }
 
-tasks.withType(ScalaCompile) {
-    scalaCompileOptions.useAnt = false
-}
-
 dependencies {
     compile project(":core")
     compile "org.scala-lang:scala-library:$scalaVersion"
@@ -22,8 +18,6 @@ dependencies {
     testCompile dependencyJunit
 }
 
-sourceCompatibility = "1.7"
-
 performSigning(signingEnabled, signModule)
 configureUpload(signingEnabled, signModule)
 
diff --git a/quickcheck/build.gradle b/quickcheck/build.gradle
@@ -3,10 +3,10 @@ ext {
     signModule = true
 }
 
-configureAllRetroLambda()
-
 archivesBaseName = "${project.projectName}-${project.name}"
 
+configureAllRetroLambda()
+
 dependencies {
 	compile project(":core")
     compile dependencyJunit

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,8 @@ void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String ol`
`94`	`94`	`dependencies {`
`95`	`95`	`retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"`
`96`	`96`	`}`
	`97`	`+ } else {`
	`98`	`+ project.archivesBaseName = "${project.archivesBaseName}_1.8"`
`97`	`99`	`}`
`98`	`100`	`}`
`99`	`101`