Skip to content

Commit 5b6b889

Browse files
jbgijbgi
committed
Initiate 5.x series: build with jdk11 by default.
 Move java8 to core.
1 parent fb4b5bc commit 5b6b889

15 files changed

Lines changed: 52 additions & 124 deletions

File tree

‎.travis.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,24 @@ sudo: false
44
language: java
55

66
jdk:
7-
- openjdk11
7+
- openjdk10
8+
- openjdk-ea
89

910
matrix:
1011

1112
include:
12-
- jdk: openjdk8
13+
- jdk: openjdk11
1314
script:
1415
- ./gradlew build coverage -s -i
1516
after_success:
1617
- bash <(curl -s https://codecov.io/bash)
17-
- '[ "$TRAVIS_BRANCH" = "series/4.x" -a "$TRAVIS_PULL_REQUEST" = "false" -a -z "$TRAVIS_TAG" ]
18+
- '[ "$TRAVIS_BRANCH" = "series/5.x" -a "$TRAVIS_PULL_REQUEST" = "false" -a -z "$TRAVIS_TAG" ]
1819
&& ./gradlew uploadArchives'
1920

21+
allow_failures:
22+
- jdk: openjdk10
23+
- jdk: openjdk-ea
24+
2025
script:
2126
- ./gradlew clean test
2227

‎build.gradle‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ ext {
77
buildscript {
88
ext {
99
uptodateVersion = "1.6.3"
10-
retrolambdaPluginVersion = "3.7.0"
11-
retrolambdaVersion = "2.5.4"
1210
}
1311

1412
repositories {
@@ -19,7 +17,6 @@ buildscript {
1917

2018
dependencies {
2119
classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"
22-
classpath "me.tatarka:gradle-retrolambda:$retrolambdaPluginVersion"
2320
}
2421
}
2522

@@ -43,14 +40,13 @@ allprojects {
4340

4441
ext {
4542
isSnapshot = true
46-
fjBaseVersion = "4.9"
43+
fjBaseVersion = "5.0"
4744

4845
snapshotAppendix = "-SNAPSHOT"
4946
fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")
5047
fjConsumeVersion = "4.8"
5148

5249
signModule = false
53-
useRetroLambda = false
5450

5551
projectTitle = "Functional Java"
5652
projectName = "functionaljava"
@@ -71,10 +67,6 @@ allprojects {
7167
dependencyJunit = "org.junit.vintage:junit-vintage-engine:5.2.0"
7268

7369
displayCompilerWarnings = true
74-
75-
newJdkEnvVar = "JAVA8_HOME"
76-
oldJdkEnvVar = "JAVA7_HOME"
77-
retroLambdaTarget = JavaVersion.VERSION_1_6
7870
}
7971

8072
repositories {
@@ -111,11 +103,13 @@ subprojects {
111103
}
112104
}
113105

114-
if (displayCompilerWarnings) {
115-
tasks.withType(JavaCompile) {
106+
107+
tasks.withType(JavaCompile) {
108+
options.compilerArgs.addAll(['--release', '10'])
109+
if (displayCompilerWarnings) {
116110
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
117-
}
118-
}
111+
}
112+
}
119113

120114
jacocoTestReport {
121115
additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)
@@ -136,7 +130,7 @@ task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
136130
dependsOn = subprojects.coverage
137131
executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
138132
// We only care about coverage of:
139-
def projectForFoverage = ["core", "java8", "quickcheck", "java-core"]
133+
def projectForFoverage = ["core", "quickcheck", "java-core"]
140134
classDirectories = files(subprojects.findAll {subproject -> subproject.name in projectForFoverage} .sourceSets.main.output)
141135
sourceDirectories = files(subprojects.findAll {subproject -> subproject.name in projectForFoverage} .sourceSets.main.allSource.srcDirs)
142136

‎core/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ performSigning(signingEnabled, signModule)
1515
configureUpload(signingEnabled, signModule)
1616

1717
uploadArchives.enabled = true
18-
19-
configureAllRetroLambda()

java8/src/main/java/fj/data/Collectors.java renamed to core/src/main/java/fj/data/Collectors.java

File renamed without changes.

java8/src/main/java/fj/data/Java8.java renamed to core/src/main/java/fj/data/Java8.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
package fj.data;
22

3-
import java.util.Iterator;
4-
import java.util.Optional;
5-
import java.util.Spliterators;
6-
import java.util.function.BiFunction;
7-
import java.util.function.Consumer;
8-
import java.util.function.Function;
9-
import java.util.function.Supplier;
10-
import java.util.stream.StreamSupport;
11-
123
import fj.F;
134
import fj.F2;
145
import fj.P;
@@ -19,6 +10,15 @@
1910
import fj.function.Try1;
2011
import fj.function.Try2;
2112

13+
import java.util.Iterator;
14+
import java.util.Optional;
15+
import java.util.Spliterators;
16+
import java.util.function.BiFunction;
17+
import java.util.function.Consumer;
18+
import java.util.function.Function;
19+
import java.util.function.Supplier;
20+
import java.util.stream.StreamSupport;
21+
2222
/**
2323
* Created by mperry on 3/06/2014.
2424
*/
@@ -134,7 +134,7 @@ public static <A> F<A, Unit> Consumer_F(final Consumer<A> c) {
134134
};
135135
}
136136

137-
public static <A> java.util.stream.Stream<A> Stream_JavaStream(final fj.data.Stream<A> s) {
137+
public static <A> java.util.stream.Stream<A> Stream_JavaStream(final Stream<A> s) {
138138
return Iterable_JavaStream(s);
139139
}
140140

@@ -146,7 +146,7 @@ public static <A> java.util.stream.Stream<A> Iterator_JavaStream(final Iterator<
146146
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it, 0), false);
147147
}
148148

149-
public static <A> F<fj.data.Stream<A>, java.util.stream.Stream<A>> Stream_JavaStream() {
149+
public static <A> F<Stream<A>, java.util.stream.Stream<A>> Stream_JavaStream() {
150150
return Java8::Stream_JavaStream;
151151
}
152152

‎demo/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ mainClassName = "fj.demo.euler.Problem2"
55

66
archivesBaseName = "${project.projectName}-${project.name}"
77

8-
configureAllRetroLambda()
9-
108
dependencies {
119
compile project(":core")
1210
compile project(":quickcheck")

‎java-core/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ configureUpload(signingEnabled, signModule)
1515

1616

1717
uploadArchives.enabled = true
18-
19-
configureAllRetroLambda()

‎java8/build.gradle‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎java8/src/test/java/fj/EmptyTest.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎lib.gradle‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -77,33 +77,9 @@ void configureUpload(String signingEnabled, Boolean signModule) {
7777
}
7878
}
7979

80-
void configureAllRetroLambda() {
81-
configureRetroLambda(useRetroLambda, newJdkEnvVar, oldJdkEnvVar, retroLambdaTarget)
82-
}
83-
84-
void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String oldJdkEnvVar, JavaVersion retroLambdaTarget) {
85-
86-
if (useRetroLambda) {
87-
apply plugin: 'me.tatarka.retrolambda'
88-
retrolambda {
89-
jdk System.getenv(newJdkEnvVar)
90-
oldJdk System.getenv(oldJdkEnvVar)
91-
javaVersion retroLambdaTarget
92-
defaultMethods true
93-
}
94-
dependencies {
95-
retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"
96-
}
97-
} else {
98-
project.archivesBaseName = "${project.archivesBaseName}_1.8"
99-
}
100-
}
101-
10280
ext {
10381
findJavaCommand = this.&findJavaCommand
10482
doSigning = this.&doSigning
10583
performSigning = this.&performSigning
10684
configureUpload = this.&configureUpload
107-
configureRetroLambda = this.&configureRetroLambda
108-
configureAllRetroLambda = this.&configureAllRetroLambda
10985
}

0 commit comments

Comments
 (0)