Skip to content

Commit 68e8a73

Browse files
mperrymperry
authored
Merge pull request #302 from jbgi/gradle-java8-classifier
Build against java 1.7 and publish artifacts targetting java 1.8 (suffixed by "_1.8")
2 parents dd8451d + d1b15e1 commit 68e8a73

File tree

11 files changed

+64
-57
lines changed

11 files changed

+64
-57
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ before_script:
2424
- sudo service x11-common stop || true
2525

2626
script:
27-
- jdk_switcher use openjdk6 && export JAVA6_HOME=$JAVA_HOME
2827
- jdk_switcher use oraclejdk7 && export JAVA7_HOME=$JAVA_HOME
2928
- jdk_switcher use oraclejdk8 && export JAVA8_HOME=$JAVA_HOME
3029
- ./gradlew build coverage -s -i

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ext {
66

77
buildscript {
88
ext {
9-
uptodateVersion = "1.6.0"
10-
retrolambdaPluginVersion = "3.2.5"
11-
retrolambdaVersion = "2.3.0"
9+
uptodateVersion = "1.6.2"
10+
retrolambdaPluginVersion = "3.5.0"
11+
retrolambdaVersion = "2.5.1"
1212
}
1313

1414
repositories {
@@ -77,8 +77,8 @@ allprojects {
7777
displayCompilerWarnings = true
7878

7979
newJdkEnvVar = "JAVA8_HOME"
80-
oldJdkEnvVar = "JAVA6_HOME"
81-
retroLambdaTarget = JavaVersion.VERSION_1_6
80+
oldJdkEnvVar = "JAVA7_HOME"
81+
retroLambdaTarget = JavaVersion.VERSION_1_7
8282
}
8383

8484
repositories {

‎gradle/wrapper/gradle-wrapper.jar‎

571 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Dec 06 21:53:19 EST 2016
1+
#Mon Feb 27 21:23:04 CET 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip

‎gradlew‎

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
150154
esac
151155
fi
152156

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
156161
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
159171

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

‎gradlew.bat‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,10 +46,9 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line

‎java-core/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
archivesBaseName = "${project.projectName}-${project.name}"
3+
configureAllRetroLambda()
34

45
ext {
56
signModule = true
@@ -13,4 +14,7 @@ dependencies {
1314
performSigning(signingEnabled, signModule)
1415
configureUpload(signingEnabled, signModule)
1516

17+
1618
uploadArchives.enabled = true
19+
20+
configureAllRetroLambda()

‎java8/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ dependencies {
1313
performSigning(signingEnabled, signModule)
1414
configureUpload(signingEnabled, signModule)
1515

16-
uploadArchives.enabled = true
16+
if (!useRetroLambda) {
17+
uploadArchives.enabled = true
18+
}

‎lib.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String ol
9494
dependencies {
9595
retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"
9696
}
97+
} else {
98+
project.archivesBaseName = "${project.archivesBaseName}_1.8"
9799
}
98100
}
99101

‎props-core-scalacheck/build.gradle‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@ archivesBaseName = "${project.projectName}-${project.name}"
44
apply plugin: 'scala'
55

66
ext {
7-
scalaVersion = "2.11.7"
7+
scalaVersion = "2.11.8"
88
scalacheckScalaVersion = "2.11"
9-
scalacheckVersion = "1.12.4"
9+
scalacheckVersion = "1.12.5"
1010
signModule = true
1111
}
1212

13-
tasks.withType(ScalaCompile) {
14-
scalaCompileOptions.useAnt = false
15-
}
16-
1713
dependencies {
1814
compile project(":core")
1915
compile "org.scala-lang:scala-library:$scalaVersion"
@@ -22,8 +18,6 @@ dependencies {
2218
testCompile dependencyJunit
2319
}
2420

25-
sourceCompatibility = "1.7"
26-
2721
performSigning(signingEnabled, signModule)
2822
configureUpload(signingEnabled, signModule)
2923

0 commit comments

Comments
 (0)