🏫 Javet v3.1.7 (#390)

* Fixed race condition in `V8Guard`
caoccao · Sep 8, 2024 · 08f430e · 08f430e
1 parent b243532
commit 08f430e
Show file tree

Hide file tree

Showing 40 changed files with 98 additions and 84 deletions.
diff --git a/.github/workflows/android_node_build.yml b/.github/workflows/android_node_build.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   JAVET_NODE_VERSION: 20.17.0
-  JAVET_VERSION: 3.1.6
+  JAVET_VERSION: 3.1.7
   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.6
+  JAVET_VERSION: 3.1.7
   ROOT: /home/runner/work/Javet
 
 jobs:

diff --git a/.github/workflows/linux_build_artifact.yml b/.github/workflows/linux_build_artifact.yml
@@ -19,7 +19,7 @@ env:
   DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
   JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.6
+  JAVET_VERSION: 3.1.7
 
 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
@@ -23,7 +23,7 @@ env:
   DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
   JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.6
+  JAVET_VERSION: 3.1.7
 
 # 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
@@ -9,7 +9,7 @@ on:
 env:
   JAVET_NODE_VERSION: 20.17.0
   JAVET_V8_VERSION: 12.8.374.17
-  JAVET_VERSION: 3.1.6
+  JAVET_VERSION: 3.1.7
   ROOT: /home/runner/work/Javet
 
 jobs:

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

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

diff --git a/README.rst b/README.rst
@@ -75,44 +75,44 @@ Maven
     <dependency>
         <groupId>com.caoccao.javet</groupId>
         <artifactId>javet</artifactId>
-        <version>3.1.6</version>
+        <version>3.1.7</version>
     </dependency>
 
     <!-- Linux (arm64) -->
     <dependency>
         <groupId>com.caoccao.javet</groupId>
         <artifactId>javet-linux-arm64</artifactId>
-        <version>3.1.6</version>
+        <version>3.1.7</version>
     </dependency>
 
     <!-- Mac OS (x86_64 and arm64) -->
     <dependency>
         <groupId>com.caoccao.javet</groupId>
         <artifactId>javet-macos</artifactId>
-        <version>3.1.6</version>
+        <version>3.1.7</version>
     </dependency>
 
 Gradle Kotlin DSL
 ^^^^^^^^^^^^^^^^^
 
 .. code-block:: kotlin
 
-    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)
+    implementation("com.caoccao.javet:javet:3.1.7") // Linux and Windows (x86_64)
+    implementation("com.caoccao.javet:javet-linux-arm64:3.1.7") // Linux (arm64)
+    implementation("com.caoccao.javet:javet-macos:3.1.7") // Mac OS (x86_64 and arm64)
+    implementation("com.caoccao.javet:javet-android-node:3.1.7") // Android Node (arm, arm64, x86 and x86_64)
+    implementation("com.caoccao.javet:javet-android-v8:3.1.7") // Android V8 (arm, arm64, x86 and x86_64)
 
 Gradle Groovy DSL
 ^^^^^^^^^^^^^^^^^
 
 .. code-block:: groovy
 
-    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)
+    implementation 'com.caoccao.javet:javet:3.1.7' // Linux and Windows (x86_64)
+    implementation 'com.caoccao.javet:javet-linux-arm64:3.1.7' // Linux (arm64)
+    implementation 'com.caoccao.javet:javet-macos:3.1.7' // Mac OS (x86_64 and arm64)
+    implementation 'com.caoccao.javet:javet-android-node:3.1.7' // Android Node (arm, arm64, x86 and x86_64)
+    implementation 'com.caoccao.javet:javet-android-v8:3.1.7' // 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.6"
+        const val JAVET = "3.1.7"
         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.6"
+    android:versionName="3.1.7"
     >
 
 </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.6</version>
+    <version>3.1.7</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.6</tag>
+        <tag>3.1.7</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.6"
+        const val JAVET = "3.1.7"
         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.6
+JAVET_VERSION=3.1.7
 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.6
+JAVET_VERSION=3.1.7
 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.6
+JAVET_VERSION=3.1.7
 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.6
+JAVET_VERSION=3.1.7
 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.6
+SET JAVET_VERSION=3.1.7
 rd /s/q build_windows
 mkdir build_windows
 cd build_windows

diff --git a/cpp/jni/javet_resource_node.rc b/cpp/jni/javet_resource_node.rc
@@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,6,0
- PRODUCTVERSION 3,1,6,0
+ FILEVERSION 3,1,7,0
+ PRODUCTVERSION 3,1,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "caoccao.com"
             VALUE "FileDescription", "caoccao.com"
-            VALUE "FileVersion", "3.1.6.0"
-            VALUE "InternalName", "libjavet-node-windows-x86_64.v.3.1.6.dll"
+            VALUE "FileVersion", "3.1.7.0"
+            VALUE "InternalName", "libjavet-node-windows-x86_64.v.3.1.7.dll"
             VALUE "LegalCopyright", "Copyright (c) 2021-2024."
-            VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.3.1.6.dll"
+            VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.3.1.7.dll"
             VALUE "ProductName", "Javet Windows"
-            VALUE "ProductVersion", "3.1.6.0"
+            VALUE "ProductVersion", "3.1.7.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/cpp/jni/javet_resource_v8.rc b/cpp/jni/javet_resource_v8.rc
@@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,6,0
- PRODUCTVERSION 3,1,6,0
+ FILEVERSION 3,1,7,0
+ PRODUCTVERSION 3,1,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "caoccao.com"
             VALUE "FileDescription", "caoccao.com"
-            VALUE "FileVersion", "3.1.6.0"
-            VALUE "InternalName", "libjavet-v8-windows-x86_64.v.3.1.6.dll"
+            VALUE "FileVersion", "3.1.7.0"
+            VALUE "InternalName", "libjavet-v8-windows-x86_64.v.3.1.7.dll"
             VALUE "LegalCopyright", "Copyright (c) 2021-2024."
-            VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.3.1.6.dll"
+            VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.3.1.7.dll"
             VALUE "ProductName", "Javet Windows"
-            VALUE "ProductVersion", "3.1.6.0"
+            VALUE "ProductVersion", "3.1.7.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/docker/android/base.Dockerfile b/docker/android/base.Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Usage: docker build -t sjtucaocao/javet-android:3.1.6 -f docker/android/base.Dockerfile .
+# Usage: docker build -t sjtucaocao/javet-android:3.1.7 -f docker/android/base.Dockerfile .
 
 ARG JAVET_V8_VERSION=12.8.374.17
 

diff --git a/docker/android/build.Dockerfile b/docker/android/build.Dockerfile
@@ -15,7 +15,7 @@
 
 # Usage: docker build -t javet-android:local -f docker/android/build.Dockerfile .
 
-FROM sjtucaocao/javet-android:3.1.6
+FROM sjtucaocao/javet-android:3.1.7
 WORKDIR /
 
 # Copy Javet

diff --git a/docker/linux-arm64/base_all_in_one.Dockerfile b/docker/linux-arm64/base_all_in_one.Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Usage: docker build -t sjtucaocao/javet-arm64:3.1.6 -f docker/linux-arm64/base_all_in_one.Dockerfile .
+# Usage: docker build -t sjtucaocao/javet-arm64:3.1.7 -f docker/linux-arm64/base_all_in_one.Dockerfile .
 
 ARG JAVET_NODE_VERSION=18.15.0
 ARG JAVET_V8_VERSION=12.8.374.17

diff --git a/docker/linux-arm64/base_gradle.Dockerfile b/docker/linux-arm64/base_gradle.Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Usage: docker build \
-#  -t sjtucaocao/javet:arm64-3.1.6 \
+#  -t sjtucaocao/javet:arm64-3.1.7 \
 #  --build-arg JAVET_REPO=sjtucaocao/javet \
 #  -f docker/linux-arm64/base_gradle.Dockerfile .
 

diff --git a/docker/linux-arm64/build_artifact.Dockerfile b/docker/linux-arm64/build_artifact.Dockerfile
@@ -18,13 +18,13 @@
 #  --build-arg JAVET_REPO=sjtucaocao/javet \
 #  --build-arg JAVET_NODE_VERSION=18.12.1 \
 #  --build-arg JAVET_V8_VERSION=10.8.168.20 \
-#  --build-arg JAVET_VERSION=3.1.6 \
+#  --build-arg JAVET_VERSION=3.1.7 \
 #  -f docker/linux-arm64/build_artifact.Dockerfile .
 
 ARG JAVET_REPO=sjtucaocao/javet
 ARG JAVET_NODE_VERSION=18.12.1
 ARG JAVET_V8_VERSION=10.8.168.20
-ARG JAVET_VERSION=3.1.6
+ARG JAVET_VERSION=3.1.7
 
 FROM ${JAVET_REPO}:arm64-base-node_${JAVET_NODE_VERSION} as base-node
 

diff --git a/docker/linux-x86_64/base_all_in_one.Dockerfile b/docker/linux-x86_64/base_all_in_one.Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Usage: docker build -t sjtucaocao/javet:3.1.6 -f docker/linux-x86_64/base_all_in_one.Dockerfile .
+# Usage: docker build -t sjtucaocao/javet:3.1.7 -f docker/linux-x86_64/base_all_in_one.Dockerfile .
 
 FROM ubuntu:20.04
 WORKDIR /

diff --git a/docker/linux-x86_64/base_gradle.Dockerfile b/docker/linux-x86_64/base_gradle.Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Usage: docker build \
-#  -t sjtucaocao/javet:x86_64-3.1.6 \
+#  -t sjtucaocao/javet:x86_64-3.1.7 \
 #  --build-arg JAVET_REPO=sjtucaocao/javet \
 #  -f docker/linux-x86_64/base_gradle.Dockerfile .
 

diff --git a/docker/linux-x86_64/build.env b/docker/linux-x86_64/build.env
@@ -1,4 +1,4 @@
 JAVET_REPO=sjtucaocao/javet
-JAVET_VERSION=3.1.6
+JAVET_VERSION=3.1.7
 JAVET_V8_VERSION=12.8.374.17
 JAVET_NODE_VERSION=20.17.0
diff --git a/docker/linux-x86_64/build_all_in_one.Dockerfile b/docker/linux-x86_64/build_all_in_one.Dockerfile
@@ -15,7 +15,7 @@
 
 # Usage: docker build -t javet:local -f docker/linux-x86_64/build_all_in_one.Dockerfile .
 
-FROM sjtucaocao/javet:3.1.6
+FROM sjtucaocao/javet:3.1.7
 WORKDIR /
 
 # Copy Javet

diff --git a/docker/linux-x86_64/build_artifact.Dockerfile b/docker/linux-x86_64/build_artifact.Dockerfile
@@ -18,13 +18,13 @@
 #  --build-arg JAVET_REPO=sjtucaocao/javet \
 #  --build-arg JAVET_NODE_VERSION=18.12.1 \
 #  --build-arg JAVET_V8_VERSION=10.8.168.20 \
-#  --build-arg JAVET_VERSION=3.1.6 \
+#  --build-arg JAVET_VERSION=3.1.7 \
 #  -f docker/linux-x86_64/build_artifact.Dockerfile .
 
 ARG JAVET_REPO=sjtucaocao/javet
 ARG JAVET_NODE_VERSION=18.12.1
 ARG JAVET_V8_VERSION=10.8.168.20
-ARG JAVET_VERSION=3.1.6
+ARG JAVET_VERSION=3.1.7
 
 FROM ${JAVET_REPO}:x86_64-base-node_${JAVET_NODE_VERSION} as base-v8
 

diff --git a/docker/windows-x86_64/base.Dockerfile b/docker/windows-x86_64/base.Dockerfile
@@ -29,7 +29,7 @@
 #       The following dockerfile has been out of date because it still uses
 #       Visual Studio 2019 Community. Please contact the maintainer if you want an upgrade.
 
-# Usage: docker build -t sjtucaocao/javet-windows:3.1.6 -m 4G -f docker/windows-x86_64/base.Dockerfile .
+# Usage: docker build -t sjtucaocao/javet-windows:3.1.7 -m 4G -f docker/windows-x86_64/base.Dockerfile .
 
 ARG JAVET_NODE_VERSION=20.17.0
 ARG JAVET_V8_VERSION=12.8.374.17

diff --git a/docker/windows-x86_64/build.Dockerfile b/docker/windows-x86_64/build.Dockerfile
@@ -15,7 +15,7 @@
 
 # Usage: docker build -t javet:local -f docker/windows-x86_64/build.Dockerfile .
 
-FROM sjtucaocao/javet-windows:3.1.6
+FROM sjtucaocao/javet-windows:3.1.7
 
 SHELL ["cmd", "/S", "/C"]
 WORKDIR /

diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'Sam Cao'
 
 # The full version, including alpha/beta/rc tags
-release = '3.1.6'
+release = '3.1.7'
 
 
 # -- General configuration ---------------------------------------------------