From bc8d429e6b2d8848f4c48d5d7ea6ae2be500c254 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Tue, 23 Apr 2024 18:13:28 +0200 Subject: [PATCH] Legacy SDK - Remove Java 7 check (#3663) --- gradle/common-java.gradle | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/gradle/common-java.gradle b/gradle/common-java.gradle index a60d62c0aa9..4f005dd07e6 100644 --- a/gradle/common-java.gradle +++ b/gradle/common-java.gradle @@ -103,8 +103,6 @@ jacocoTestReport { } // setting this variable is highly recommended -def java7JreDir = System.env.'JAVA_JRE_7' -def isJava7 = JavaVersion.current().isJava7() def isJava7Compatible = JavaVersion.current().isJava7Compatible() if (!isJava7Compatible) { @@ -113,26 +111,6 @@ if (!isJava7Compatible) { throw new GradleException("incompatible JDK version: ${JavaVersion.current()}; needs 1.7+") } } -if (java7JreDir) { - def jre7libDir = fileTree(dir: "$java7JreDir/lib", include: '*.jar') - if (!jre7libDir.any()) { - throw new GradleException("Invalid JAVA_JRE_7 directory. ${jre7libDir.dir} was empty") - } - - tasks.withType(JavaCompile) { - options.bootstrapClasspath = jre7libDir - } -} else { - def msg = "IMPORTANT: Environment variable 'JAVA_JRE_7' is not defined - Install JRE 7 and set 'JAVA_JRE_7' to prevent runtime compatibility issues!" - if (!isJava7) { - if (isBuildServer || isRelease) { - logger.error msg - throw new GradleException("JAVA_JRE_7 must be set") - } else { - logger.warn msg - } - } -} sourceSets { integrationTest {