From 552da72391d8b628a3ff1212d9bda34a0274a51e Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 30 Jun 2017 12:29:01 +0200 Subject: Added experimental support for legacy Java 1.6 JVMs through Retrolambda. --- contrib/agent/build.gradle | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/agent/build.gradle b/contrib/agent/build.gradle index 72478a07..449d8890 100644 --- a/contrib/agent/build.gradle +++ b/contrib/agent/build.gradle @@ -1,11 +1,17 @@ plugins { id 'com.github.johnrengelman.shadow' version '2.0.0' + id 'me.tatarka.retrolambda' version '3.6.0' } description = 'OpenCensus Agent' -sourceCompatibility = 1.7 -targetCompatibility = 1.7 +sourceCompatibility = JavaVersion.VERSION_1_7 +targetCompatibility = JavaVersion.VERSION_1_7 + +// Experimental support for legacy Java 1.6 JVMs. +retrolambda { + javaVersion JavaVersion.VERSION_1_6 +} def agentPackage = 'io.opencensus.contrib.agent' def agentMainClass = "${agentPackage}.AgentMain" @@ -24,7 +30,7 @@ def agentRepackaged = "${agentPackage}.deps" dependencies { compile group: 'net.bytebuddy', name: 'byte-buddy', version: '1.7.1' - signature 'org.codehaus.mojo.signature:java17:+@signature' + signature 'org.codehaus.mojo.signature:java16:+@signature' } jar { @@ -35,8 +41,8 @@ jar { attributes 'Can-Retransform-Classes': true // Let the java plugin use the overridden values instead of the root project's values. - attributes 'Source-Compatibility': sourceCompatibility - attributes 'Target-Compatibility': targetCompatibility + attributes 'Source-Compatibility': JavaVersion.VERSION_1_6 + attributes 'Target-Compatibility': JavaVersion.VERSION_1_6 } } -- cgit v1.2.3 From a9689033f4536e6bad8e398a1c6605fb1b38cbe7 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 30 Jun 2017 13:58:27 +0200 Subject: Mention that Animalsniffer is used. --- contrib/agent/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/agent/build.gradle b/contrib/agent/build.gradle index 449d8890..79adfadb 100644 --- a/contrib/agent/build.gradle +++ b/contrib/agent/build.gradle @@ -8,7 +8,8 @@ description = 'OpenCensus Agent' sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 -// Experimental support for legacy Java 1.6 JVMs. +// Experimental support for legacy Java 1.6 JVMs. Animalsniffer (applied by the root project) is +// used to check for unexpected references to later APIs. Also see dependencies/signature. retrolambda { javaVersion JavaVersion.VERSION_1_6 } -- cgit v1.2.3 From c433da68f1fba73c896903a9b9d445a95fedb6b5 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 30 Jun 2017 14:01:35 +0200 Subject: Retrolambda itself wants JDK 8. --- contrib/agent/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/agent/build.gradle b/contrib/agent/build.gradle index 79adfadb..f4147ca4 100644 --- a/contrib/agent/build.gradle +++ b/contrib/agent/build.gradle @@ -12,6 +12,7 @@ targetCompatibility = JavaVersion.VERSION_1_7 // used to check for unexpected references to later APIs. Also see dependencies/signature. retrolambda { javaVersion JavaVersion.VERSION_1_6 + jdk '/usr/lib/jvm/java-8-oracle' } def agentPackage = 'io.opencensus.contrib.agent' -- cgit v1.2.3 From 459aaa7020867929807429440ca1358cb603752a Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 30 Jun 2017 14:17:27 +0200 Subject: Get the Java 8 home from jdk_switcher instead of hardcoding the path. --- contrib/agent/build.gradle | 1 - 1 file changed, 1 deletion(-) (limited to 'contrib') diff --git a/contrib/agent/build.gradle b/contrib/agent/build.gradle index f4147ca4..79adfadb 100644 --- a/contrib/agent/build.gradle +++ b/contrib/agent/build.gradle @@ -12,7 +12,6 @@ targetCompatibility = JavaVersion.VERSION_1_7 // used to check for unexpected references to later APIs. Also see dependencies/signature. retrolambda { javaVersion JavaVersion.VERSION_1_6 - jdk '/usr/lib/jvm/java-8-oracle' } def agentPackage = 'io.opencensus.contrib.agent' -- cgit v1.2.3 From 7ac5f413d93580f5c667f3893649059ab6680d6f Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 30 Jun 2017 14:25:01 +0200 Subject: Mention JAVA8_HOME, too. --- contrib/agent/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/agent/build.gradle b/contrib/agent/build.gradle index 79adfadb..d2d5fd69 100644 --- a/contrib/agent/build.gradle +++ b/contrib/agent/build.gradle @@ -10,6 +10,7 @@ targetCompatibility = JavaVersion.VERSION_1_7 // Experimental support for legacy Java 1.6 JVMs. Animalsniffer (applied by the root project) is // used to check for unexpected references to later APIs. Also see dependencies/signature. +// Retrolambda itself requires JDK 8, which it finds at $JAVA8_HOME. retrolambda { javaVersion JavaVersion.VERSION_1_6 } -- cgit v1.2.3