Skip to content

Commit

Permalink
Merge pull request #70 from boris-spas/sl_update_vm-1.0.0-rc14
Browse files Browse the repository at this point in the history
RC14 update.
  • Loading branch information
boris-spas authored Mar 20, 2019
2 parents 6649b6e + f50000b commit 43d8779
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jdk:
- openjdk11

env:
- GRAALVM_VERSION="1.0.0-rc13"
- GRAALVM_VERSION="1.0.0-rc14"
- GRAALVM_VERSION="NONE" SL_BUILD_NATIVE="false"

matrix:
exclude:
- env: GRAALVM_VERSION="1.0.0-rc13"
- env: GRAALVM_VERSION="1.0.0-rc14"
jdk: openjdk11
- jdk: openjdk9
os: linux
Expand Down
4 changes: 2 additions & 2 deletions component/make_component.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ MANIFEST="$COMPONENT_DIR/META-INF/MANIFEST.MF"
touch "$MANIFEST"
echo "Bundle-Name: Simple Language" >> "$MANIFEST"
echo "Bundle-Symbolic-Name: com.oracle.truffle.sl" >> "$MANIFEST"
echo "Bundle-Version: 1.0.0-rc13" >> "$MANIFEST"
echo 'Bundle-RequireCapability: org.graalvm; filter:="(&(graalvm_version=1.0.0-rc13)(os_arch=amd64))"' >> "$MANIFEST"
echo "Bundle-Version: 1.0.0-rc14" >> "$MANIFEST"
echo 'Bundle-RequireCapability: org.graalvm; filter:="(&(graalvm_version=1.0.0-rc14)(os_arch=amd64))"' >> "$MANIFEST"
echo "x-GraalVM-Polyglot-Part: True" >> "$MANIFEST"

cd $COMPONENT_DIR
Expand Down
2 changes: 1 addition & 1 deletion component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle</groupId>
<artifactId>simplelanguage-graalvm-component</artifactId>
<version>1.0.0-rc13-SNAPSHOT</version>
<version>1.0.0-rc14-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
Expand Down
2 changes: 1 addition & 1 deletion language/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.oracle</groupId>
<artifactId>simplelanguage-parent</artifactId>
<version>1.0.0-rc13-SNAPSHOT</version>
<version>1.0.0-rc14-SNAPSHOT</version>
</parent>
<artifactId>simplelanguage</artifactId>
<build>
Expand Down
2 changes: 1 addition & 1 deletion launcher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.oracle</groupId>
<artifactId>simplelanguage-parent</artifactId>
<version>1.0.0-rc13-SNAPSHOT</version>
<version>1.0.0-rc14-SNAPSHOT</version>
</parent>
<artifactId>launcher</artifactId>
<build>
Expand Down
2 changes: 1 addition & 1 deletion native/make_native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ if [[ $SL_BUILD_NATIVE == "false" ]]; then
exit 0
fi
"$JAVA_HOME"/bin/native-image --tool:truffle -H:MaxRuntimeCompileMethods=1200 \
-cp ../language/target/simplelanguage.jar:../launcher/target/launcher-1.0.0-rc13-SNAPSHOT.jar \
-cp ../language/target/simplelanguage.jar:../launcher/target/launcher-1.0.0-rc14-SNAPSHOT.jar \
com.oracle.truffle.sl.launcher.SLMain \
slnative
2 changes: 1 addition & 1 deletion native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle</groupId>
<artifactId>simplelanguage-graalvm-native</artifactId>
<version>1.0.0-rc13-SNAPSHOT</version>
<version>1.0.0-rc14-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle</groupId>
<artifactId>simplelanguage-parent</artifactId>
<version>1.0.0-rc13-SNAPSHOT</version>
<version>1.0.0-rc14-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
<graalvm.version>1.0.0-rc13</graalvm.version>
<graalvm.version>1.0.0-rc14</graalvm.version>
</properties>
<packaging>pom</packaging>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion sl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

VERSION="1.0.0-rc13"
VERSION="1.0.0-rc14"

MAIN_CLASS="com.oracle.truffle.sl.launcher.SLMain"
SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd -P)"
Expand Down

0 comments on commit 43d8779

Please sign in to comment.