Merge branch 'release/0.16.3'

reactiverse · Jan 5, 2022 · e3d8c83 · e3d8c83
2 parents e9e48d2 + 3a89ae3
commit e3d8c83
Show file tree

Hide file tree

Showing 98 changed files with 286 additions and 323 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
@@ -0,0 +1,40 @@
+name: GraalVM CI
+on:
+ push:
+ branches:
+ - develop
+ pull_request:
+ branches:
+ - develop
+jobs:
+ build:
+ name: ${{ matrix.version }} on ${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ version: [latest, dev, '21.3.0']
+ os: [macos-latest, windows-latest, ubuntu-latest]
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Cache JVM
+ id: cache-java
+ uses: actions/cache@v2
+ with:
+ path: |
+ ${{ runner.temp }}/java_package.tar.gz
+ ~/.m2/repository
+ key: ${{ runner.os }}-java-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-java-
+ - name: Setup GraalVM
+ uses: graalvm/setup-graalvm@v1
+ with:
+ version: ${{ matrix.version }}
+ java-version: '11'
+ - name: Run tests (UNIX)
+ run: ./mvnw clean verify
+ if: runner.os != 'Windows'
+ - name: Run tests (Windows)
+ run: .\mvnw.cmd clean verify
+ if: runner.os == 'Windows'
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -0,0 +1,40 @@
+name: Java CI
+on:
+ push:
+ branches:
+ - develop
+ pull_request:
+ branches:
+ - develop
+jobs:
+ build:
+ name: ${{ matrix.version }} on ${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ version: [8, 11, 17]
+ os: [macos-latest, windows-latest, ubuntu-latest]
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Cache JVM
+ id: cache-java
+ uses: actions/cache@v2
+ with:
+ path: |
+ ${{ runner.temp }}/java_package.tar.gz
+ ~/.m2/repository
+ key: ${{ runner.os }}-java-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-java-
+ - name: Setup Java
+ uses: actions/setup-java@v2
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.version }}
+ - name: Run tests (UNIX)
+ run: ./mvnw clean verify
+ if: runner.os != 'Windows'
+ - name: Run tests (Windows)
+ run: .\mvnw.cmd clean verify
+ if: runner.os == 'Windows'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.16.3] - 2022-01-05
+* Bump vert.x to 4.2.3
+* CI runs and passes on Windows, MacOS and Linux
+* Updated started docs
+* Fixed debugger properties
+
 ## [0.16.2] - 2021-12-14
 * Bump vert.x to 4.2.2
 * Pretty print polyglot exceptions so IDEs can track back

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -4,14 +4,14 @@
  <parent>
  <groupId>io.reactiverse</groupId>
  <artifactId>es4x-parent</artifactId>
- <version>0.16.2</version>
+ <version>0.16.3</version>
  <relativePath>..</relativePath>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>es4x-codegen</artifactId>
- <version>0.16.2</version>
+ <version>0.16.3</version>
 
  <properties>
  <tools.jar>${java.home}/../lib/tools.jar</tools.jar>

diff --git a/docs/es/get-started/debug.md b/docs/es/get-started/debug.md
@@ -5,15 +5,15 @@
 Cuandro trabajes con [GraalVM](https://graalvm.org) o un JDK con los bits graalvm (JVMCI), comienza tu aplicacion asi:
 
 ```sh
-npm start -- -Dinspect
+npm start -- -Dinspect=9229
 ```
 
 Esto comenzara el agente debugger del inspector de Chrome en el puerto 9229 que puedes conectar a una sesion remota
 de debug desde tu navegador.
 
 ```
 Chrome devtools listening at port: 9229
-Running: java ... 
+Running: java ...
 Debugger listening on port 9229.
 To start debugging, open the following URL in Chrome:
  chrome-devtools://devtools/bundled/js_app.html?ws=127.0.0.1:9229/436e852b-329b5c44c3e
@@ -61,5 +61,5 @@ Y conecta tu debugger.
 
 ![vscode-chrome-inspector](./res/vscode-debug.png)
 
-Si imprimes el mensaje `Server started on port 8000` sera capturado en visual studio y una ventana del navegador 
+Si imprimes el mensaje `Server started on port 8000` sera capturado en visual studio y una ventana del navegador
 abrira la URL adecuada.
diff --git a/docs/get-started/debug.md b/docs/get-started/debug.md
@@ -5,15 +5,15 @@
 When working on [GraalVM](https://graalvm.org) or a JDK with the graalvm (JVMCI) bits, start your application as:
 
 ```sh
-npm start -- -Dinspect
+npm start -- -Dinspect=9229
 ```
 
 This will start a Chrome inspector debugger agent on port 9229 that you can attach for a remote
 debug session from your Browser.
 
 ```
 Chrome devtools listening at port: 9229
-Running: java ... 
+Running: java ...
 Debugger listening on port 9229.
 To start debugging, open the following URL in Chrome:
  chrome-devtools://devtools/bundled/js_app.html?ws=127.0.0.1:9229/436e852b-329b5c44c3e

diff --git a/docs/get-started/hello-world.md b/docs/get-started/hello-world.md
@@ -163,8 +163,8 @@ graaljs native module loader.
 With graaljs `.mjs` support both `import` and `export` will work as per design of the ES6 spec.
 
 ::: tip
-To enable `.mjs` support either use the extension `.mjs` in your `JavaScript` files, or start your application with the
-flag `-Desm`.
+To enable `.mjs` support either use the extension `.mjs` in your `JavaScript` files, or add the property `type: 'module'`
+to your `package.json`.
 :::
 
 ::: warning

diff --git a/docs/gr/get-started/debug.md b/docs/gr/get-started/debug.md
@@ -5,14 +5,14 @@
 Όταν εργάζεστε σε [GraalVM](https://graalvm.org) ή σε JDK με κομμάτια graalvm (JVMCI), ξεκινήστε την εφαρμογή σας ως:
 
 ```sh
-npm start -- -Dinspect
+npm start -- -Dinspect=9229
 ```
 
 Αυτό θα ξεκινήσει έναν παράγοντα εντοπισμού σφαλμάτων Chrome inspection στο port 9229 που μπορείτε να επισυνάψετε για μια περίοδο λειτουργίας απομακρυσμένου εντοπισμού σφαλμάτων από το πρόγραμμα περιήγησής σας.
 
 ```
 Chrome devtools listening at port: 9229
-Running: java ... 
+Running: java ...
 Debugger listening on port 9229.
 To start debugging, open the following URL in Chrome:
  chrome-devtools://devtools/bundled/js_app.html?ws=127.0.0.1:9229/436e852b-329b5c44c3e

diff --git a/docs/pl/get-started/debug.md b/docs/pl/get-started/debug.md
@@ -5,7 +5,7 @@
 Podczas pracy z [GraalVM](https://graalvm.org) lub JDK z graalvm (JVMCI) uruchom swoją aplikację jako:
 
 ```sh
-npm start -- -Dinspect
+npm start -- -Dinspect=9229
 ```
 
 Rozpocznie to pracę debugera Chrome Inspector na porcie 9229, który możesz dołączyć do sesji debugowania z poziomu

diff --git a/docs/ru/get-started/debug.md b/docs/ru/get-started/debug.md
@@ -5,7 +5,7 @@
 Работая с [GraalVM](https://graalvm.org) или JDK с graalvm (JVMCI), запустите ваше приложение следующим образом:
 
 ```sh
-npm start -- -Dinspect
+npm start -- -Dinspect=9229
 ```
 
 Это запустит агента отладки для инструмента исследования Chrome на порту 9229, который может быть использован для сессии

diff --git a/docs/zh/get-started/debug.md b/docs/zh/get-started/debug.md
@@ -5,7 +5,7 @@
 在[GraalVM](https://graalvm.org)或者 a JDK with the graalvm (JVMCI) bits 上工作时，可以通过下面的命令启动您的应用：
 
 ```sh
-npm start -- -Dinspect
+npm start -- -Dinspect=9229
 ```
 
 这将在端口9229上启动一个Chrome inspector调试器代理，您可以通过浏览器来附加到这个远程调试会话。

diff --git a/es4x/pom.xml b/es4x/pom.xml
@@ -4,14 +4,14 @@
  <parent>
  <groupId>io.reactiverse</groupId>
  <artifactId>es4x-parent</artifactId>
- <version>0.16.2</version>
+ <version>0.16.3</version>
  <relativePath>..</relativePath>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>es4x</artifactId>
- <version>0.16.2</version>
+ <version>0.16.3</version>
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/es4x/src/main/java/io/reactiverse/es4x/ES4X.java b/es4x/src/main/java/io/reactiverse/es4x/ES4X.java
@@ -25,13 +25,14 @@ public final class ES4X extends Launcher {
 
  @Override
  public void beforeStartingVertx(VertxOptions options) {
- processProperty("inspect", "9229", inspect -> {
- System.setProperty("polyglot.inspect", inspect);
+ processProperty("inspect", inspect -> {
+ System.setProperty("polyglot.inspect", inspect.toString());
+ System.setProperty("polyglot.inspect.Suspend", "false");
  options.setBlockedThreadCheckInterval(1000000);
  });
 
- processProperty("inspect-brk", "9229", inspect -> {
- System.setProperty("polyglot.inspect", inspect);
+ processProperty("inspect-brk", inspect -> {
+ System.setProperty("polyglot.inspect", inspect.toString());
  System.setProperty("polyglot.inspect.Suspend", "true");
  options.setBlockedThreadCheckInterval(1000000);
  });
@@ -93,13 +94,11 @@ public static void main(String... args) {
  }
  }
 
- private static void processProperty(String name, String defaultEmpty, Consumer<String> consumer) {
- String value = System.getProperty(name);
+ private static void processProperty(String name, Consumer<Integer> consumer) {
 
- if (value != null) {
+ if (System.getProperties().containsKey(name)) {
  try {
- consumer.accept("".equals(value) ? defaultEmpty : value);
- System.clearProperty(name);
+ consumer.accept(Integer.getInteger(name));
  } catch (RuntimeException e) {
  System.exit(1);
  }

diff --git a/es4x/src/main/java/io/reactiverse/es4x/impl/Utils.java b/es4x/src/main/java/io/reactiverse/es4x/impl/Utils.java
@@ -101,7 +101,7 @@ public static URI fileToURI(File file) {
  }
  }
 
- private static String slashify(String path, boolean isDirectory) {
+ public static String slashify(String path, boolean isDirectory) {
  String p = path;
  if (File.separatorChar != '/')
  p = p.replace(File.separatorChar, '/');