Support builds with platform specific JDK (#69)

linkedin · Oct 13, 2021 · 8709e97 · 8709e97
1 parent df660fc
commit 8709e97
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 22 deletions.
diff --git a/transportable-udfs-plugin/src/main/java/com/linkedin/transport/plugin/Defaults.java b/transportable-udfs-plugin/src/main/java/com/linkedin/transport/plugin/Defaults.java
@@ -16,6 +16,7 @@
 import java.io.InputStream;
 import java.util.List;
 import java.util.Properties;
+import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 import static com.linkedin.transport.plugin.ConfigurationType.*;
 
@@ -61,6 +62,7 @@ private static Properties loadDefaultVersions() {
           "presto",
           Language.JAVA,
           PrestoWrapperGenerator.class,
+          JavaLanguageVersion.of(11),
           ImmutableList.of(
               getDependencyConfiguration(IMPLEMENTATION, "com.linkedin.transport:transportable-udfs-presto",
                   "transport"),
@@ -78,6 +80,7 @@ private static Properties loadDefaultVersions() {
           "hive",
           Language.JAVA,
           HiveWrapperGenerator.class,
+          JavaLanguageVersion.of(8),
           ImmutableList.of(
               getDependencyConfiguration(IMPLEMENTATION, "com.linkedin.transport:transportable-udfs-hive", "transport"),
               getDependencyConfiguration(COMPILE_ONLY, "org.apache.hive:hive-exec", "hive")
@@ -91,6 +94,7 @@ private static Properties loadDefaultVersions() {
           "spark",
           Language.SCALA,
           SparkWrapperGenerator.class,
+          JavaLanguageVersion.of(8),
           ImmutableList.of(
               getDependencyConfiguration(IMPLEMENTATION, "com.linkedin.transport:transportable-udfs-spark",
                   "transport"),

diff --git a/transportable-udfs-plugin/src/main/java/com/linkedin/transport/plugin/Platform.java b/transportable-udfs-plugin/src/main/java/com/linkedin/transport/plugin/Platform.java
@@ -8,6 +8,7 @@
 import com.linkedin.transport.codegen.WrapperGenerator;
 import com.linkedin.transport.plugin.packaging.Packaging;
 import java.util.List;
+import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 
 /**
@@ -21,12 +22,14 @@ public class Platform {
   private final List<DependencyConfiguration> _defaultWrapperDependencyConfigurations;
   private final List<DependencyConfiguration> _defaultTestDependencyConfigurations;
   private final List<Packaging> _packaging;
+  private final JavaLanguageVersion _javaLanguageVersion;
 
   public Platform(String name, Language language, Class<? extends WrapperGenerator> wrapperGeneratorClass,
-      List<DependencyConfiguration> defaultWrapperDependencyConfigurations,
+      JavaLanguageVersion javaLanguageVersion, List<DependencyConfiguration> defaultWrapperDependencyConfigurations,
       List<DependencyConfiguration> defaultTestDependencyConfigurations, List<Packaging> packaging) {
     _name = name;
     _language = language;
+    _javaLanguageVersion = javaLanguageVersion;
     _wrapperGeneratorClass = wrapperGeneratorClass;
     _defaultWrapperDependencyConfigurations = defaultWrapperDependencyConfigurations;
     _defaultTestDependencyConfigurations = defaultTestDependencyConfigurations;
@@ -56,4 +59,8 @@ public List<DependencyConfiguration> getDefaultTestDependencyConfigurations() {
   public List<Packaging> getPackaging() {
     return _packaging;
   }
+
+  public JavaLanguageVersion getJavaLanguageVersion() {
+    return _javaLanguageVersion;
+  }
 }
diff --git a/transportable-udfs-plugin/src/main/java/com/linkedin/transport/plugin/TransportPlugin.java b/transportable-udfs-plugin/src/main/java/com/linkedin/transport/plugin/TransportPlugin.java
@@ -24,12 +24,15 @@
 import org.gradle.api.plugins.scala.ScalaPlugin;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.tasks.testing.Test;
+import org.gradle.jvm.toolchain.JavaToolchainService;
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
 import org.gradle.testing.jacoco.plugins.JacocoPlugin;
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension;
 
 import static com.linkedin.transport.plugin.ConfigurationType.*;
+import static com.linkedin.transport.plugin.Language.*;
 import static com.linkedin.transport.plugin.SourceSetUtils.*;
 
 
@@ -192,6 +195,18 @@ private TaskProvider<GenerateWrappersTask> configureGenerateWrappersTask(Project
           task.dependsOn(project.getTasks().named(inputSourceSet.getClassesTaskName()));
         });
 
+    // Configure Java compile tasks to run with platform specific jdk
+    // TODO: set platform specific jdks/toolchain for scala tasks when support is available
+    if (platform.getLanguage() == JAVA) {
+      project.getTasks()
+          .named(outputSourceSet.getCompileTaskName(platform.getLanguage().toString()), JavaCompile.class, task -> {
+            JavaToolchainService javaToolchains = project.getExtensions().getByType(JavaToolchainService.class);
+            task.getJavaCompiler().set(javaToolchains.compilerFor(toolChainSpec -> {
+              toolChainSpec.getLanguageVersion().set(platform.getJavaLanguageVersion());
+            }));
+          });
+    }
+
     project.getTasks()
         .named(outputSourceSet.getCompileTaskName(platform.getLanguage().toString()))
         .configure(task -> task.dependsOn(generateWrappersTask));
@@ -257,6 +272,12 @@ task prestoTest(type: Test, dependsOn: test) {
       task.setClasspath(testClasspath);
       task.useTestNG();
       task.mustRunAfter(project.getTasks().named("test"));
+
+      // configure test task to run with platform specific jdk
+      JavaToolchainService javaToolchains = project.getExtensions().getByType(JavaToolchainService.class);
+      task.getJavaLauncher().set(javaToolchains.launcherFor(toolChainSpec -> {
+        toolChainSpec.getLanguageVersion().set(platform.getJavaLanguageVersion());
+      }));
     });
   }
 

diff --git a/transportable-udfs-presto/build.gradle b/transportable-udfs-presto/build.gradle
@@ -1,26 +1,7 @@
 apply plugin: 'java'
 
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-  dependencies {
-    classpath group:'io.prestosql', name: 'presto-main', version: project.ext.'presto-version'
-  }
-}
-
-import com.google.common.base.StandardSystemProperty
-import io.prestosql.server.JavaVersion
-task verifyPrestoJvmRequirements(type:Exec) {
-  String javaVersion = StandardSystemProperty.JAVA_VERSION.value()
-  if (javaVersion == null) {
-    throw new GradleException("Java version not defined")
-  }
-  JavaVersion version = JavaVersion.parse(javaVersion)
-  if (!(version.getMajor() == 8 && version.getUpdate().isPresent() && version.getUpdate().getAsInt() >= 151)
-      || (version.getMajor() >= 9)) {
-    throw new GradleException(String.format("Presto requires Java 8u151+ (found %s)", version))
-  }
+java {
+  toolchain.languageVersion.set(JavaLanguageVersion.of(11))
 }
 
 dependencies {

diff --git a/transportable-udfs-test/transportable-udfs-test-presto/build.gradle b/transportable-udfs-test/transportable-udfs-test-presto/build.gradle
@@ -1,5 +1,9 @@
 apply plugin: 'java'
 
+java {
+  toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+}
+
 dependencies {
   compile project(":transportable-udfs-api")
   compile project(":transportable-udfs-test:transportable-udfs-test-api")