Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Support Java 8 language features in Java modules.

Browse Source
This commit is contained in:
akwizgran
2017-11-15 16:46:15 +00:00
parent 53c8cf09b6
commit f8425658e4
6 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bramble-api/build.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.6 sourceCompatibility = 1.8
targetCompatibility = 1.6 targetCompatibility = 1.8
apply plugin: 'witness' apply plugin: 'witness'
@@ -35,3 +35,13 @@ task jarTest(type: Jar, dependsOn: testClasses) {
artifacts { artifacts {
testOutput jarTest testOutput jarTest
} }
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) {
doFirst {
def home = System.env.JAVA_6_HOME;
if (home != null && !home.isEmpty()) {
options.bootstrapClasspath = files("${home}/jre/lib/rt.jar", "${home}/jre/lib/jsse.jar")
}
}
}

14
bramble-core/build.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.6 sourceCompatibility = 1.8
targetCompatibility = 1.6 targetCompatibility = 1.8
apply plugin: 'net.ltgt.apt' apply plugin: 'net.ltgt.apt'
apply plugin: 'idea' apply plugin: 'idea'
@@ -38,3 +38,13 @@ task jarTest(type: Jar, dependsOn: testClasses) {
artifacts { artifacts {
testOutput jarTest testOutput jarTest
} }
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) {
doFirst {
def home = System.env.JAVA_6_HOME;
if (home != null && !home.isEmpty()) {
options.bootstrapClasspath = files("${home}/jre/lib/rt.jar", "${home}/jre/lib/jsse.jar")
}
}
}

4
bramble-j2se/build.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.7 sourceCompatibility = 1.8
targetCompatibility = 1.7 targetCompatibility = 1.8
apply plugin: 'net.ltgt.apt' apply plugin: 'net.ltgt.apt'
apply plugin: 'idea' apply plugin: 'idea'

14
briar-api/build.gradle
View File

@@ -1,7 +1,17 @@
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.6 sourceCompatibility = 1.8
targetCompatibility = 1.6 targetCompatibility = 1.8
dependencies { dependencies {
compile project(path: ':bramble-api', configuration: 'default') compile project(path: ':bramble-api', configuration: 'default')
} }
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) {
doFirst {
def home = System.env.JAVA_6_HOME;
if (home != null && !home.isEmpty()) {
options.bootstrapClasspath = files("${home}/jre/lib/rt.jar", "${home}/jre/lib/jsse.jar")
}
}
}

14
briar-core/build.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.6 sourceCompatibility = 1.8
targetCompatibility = 1.6 targetCompatibility = 1.8
apply plugin: 'net.ltgt.apt' apply plugin: 'net.ltgt.apt'
apply plugin: 'idea' apply plugin: 'idea'
@@ -33,3 +33,13 @@ dependencyVerification {
'com.squareup.okio:okio:734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850', 'com.squareup.okio:okio:734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850',
] ]
} }
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) {
doFirst {
def home = System.env.JAVA_6_HOME;
if (home != null && !home.isEmpty()) {
options.bootstrapClasspath = files("${home}/jre/lib/rt.jar", "${home}/jre/lib/jsse.jar")
}
}
}

3
settings.gradle
View File

@@ -1,5 +1,6 @@
include ':bramble-api', ':bramble-android' include ':bramble-api'
include ':bramble-core' include ':bramble-core'
include ':bramble-android'
include ':bramble-j2se' include ':bramble-j2se'
include ':briar-api' include ':briar-api'
include ':briar-core' include ':briar-core'