Update default GraalVM version to 19.0.2 (was 1.0.0-rc12) (#119)

palantir · Aug 2, 2019 · b5567e4 · b5567e4
1 parent 5394b07
commit b5567e4
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Configuration
 Configure this plugin and its wrappers around GraalVM tools through the `graal` extension with the following options:
 
 **General GraalVM controls**
-* `graalVersion`: the version string to use when downloading GraalVM (defaults to `1.0.0-rc12`)
+* `graalVersion`: the version string to use when downloading GraalVM (defaults to `19.0.2`)
 * `downloadBaseUrl`: the base download URL to use (defaults to `https://github.com/oracle/graal/releases/download/`)
 
 

diff --git a/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java b/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java
@@ -16,7 +16,9 @@
 
 package com.palantir.gradle.graal;
 
+import java.io.File;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.DirectoryProperty;
@@ -61,6 +63,33 @@ public final void extractGraal() {
             spec.args("-xzf", inputTgz.get().getAsFile().getAbsolutePath());
             spec.workingDir(cacheDir.get().resolve(graalVersion.get()));
         });
+        File nativeImageExecutable = getExecutable("native-image");
+        if (!nativeImageExecutable.isFile()) {
+            getProject().exec(spec -> {
+                File graalUpdateExecutable = getExecutable("gu");
+                if (!graalUpdateExecutable.isFile()) {
+                    throw new IllegalStateException("Failed to find Graal update binary: " + graalUpdateExecutable);
+                }
+                spec.executable(graalUpdateExecutable.getAbsolutePath());
+                spec.args("install", "native-image");
+            });
+        }
+    }
+
+    private File getExecutable(String binaryName) {
+        return cacheDir.get()
+                .resolve(Paths.get(graalVersion.get(), "graalvm-ce-" + graalVersion.get()))
+                .resolve(getArchitectureSpecifiedBinaryPath(binaryName))
+                .toFile();
+    }
+
+    private Path getArchitectureSpecifiedBinaryPath(String binaryName) {
+        switch (Platform.operatingSystem()) {
+            case MAC: return Paths.get("Contents", "Home", "bin", binaryName);
+            case LINUX: return Paths.get("bin", binaryName);
+            default:
+                throw new IllegalStateException("No GraalVM support for " + Platform.operatingSystem());
+        }
     }
 
     @InputFile

diff --git a/src/main/java/com/palantir/gradle/graal/GraalExtension.java b/src/main/java/com/palantir/gradle/graal/GraalExtension.java
@@ -27,7 +27,7 @@
 public class GraalExtension {
 
     private static final String DEFAULT_DOWNLOAD_BASE_URL = "https://github.com/oracle/graal/releases/download/";
-    private static final String DEFAULT_GRAAL_VERSION = "1.0.0-rc12";
+    private static final String DEFAULT_GRAAL_VERSION = "19.0.2";
 
     private final Property<String> downloadBaseUrl;
     private final Property<String> graalVersion;

diff --git a/src/test/groovy/com/palantir/gradle/graal/GradleGraalEndToEndSpec.groovy b/src/test/groovy/com/palantir/gradle/graal/GradleGraalEndToEndSpec.groovy
@@ -28,7 +28,63 @@ class GradleGraalEndToEndSpec extends IntegrationSpec {
         directory("src/main/java/com/palantir/test")
         file("src/main/java/com/palantir/test/Main.java") << '''
         package com.palantir.test;
-       
+
+        public final class Main {
+            public static final void main(String[] args) {
+                System.out.println("hello, world!");
+            }
+        }
+        '''
+
+        buildFile << '''
+        apply plugin: 'com.palantir.graal'
+
+        graal {
+            mainClass 'com.palantir.test.Main'
+            outputName 'hello-world'
+        }
+        '''
+
+        when:
+        ExecutionResult result = runTasksSuccessfully('nativeImage') // note, this accesses your real ~/.gradle cache
+        println "Gradle Standard Out:\n" + result.standardOutput
+        println "Gradle Standard Error:\n" + result.standardError
+        File output = new File(getProjectDir(), "build/graal/hello-world");
+
+        then:
+        output.exists()
+        output.getAbsolutePath().execute().text.equals("hello, world!\n")
+
+        when:
+        ExecutionResult result2 = runTasksSuccessfully('nativeImage')
+
+        then:
+        result2.wasUpToDate(':nativeImage')
+
+        when:
+        new File(getProjectDir(), "src/main/java/com/palantir/test/Main.java").text = '''
+        package com.palantir.test;
+
+        public final class Main {
+            public static final void main(String[] args) {
+                System.out.println("hello, world (modified)!");
+            }
+        }
+        '''
+        ExecutionResult result3 = runTasksSuccessfully('nativeImage')
+
+        then:
+        println result3.standardOutput
+        !result3.wasUpToDate(':nativeImage')
+        output.getAbsolutePath().execute().text.equals("hello, world (modified)!\n")
+    }
+
+    def 'test 1.0.0-rc5 nativeImage'() {
+        setup:
+        directory("src/main/java/com/palantir/test")
+        file("src/main/java/com/palantir/test/Main.java") << '''
+        package com.palantir.test;
+
         public final class Main {
             public static final void main(String[] args) {
                 System.out.println("hello, world!");
@@ -65,7 +121,7 @@ class GradleGraalEndToEndSpec extends IntegrationSpec {
         when:
         new File(getProjectDir(), "src/main/java/com/palantir/test/Main.java").text = '''
         package com.palantir.test;
-        
+
         public final class Main {
             public static final void main(String[] args) {
                 System.out.println("hello, world (modified)!");
@@ -85,10 +141,10 @@ class GradleGraalEndToEndSpec extends IntegrationSpec {
         directory("src/main/java/com/palantir/test")
         file("src/main/java/com/palantir/test/Main.java") << '''
         package com.palantir.test;
-       
+
         import java.io.IOException;
         import java.net.URL;
-        
+
         public final class Main {
           public static final void main(String[] args) throws IOException {
             String result = convertStreamToString(new URL("http://www.google.com/").openStream());
@@ -125,8 +181,29 @@ class GradleGraalEndToEndSpec extends IntegrationSpec {
         output.getAbsolutePath().execute().text.toLowerCase().contains("<html")
     }
 
+    def 'can build shared libraries on default version'() {
+        setup:
+        directory("src/main/java/com/palantir/test")
+        file("src/main/java/com/palantir/test/Main.java") << '''
+        package com.palantir.test;
+        public final class Main {}
+        '''
+        buildFile << '''
+        apply plugin: 'com.palantir.graal'
+        graal {
+            outputName 'hello-world'
+        }
+        '''
+
+        when:
+        runTasksSuccessfully('sharedLibrary')
+        File dylibFile = new File(getProjectDir(), "build/graal/hello-world." + getSharedLibPrefixByOs())
+
+        then:
+        dylibFile.exists()
+    }
 
-    def 'can build shared libraries'() {
+    def 'can build shared libraries on 1.0.0-rc5'() {
         setup:
         directory("src/main/java/com/palantir/test")
         file("src/main/java/com/palantir/test/Main.java") << '''