Merge pull request #102 from reactiverse/feature/61

Feature/61

CHANGELOG.md

@@ -6,6 +6,12 @@ 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).
 
 ## [Unreleased] -
+- Ugrade to Vert.x 3.7.1
+- Avoid calling graaljs APIs from the EventBus codec
+- Global log formatter used across graal and vert.x
+- Fixed EventBus codec for Graal objects
+- Removed Nashorn
+- Update to Graal 19.0.0
 - Verticle events are now triggered from the `process.on` event emitter.
 - Updated to Graal rc16
 - Removed `es4x-cli` as it has been replaced with `es4x-pm`

codegen/src/main/java/io/reactiverse/es4x/codegen/generator/IndexDTS.java

@@ -111,9 +111,9 @@ public String render(ClassModel model, int index, int size, Map<String, Object>
     final Set<String> superTypes = new HashSet<>();
     model.getAbstractSuperTypes().forEach(ti -> superTypes.add(genType(ti)));
 
-    if (model.getHandlerType() != null) {
+    if (model.isHandler()) {
       if (model.isConcrete()) {
-        superTypes.add("Handler<" + genType(model.getHandlerType()) + ">");
+        superTypes.add("Handler<" + genType(model.getHandlerArg()) + ">");
       }
     }
 
@@ -127,8 +127,8 @@ public String render(ClassModel model, int index, int size, Map<String, Object>
         writer.printf(" implements %s", String.join(", ", superTypes));
       }
     } else {
-      if (model.getHandlerType() != null) {
-        writer.printf(" extends Handler<%s>", genType(model.getHandlerType()));
+      if (model.isHandler()) {
+        writer.printf(" extends Handler<%s>", genType(model.getHandlerArg()));
         if (!superTypes.isEmpty()) {
           writer.printf(", %s", String.join(", ", superTypes));
         }

es4x/pom.xml

@@ -28,65 +28,12 @@
   </licenses>
 
   <profiles>
-    <profile>
-      <id>java9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>3.0.0</version>
-            <executions>
-              <execution>
-                <id>add-sources</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>src/main/java-9</source>
-                  </sources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-test-sources</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                  <goal>add-test-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>src/test/java-9</source>
-                  </sources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-resources</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>add-resource</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>src/main/resources-9</directory>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>graaljs</id>
       <activation>
-        <jdk>[1.11,)</jdk>
+        <file>
+          <missing>${java.home}/../GRAALVM-README.md</missing>
+        </file>
       </activation>
       <dependencies>
         <!-- GraalVM runtime -->
@@ -129,7 +76,6 @@
       <artifactId>graal-sdk</artifactId>
       <version>${graalvm.version}</version>
       <scope>provided</scope>
-      <optional>true</optional>
     </dependency>
     <!-- testing -->
     <dependency>