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

Include java.lang.invoke classes in bootstrap classpath.

Browse Source
This commit is contained in:
akwizgran
2017-11-16 15:26:05 +00:00
parent fc93ced067
commit e30e34f342
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bramble-api/build.gradle
View File

@@ -38,10 +38,5 @@ artifacts {
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs // If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
doFirst { useJava6StandardLibrary(it)
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")
}
}
} }

7
bramble-core/build.gradle
View File

@@ -41,10 +41,5 @@ artifacts {
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs // If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
doFirst { useJava6StandardLibrary(it)
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")
}
}
} }

7
briar-api/build.gradle
View File

@@ -8,10 +8,5 @@ dependencies {
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs // If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
doFirst { useJava6StandardLibrary(it)
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")
}
}
} }

7
briar-core/build.gradle
View File

@@ -36,10 +36,5 @@ dependencyVerification {
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs // If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
doFirst { useJava6StandardLibrary(it)
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")
}
}
} }

24
build.gradle
View File

@@ -24,3 +24,27 @@ buildscript {
classpath files('libs/gradle-witness.jar') classpath files('libs/gradle-witness.jar')
} }
} }
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
ext.useJava6StandardLibrary = { task ->
def home = System.env.JAVA_6_HOME;
if (home != null && !home.isEmpty()) {
println "Setting Java 6 bootstrap classpath for ${task.name}"
task.dependsOn createJavaLangInvokeJar
task.options.bootstrapClasspath = files(
"${project.rootDir}/build/invoke.jar",
"${home}/jre/lib/rt.jar",
"${home}/jre/lib/jsse.jar"
)
}
}
// Create a jar containing the java.lang.invoke classes for the Java 6 bootstrap classpath
task createJavaLangInvokeJar(type: Zip) {
archiveName 'invoke.jar'
destinationDir file("${project.rootDir}/build")
from zipTree("${System.getProperty('java.home')}/lib/rt.jar").matching {
include 'java/lang/invoke/*'
}
include '**/*'
}