Skip to content

Commit 7b170be

Browse files
committed
Create variable to enable/disable retrolambda
1 parent 221c0d6 commit 7b170be

File tree

5 files changed

+38
-23
lines changed

5 files changed

+38
-23
lines changed

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ allprojects {
4343
fjConsumeVersion = "4.3"
4444

4545
signModule = false
46+
useRetroLambda = false
4647

4748
projectTitle = "Functional Java"
4849
projectName = "functionaljava"
@@ -61,6 +62,7 @@ allprojects {
6162
primaryEmail = "functionaljava@googlegroups.com"
6263

6364
dependencyJunit = "junit:junit:4.11"
65+
6466
}
6567

6668
version = fjVersion

core/build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11

2-
apply plugin: 'me.tatarka.retrolambda'
2+
if (useRetroLambda) {
3+
apply plugin: 'me.tatarka.retrolambda'
4+
}
5+
36

47
ext {
58
signModule = true
@@ -16,8 +19,10 @@ configureUpload(signingEnabled, signModule)
1619

1720
uploadArchives.enabled = true
1821

19-
retrolambda {
20-
jdk System.getenv("JAVA8_HOME")
21-
oldJdk System.getenv("JAVA7_HOME")
22-
javaVersion JavaVersion.VERSION_1_7
22+
if (useRetroLambda) {
23+
retrolambda {
24+
jdk System.getenv("JAVA8_HOME")
25+
oldJdk System.getenv("JAVA7_HOME")
26+
javaVersion JavaVersion.VERSION_1_7
27+
}
2328
}

demo/build.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11

22
apply plugin: 'application'
3-
apply plugin: 'me.tatarka.retrolambda'
43

5-
mainClassName = "fj.demo.euler.Problem2"
4+
if (useRetroLambda) {
5+
apply plugin: 'me.tatarka.retrolambda'
6+
}
67

8+
mainClassName = "fj.demo.euler.Problem2"
79

8-
retrolambda {
9-
jdk System.getenv("JAVA8_HOME")
10-
oldJdk System.getenv("JAVA7_HOME")
11-
javaVersion JavaVersion.VERSION_1_7
10+
if (useRetroLambda) {
11+
retrolambda {
12+
jdk System.getenv("JAVA8_HOME")
13+
oldJdk System.getenv("JAVA7_HOME")
14+
javaVersion JavaVersion.VERSION_1_7
15+
}
1216
}
1317

1418
dependencies {

props-core/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11

2-
apply plugin: 'me.tatarka.retrolambda'
2+
if (useRetroLambda) {
3+
apply plugin: 'me.tatarka.retrolambda'
34

4-
retrolambda {
5-
jdk System.getenv("JAVA8_HOME")
6-
oldJdk System.getenv("JAVA7_HOME")
7-
javaVersion JavaVersion.VERSION_1_7
5+
retrolambda {
6+
jdk System.getenv("JAVA8_HOME")
7+
oldJdk System.getenv("JAVA7_HOME")
8+
javaVersion JavaVersion.VERSION_1_7
9+
}
810
}
911

1012
dependencies {

quickcheck/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11

2-
apply plugin: 'me.tatarka.retrolambda'
2+
if (useRetroLambda) {
3+
apply plugin: 'me.tatarka.retrolambda'
34

4-
archivesBaseName = "${project.projectName}-${project.name}"
5-
6-
retrolambda {
7-
jdk System.getenv("JAVA8_HOME")
8-
oldJdk System.getenv("JAVA7_HOME")
9-
javaVersion JavaVersion.VERSION_1_7
5+
retrolambda {
6+
jdk System.getenv("JAVA8_HOME")
7+
oldJdk System.getenv("JAVA7_HOME")
8+
javaVersion JavaVersion.VERSION_1_7
9+
}
1010
}
1111

12+
archivesBaseName = "${project.projectName}-${project.name}"
13+
1214
dependencies {
1315
compile project(":core")
1416
compile dependencyJunit

0 commit comments

Comments
 (0)