Merge pull request #91 from boris-spas/sl_update_vm-19.3.1

update 19.3.1
graalvm · Jan 20, 2020 · 9244b52 · 9244b52
2 parents 15521b9 + 2269508
commit 9244b52
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,16 +9,16 @@ jdk:
     - openjdk11
 
 env:
-    - GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="8"
-    - GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="11"
+    - GRAALVM_VERSION="19.3.1" GRAALVM_JAVA_VERSION="8"
+    - GRAALVM_VERSION="19.3.1" GRAALVM_JAVA_VERSION="11"
     - GRAALVM_VERSION="NONE" SL_BUILD_NATIVE="false"
 
 matrix:
     exclude:
-        - env: GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="8"
+        - env: GRAALVM_VERSION="19.3.1" GRAALVM_JAVA_VERSION="8"
           jdk: openjdk11
           os: linux
-        - env: GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="11"
+        - env: GRAALVM_VERSION="19.3.1" GRAALVM_JAVA_VERSION="11"
           jdk: openjdk11
           os: linux
           # Travis does not provide an adequate jdk8 on mac (mac versioning issue)

diff --git a/component/make_component.sh b/component/make_component.sh
@@ -35,8 +35,8 @@ mkdir -p "$COMPONENT_DIR/META-INF"
 {
     echo "Bundle-Name: Simple Language";
     echo "Bundle-Symbolic-Name: com.oracle.truffle.sl";
-    echo "Bundle-Version: 19.3.0";
-    echo 'Bundle-RequireCapability: org.graalvm; filter:="(&(graalvm_version=19.3.0)(os_arch=amd64))"';
+    echo "Bundle-Version: 19.3.1";
+    echo 'Bundle-RequireCapability: org.graalvm; filter:="(&(graalvm_version=19.3.1)(os_arch=amd64))"';
     echo "x-GraalVM-Polyglot-Part: True"
 } > "$COMPONENT_DIR/META-INF/MANIFEST.MF"
 

diff --git a/component/pom.xml b/component/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.oracle</groupId>
     <artifactId>simplelanguage-graalvm-component</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.1-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>

diff --git a/language/pom.xml b/language/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.oracle</groupId>
         <artifactId>simplelanguage-parent</artifactId>
-        <version>19.3.0-SNAPSHOT</version>
+        <version>19.3.1-SNAPSHOT</version>
     </parent>
     <artifactId>simplelanguage</artifactId>
     <profiles>

diff --git a/launcher/pom.xml b/launcher/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.oracle</groupId>
     <artifactId>simplelanguage-parent</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.1-SNAPSHOT</version>
   </parent>
   <artifactId>launcher</artifactId>
   <build>

diff --git a/native/pom.xml b/native/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.oracle</groupId>
   <artifactId>simplelanguage-graalvm-native</artifactId>
-  <version>19.3.0-SNAPSHOT</version>
+  <version>19.3.1-SNAPSHOT</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <m2e.apt.activation>jdt_apt</m2e.apt.activation>

diff --git a/pom.xml b/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.oracle</groupId>
   <artifactId>simplelanguage-parent</artifactId>
-  <version>19.3.0-SNAPSHOT</version>
+  <version>19.3.1-SNAPSHOT</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-    <graalvm.version>19.3.0</graalvm.version>
+    <graalvm.version>19.3.1</graalvm.version>
   </properties>
   <packaging>pom</packaging>
   <modules>

diff --git a/sl b/sl
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="19.3.0"
+VERSION="19.3.1"
 
 MAIN_CLASS="com.oracle.truffle.sl.launcher.SLMain"
 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd -P)"

diff --git a/tck/main/java/com/oracle/truffle/sl/tck/SLTCKLanguageProvider.java b/tck/main/java/com/oracle/truffle/sl/tck/SLTCKLanguageProvider.java
@@ -277,8 +277,9 @@ private static Snippet loadScript(
     private static Source createSource(final String resourceName) throws IOException {
         int slashIndex = resourceName.lastIndexOf('/');
         String scriptName = slashIndex >= 0 ? resourceName.substring(slashIndex + 1) : resourceName;
-        final Reader in = new InputStreamReader(SLTCKLanguageProvider.class.getResourceAsStream(resourceName), "UTF-8");
-        return Source.newBuilder(ID, in, scriptName).build();
+        try (Reader in = new InputStreamReader(SLTCKLanguageProvider.class.getResourceAsStream(resourceName), "UTF-8")) {
+            return Source.newBuilder(ID, in, scriptName).build();
+        }
     }
 
     private static Value eval(final Context context, final String fncDecl, final String functionName) {