commit 43a4ef3c8746fca03e92d0fd2a5bcc5acb12c0dd
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Nov 25 16:59:33 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Nov 27 08:55:44 2020 +0000
tree bcc56cfe4e4c1715955b979d948d1eb7b6d3bd90
parent 4fcaa65693b51968a0fa8a70f96a118b5c2a7ea7

Rename jdk11 folders to match jdk9 and jdk15

Change-Id: I2bf11cf920f9cb3488e2465fa6a9f8a704dcd22e

build.gradle

diff --git a/build.gradle b/build.gradle
index 197a5e5..d80eb7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -367,18 +367,18 @@
         linux: [
                 "third_party": ["openjdk/openjdk-9.0.4/linux",
                                 "openjdk/jdk8/linux-x86",
-                                "openjdk/jdk-11/Linux",
+                                "openjdk/jdk-11/linux",
                                 "openjdk/jdk-15/linux"],
         ],
         osx: [
                 "third_party": ["openjdk/openjdk-9.0.4/osx",
                                 "openjdk/jdk8/darwin-x86",
-                                "openjdk/jdk-11/Mac",
+                                "openjdk/jdk-11/osx",
                                 "openjdk/jdk-15/osx"],
         ],
         windows: [
                 "third_party": ["openjdk/openjdk-9.0.4/windows",
-                                "openjdk/jdk-11/Windows",
+                                "openjdk/jdk-11/windows",
                                 "openjdk/jdk-15/windows"],
         ],
 ]
@@ -589,44 +589,47 @@
         JavaVersion.VERSION_1_9,
         false)
 setJdkCompilationWithCompatibility(
+        sourceSets.examplesJava11.compileJavaTaskName,
+        'jdk-11',
+        JavaVersion.VERSION_11,
+        false)
+setJdkCompilationWithCompatibility(
+        sourceSets.examplesJava10.compileJavaTaskName,
+        'jdk-11',
+        JavaVersion.VERSION_1_10,
+        false)
+setJdkCompilationWithCompatibility(
+        sourceSets.examplesJava11.compileJavaTaskName,
+        'jdk-11',
+        JavaVersion.VERSION_11,
+        false)
+setJdkCompilationWithCompatibility(
+        sourceSets.examplesTestNGRunner.compileJavaTaskName,
+        'jdk-11',
+        JavaVersion.VERSION_11,
+        false)
+setJdkCompilationWithCompatibility(
+        sourceSets.jdk11TimeTests.compileJavaTaskName,
+        'jdk-11',
+        JavaVersion.VERSION_11,
+        false)
+setJdkCompilationWithCompatibility(
         sourceSets.examplesJava15.compileJavaTaskName,
         'jdk-15',
         JavaVersion.VERSION_15,
         true)
 
-def setJdk11CompilationWithCompatibility(String sourceSet, JavaVersion compatibility) {
-    tasks.named(sourceSet).get().configure {
-        def jdkDir = 'third_party/openjdk/jdk-11/'
-        options.fork = true
-        options.forkOptions.jvmArgs = []
-        if (OperatingSystem.current().isLinux()) {
-            options.forkOptions.javaHome = file(jdkDir + 'Linux')
-        } else if (OperatingSystem.current().isMacOsX()) {
-            options.forkOptions.javaHome = file(jdkDir + 'Mac/Contents/Home')
-        } else {
-            options.forkOptions.javaHome = file(jdkDir + 'Windows')
-        }
-        sourceCompatibility = compatibility
-        targetCompatibility = compatibility
-    }
-}
-
-setJdk11CompilationWithCompatibility(sourceSets.examplesJava10.compileJavaTaskName, JavaVersion.VERSION_1_10)
-setJdk11CompilationWithCompatibility(sourceSets.examplesJava11.compileJavaTaskName, JavaVersion.VERSION_11)
-setJdk11CompilationWithCompatibility(sourceSets.examplesTestNGRunner.compileJavaTaskName, JavaVersion.VERSION_11)
-setJdk11CompilationWithCompatibility(sourceSets.jdk11TimeTests.compileJavaTaskName, JavaVersion.VERSION_11)
-
 task compileMainWithJava11 (type: JavaCompile) {
     dependsOn downloadDeps
     def jdkDir = 'third_party/openjdk/jdk-11/'
     options.fork = true
     options.forkOptions.jvmArgs = []
     if (OperatingSystem.current().isLinux()) {
-        options.forkOptions.javaHome = file(jdkDir + 'Linux')
+        options.forkOptions.javaHome = file(jdkDir + 'linux')
     } else if (OperatingSystem.current().isMacOsX()) {
-        options.forkOptions.javaHome = file(jdkDir + 'Mac/Contents/Home')
+        options.forkOptions.javaHome = file(jdkDir + 'osx/Contents/Home')
     } else {
-        options.forkOptions.javaHome = file(jdkDir + 'Windows')
+        options.forkOptions.javaHome = file(jdkDir + 'windows')
     }
     source = sourceSets.main.allSource
     destinationDir = file(java11ClassFiles)