commit 3ac8684d3514a7ff668ff89ee9d01a93fb310727
author Ian Zerny <zerny@google.com> Wed Oct 05 11:49:35 2022 +0200
committer Ian Zerny <zerny@google.com> Thu Oct 06 07:36:56 2022 +0000
tree 51a53c145a34ea189f4dd9cafb32bf5bff0c66a4
parent bdd3f782fa2b1e4a2cf82834f9533ff6d5d55a32

Compile R8 main source set with source/target 11.

Bug: b/229695990
Change-Id: Ie9fbc266aa190bb2fe5042030e9917230a9e6d1e

build.gradle

diff --git a/build.gradle b/build.gradle
index db4592a..812b438 100644
--- a/build.gradle
+++ b/build.gradle
@@ -646,6 +646,12 @@
 }
 
 setJdkCompilationWithCompatibility(
+        sourceSets.main.compileJavaTaskName,
+        'jdk-11',
+        JavaVersion.VERSION_11,
+        false);
+
+setJdkCompilationWithCompatibility(
         sourceSets.examplesJava9.compileJavaTaskName,
         'openjdk-9.0.4',
         JavaVersion.VERSION_1_9,
@@ -1037,7 +1043,7 @@
             input,
             "--output", output,
             "--pg-map-output", output + ".map",
-            "--lib", "third_party/openjdk/openjdk-rt-1.8/rt.jar"
+            "--lib", org.gradle.internal.jvm.Jvm.current().javaHome,
     ] + args + libs.collectMany { ["--lib", it] } + pgConfs.collectMany { ["--pg-conf", it] }
     return baseR8CommandLine(allArgs)
 }