🤗 Javet v3.1.6 (#388)

* Upgraded Node.js to `v20.17.0` ([2024-08-21](https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.17.0)) * Rewrote `getV8HeapStatistics()`, `getV8HeapSpaceStatistics()` for `V8Runtime` again to fix possible JVM crash
caoccao · Sep 1, 2024 · b243532 · b243532
1 parent b4df511
commit b243532
Show file tree

Hide file tree

Showing 46 changed files with 257 additions and 167 deletions.
diff --git a/.github/workflows/android_node_build.yml b/.github/workflows/android_node_build.yml
@@ -8,8 +8,8 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 20.16.0
-  JAVET_VERSION: 3.1.5
+  JAVET_NODE_VERSION: 20.17.0
+  JAVET_VERSION: 3.1.6
   ROOT: /home/runner/work/Javet
 
 jobs:

diff --git a/.github/workflows/android_v8_build.yml b/.github/workflows/android_v8_build.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.5
+  JAVET_VERSION: 3.1.6
   ROOT: /home/runner/work/Javet
 
 jobs:

diff --git a/.github/workflows/linux_build_artifact.yml b/.github/workflows/linux_build_artifact.yml
@@ -17,9 +17,9 @@ on:
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
-  JAVET_NODE_VERSION: 20.16.0
+  JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.5
+  JAVET_VERSION: 3.1.6
 
 jobs:
   javet_linux_x86_64:

diff --git a/.github/workflows/linux_build_node_v8_image.yml b/.github/workflows/linux_build_node_v8_image.yml
@@ -21,9 +21,9 @@ on:
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
-  JAVET_NODE_VERSION: 20.16.0
+  JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.5
+  JAVET_VERSION: 3.1.6
 
 # if we skip a job using a job level `if` condition, then any dependent jobs also don't run.
 # we can skip a step of the job, using a step level `if` condition.

diff --git a/.github/workflows/linux_x86_64_build.yml b/.github/workflows/linux_x86_64_build.yml
@@ -7,9 +7,9 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 20.16.0
+  JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.5
+  JAVET_VERSION: 3.1.6
   ROOT: /home/runner/work/Javet
 
 jobs:

diff --git a/.github/workflows/macos_arm64_build.yml b/.github/workflows/macos_arm64_build.yml
@@ -7,9 +7,9 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 20.16.0
+  JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.5
+  JAVET_VERSION: 3.1.6
   ROOT: /Users/runner/work/Javet
 
 jobs:

diff --git a/.github/workflows/macos_x86_64_build.yml b/.github/workflows/macos_x86_64_build.yml
@@ -7,9 +7,9 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 20.16.0
+  JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.5
+  JAVET_VERSION: 3.1.6
   ROOT: /Users/runner/work/Javet
 
 jobs:

diff --git a/README.rst b/README.rst
@@ -47,7 +47,7 @@ arm         ✔️        ❌      ❌       ❌
 arm64       ✔️        ✔️       ✔️        ❌
 =========== ======= ======= ======= =======
 
-* Node.js ``v20.16.0`` + V8 ``v12.8.374.17``
+* Node.js ``v20.17.0`` + V8 ``v12.8.374.17``
 * Dynamic switch between Node.js and V8 mode (`Which mode do you prefer? <https://github.com/caoccao/Javet/discussions/92>`_)
 * Polyfill V8 mode with `Javenode <https://github.com/caoccao/Javenode>`_
 * V8 API exposure in JVM
@@ -75,44 +75,44 @@ Maven
     <dependency>
         <groupId>com.caoccao.javet</groupId>
         <artifactId>javet</artifactId>
-        <version>3.1.5</version>
+        <version>3.1.6</version>
     </dependency>
 
     <!-- Linux (arm64) -->
     <dependency>
         <groupId>com.caoccao.javet</groupId>
         <artifactId>javet-linux-arm64</artifactId>
-        <version>3.1.5</version>
+        <version>3.1.6</version>
     </dependency>
 
     <!-- Mac OS (x86_64 and arm64) -->
     <dependency>
         <groupId>com.caoccao.javet</groupId>
         <artifactId>javet-macos</artifactId>
-        <version>3.1.5</version>
+        <version>3.1.6</version>
     </dependency>
 
 Gradle Kotlin DSL
 ^^^^^^^^^^^^^^^^^
 
 .. code-block:: kotlin
 
-    implementation("com.caoccao.javet:javet:3.1.5") // Linux and Windows (x86_64)
-    implementation("com.caoccao.javet:javet-linux-arm64:3.1.5") // Linux (arm64)
-    implementation("com.caoccao.javet:javet-macos:3.1.5") // Mac OS (x86_64 and arm64)
-    implementation("com.caoccao.javet:javet-android-node:3.1.5") // Android Node (arm, arm64, x86 and x86_64)
-    implementation("com.caoccao.javet:javet-android-v8:3.1.5") // Android V8 (arm, arm64, x86 and x86_64)
+    implementation("com.caoccao.javet:javet:3.1.6") // Linux and Windows (x86_64)
+    implementation("com.caoccao.javet:javet-linux-arm64:3.1.6") // Linux (arm64)
+    implementation("com.caoccao.javet:javet-macos:3.1.6") // Mac OS (x86_64 and arm64)
+    implementation("com.caoccao.javet:javet-android-node:3.1.6") // Android Node (arm, arm64, x86 and x86_64)
+    implementation("com.caoccao.javet:javet-android-v8:3.1.6") // Android V8 (arm, arm64, x86 and x86_64)
 
 Gradle Groovy DSL
 ^^^^^^^^^^^^^^^^^
 
 .. code-block:: groovy
 
-    implementation 'com.caoccao.javet:javet:3.1.5' // Linux and Windows (x86_64)
-    implementation 'com.caoccao.javet:javet-linux-arm64:3.1.5' // Linux (arm64)
-    implementation 'com.caoccao.javet:javet-macos:3.1.5' // Mac OS (x86_64 and arm64)
-    implementation 'com.caoccao.javet:javet-android-node:3.1.5' // Android Node (arm, arm64, x86 and x86_64)
-    implementation 'com.caoccao.javet:javet-android-v8:3.1.5' // Android V8 (arm, arm64, x86 and x86_64)
+    implementation 'com.caoccao.javet:javet:3.1.6' // Linux and Windows (x86_64)
+    implementation 'com.caoccao.javet:javet-linux-arm64:3.1.6' // Linux (arm64)
+    implementation 'com.caoccao.javet:javet-macos:3.1.6' // Mac OS (x86_64 and arm64)
+    implementation 'com.caoccao.javet:javet-android-node:3.1.6' // Android Node (arm, arm64, x86 and x86_64)
+    implementation 'com.caoccao.javet:javet-android-v8:3.1.6' // Android V8 (arm, arm64, x86 and x86_64)
 
 Hello Javet
 -----------

diff --git a/android/javet-android/build.gradle.kts b/android/javet-android/build.gradle.kts
@@ -73,7 +73,7 @@ object Config {
         const val ANDROIDX_TEST = "1.1.5"
         const val APPCOMPAT = "1.3.1"
         const val DESUGAR_JDK_LIBS = "2.0.4"
-        const val JAVET = "3.1.5"
+        const val JAVET = "3.1.6"
         const val JUNIT = "5.10.1"
     }
 }

diff --git a/android/javet-android/src/main/AndroidManifest.xml b/android/javet-android/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="1"
-    android:versionName="3.1.5"
+    android:versionName="3.1.6"
     >
 
 </manifest>
diff --git a/android/pom.xml b/android/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.caoccao.javet</groupId>
     <artifactId>javet-android</artifactId>
-    <version>3.1.5</version>
+    <version>3.1.6</version>
     <name>javet</name>
     <packaging>aar</packaging>
     <description>Javet is Java + V8 (JAVa + V + EighT). It is an awesome way of embedding V8 in Java.</description>
@@ -29,7 +29,7 @@
         <connection>scm:git:git://github.com/caoccao/Javet.git</connection>
         <developerConnection>scm:git:git@github.com:caoccao/caoccao.git</developerConnection>
         <url>https://github.com/caoccao/Javet</url>
-        <tag>3.1.5</tag>
+        <tag>3.1.6</tag>
     </scm>
 
     <properties>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -72,7 +72,7 @@ object Config {
         const val BYTE_BUDDY = "1.14.10"
         const val JACKSON_DATABIND = "2.16.0"
         const val JAVA_VERSION = "1.8"
-        const val JAVET = "3.1.5"
+        const val JAVET = "3.1.6"
         const val JETTY_WEBSOCKET = "9.4.53.v20231009"
         const val JUNIT = "5.10.1"
     }

diff --git a/cpp/build-android.sh b/cpp/build-android.sh
@@ -2,7 +2,7 @@
 
 # Usage for V8: sh build-android.sh -DV8_DIR=${HOME}/v8 -DCMAKE_ANDROID_NDK=${HOME}/android -DCMAKE_ANDROID_ARCH=arm64
 # Usage for Node: sh build-android.sh -DNODE_DIR=${HOME}/node -DCMAKE_ANDROID_NDK=${HOME}/android -DCMAKE_ANDROID_ARCH=arm64
-JAVET_VERSION=3.1.5
+JAVET_VERSION=3.1.6
 rm -rf build_android
 mkdir build_android
 cd build_android

diff --git a/cpp/build-linux-arm64.sh b/cpp/build-linux-arm64.sh
@@ -2,7 +2,7 @@
 
 # Usage for V8: sh build-linux-arm64.sh -DV8_DIR=${HOME}/v8
 # Usage for Node: sh build-linux-arm64.sh -DNODE_DIR=${HOME}/node
-JAVET_VERSION=3.1.5
+JAVET_VERSION=3.1.6
 rm -rf build_linux_arm64
 mkdir build_linux_arm64
 cd build_linux_arm64

diff --git a/cpp/build-linux-x86_64.sh b/cpp/build-linux-x86_64.sh
@@ -2,7 +2,7 @@
 
 # Usage for V8: sh build-linux-x86_64.sh -DV8_DIR=${HOME}/v8
 # Usage for Node: sh build-linux-x86_64.sh -DNODE_DIR=${HOME}/node
-JAVET_VERSION=3.1.5
+JAVET_VERSION=3.1.6
 rm -rf build_linux_x86_64
 mkdir build_linux_x86_64
 cd build_linux_x86_64

diff --git a/cpp/build-macos.sh b/cpp/build-macos.sh
@@ -2,7 +2,7 @@
 
 # Usage for V8: sh build-macos.sh -DV8_DIR=${HOME}/v8
 # Usage for Node: sh build-macos.sh -DNODE_DIR=${HOME}/node
-JAVET_VERSION=3.1.5
+JAVET_VERSION=3.1.6
 rm -rf build_macos
 mkdir build_macos
 cd build_macos

diff --git a/cpp/build-windows.cmd b/cpp/build-windows.cmd
@@ -1,7 +1,7 @@
 @echo off
 REM Usage for V8: build -DV8_DIR=C:\v8 
 REM Usage for Node: build -DNODE_DIR=C:\node 
-SET JAVET_VERSION=3.1.5
+SET JAVET_VERSION=3.1.6
 rd /s/q build_windows
 mkdir build_windows
 cd build_windows

diff --git a/cpp/jni/javet_enums.h b/cpp/jni/javet_enums.h
@@ -28,8 +28,8 @@ namespace Javet {
 
         namespace RawPointerType {
             enum RawPointerType {
-                HeapStatisticsContainer = 1,
-                HeapSpaceStatisticsContainer = 2,
+                HeapStatisticsContext = 1,
+                HeapSpaceStatisticsContext = 2,
                 Invalid = 0,
             };
         }

diff --git a/cpp/jni/javet_jni_core_v8.cpp b/cpp/jni/javet_jni_core_v8.cpp
@@ -300,11 +300,11 @@ JNIEXPORT void JNICALL Java_com_caoccao_javet_interop_V8Native_removeRawPointer
 (JNIEnv* jniEnv, jobject caller, jlong handle, jint rawPointerTypeId) {
     using namespace Javet::Enums::RawPointerType;
     switch (rawPointerTypeId) {
-    case HeapStatisticsContainer:
-        Javet::Monitor::RemoveHeapStatisticsContainer(handle);
+    case HeapStatisticsContext:
+        Javet::Monitor::RemoveHeapStatisticsContext(handle);
         break;
-    case HeapSpaceStatisticsContainer:
-        Javet::Monitor::RemoveHeapSpaceStatisticsContainer(handle);
+    case HeapSpaceStatisticsContext:
+        Javet::Monitor::RemoveHeapSpaceStatisticsContext(handle);
         break;
     default:
         break;