From b10c185b0be86ecb2ac7050e5bd2ee398ee705f3 Mon Sep 17 00:00:00 2001 From: Sam Cao Date: Sun, 28 Apr 2024 11:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B3=20chore:=20Update=20version=20to?= =?UTF-8?q?=20v3.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android_node_build.yml | 2 +- .github/workflows/android_v8_build.yml | 2 +- .github/workflows/linux_build_artifact.yml | 2 +- .../workflows/linux_build_node_v8_image.yml | 2 +- .github/workflows/linux_x86_64_build.yml | 2 +- .github/workflows/macos_arm64_build.yml | 2 +- .github/workflows/macos_x86_64_build.yml | 2 +- README.rst | 26 +++++++------- android/javet-android/build.gradle.kts | 2 +- .../src/main/AndroidManifest.xml | 2 +- android/pom.xml | 4 +-- build.gradle.kts | 2 +- cpp/build-android.sh | 2 +- cpp/build-linux-arm64.sh | 2 +- cpp/build-linux-x86_64.sh | 2 +- cpp/build-macos.sh | 2 +- cpp/build-windows.cmd | 2 +- cpp/jni/javet_resource_node.rc | 12 +++---- cpp/jni/javet_resource_v8.rc | 12 +++---- docker/android/base.Dockerfile | 2 +- docker/android/build.Dockerfile | 2 +- docker/linux-arm64/base_all_in_one.Dockerfile | 2 +- docker/linux-arm64/base_gradle.Dockerfile | 2 +- docker/linux-arm64/build_artifact.Dockerfile | 4 +-- .../linux-x86_64/base_all_in_one.Dockerfile | 2 +- docker/linux-x86_64/base_gradle.Dockerfile | 2 +- docker/linux-x86_64/build.env | 2 +- .../linux-x86_64/build_all_in_one.Dockerfile | 2 +- docker/linux-x86_64/build_artifact.Dockerfile | 4 +-- docker/windows-x86_64/base.Dockerfile | 2 +- docker/windows-x86_64/build.Dockerfile | 2 +- docs/conf.py | 2 +- docs/tutorial/basic/installation.rst | 34 +++++++++---------- scripts/node/javet-rebuild/rebuild.cmd | 2 +- scripts/node/javet-rebuild/rebuild.sh | 2 +- scripts/python/change_javet_version.py | 5 ++- .../javet/interop/loader/JavetLibLoader.java | 2 +- 37 files changed, 81 insertions(+), 78 deletions(-) diff --git a/.github/workflows/android_node_build.yml b/.github/workflows/android_node_build.yml index d0d82e900..63a22c343 100644 --- a/.github/workflows/android_node_build.yml +++ b/.github/workflows/android_node_build.yml @@ -9,7 +9,7 @@ on: env: JAVET_NODE_VERSION: 20.12.2 - JAVET_VERSION: 3.1.1 + JAVET_VERSION: 3.1.2 ROOT: /home/runner/work/Javet jobs: diff --git a/.github/workflows/android_v8_build.yml b/.github/workflows/android_v8_build.yml index 2eae5c4b4..ac4db41bb 100644 --- a/.github/workflows/android_v8_build.yml +++ b/.github/workflows/android_v8_build.yml @@ -9,7 +9,7 @@ on: env: JAVET_V8_VERSION: 12.4.254.9 - JAVET_VERSION: 3.1.1 + JAVET_VERSION: 3.1.2 ROOT: /home/runner/work/Javet jobs: diff --git a/.github/workflows/linux_build_artifact.yml b/.github/workflows/linux_build_artifact.yml index 4f84d1a9c..2d8862155 100644 --- 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.12.2 JAVET_V8_VERSION: 12.4.254.9 - JAVET_VERSION: 3.1.1 + JAVET_VERSION: 3.1.2 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 index ecc27d0b5..3587438cd 100644 --- 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.12.2 JAVET_V8_VERSION: 12.4.254.9 - JAVET_VERSION: 3.1.1 + JAVET_VERSION: 3.1.2 # 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 index 97b86ad40..40649e38b 100644 --- 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.12.2 JAVET_V8_VERSION: 12.4.254.9 - JAVET_VERSION: 3.1.1 + JAVET_VERSION: 3.1.2 ROOT: /home/runner/work/Javet jobs: diff --git a/.github/workflows/macos_arm64_build.yml b/.github/workflows/macos_arm64_build.yml index c0614e90c..d522c5d61 100644 --- a/.github/workflows/macos_arm64_build.yml +++ b/.github/workflows/macos_arm64_build.yml @@ -9,7 +9,7 @@ on: env: JAVET_NODE_VERSION: 20.12.2 JAVET_V8_VERSION: 12.4.254.9 - JAVET_VERSION: 3.1.1 + JAVET_VERSION: 3.1.2 ROOT: /Users/runner/work/Javet jobs: diff --git a/.github/workflows/macos_x86_64_build.yml b/.github/workflows/macos_x86_64_build.yml index cb43252af..33bfcb913 100644 --- 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.12.2 JAVET_V8_VERSION: 12.4.254.9 - JAVET_VERSION: 3.1.1 + JAVET_VERSION: 3.1.2 ROOT: /Users/runner/work/Javet jobs: diff --git a/README.rst b/README.rst index 1e6c64ce5..6ebedf673 100644 --- a/README.rst +++ b/README.rst @@ -75,21 +75,21 @@ Maven com.caoccao.javet javet - 3.1.1 + 3.1.2 com.caoccao.javet javet-linux-arm64 - 3.1.1 + 3.1.2 com.caoccao.javet javet-macos - 3.1.1 + 3.1.2 Gradle Kotlin DSL @@ -97,22 +97,22 @@ Gradle Kotlin DSL .. code-block:: kotlin - implementation("com.caoccao.javet:javet:3.1.1") // Linux and Windows (x86_64) - implementation("com.caoccao.javet:javet-linux-arm64:3.1.1") // Linux (arm64) - implementation("com.caoccao.javet:javet-macos:3.1.1") // Mac OS (x86_64 and arm64) - implementation("com.caoccao.javet:javet-android-node:3.1.1") // Android Node (arm, arm64, x86 and x86_64) - implementation("com.caoccao.javet:javet-android-v8:3.1.1") // Android V8 (arm, arm64, x86 and x86_64) + implementation("com.caoccao.javet:javet:3.1.2") // Linux and Windows (x86_64) + implementation("com.caoccao.javet:javet-linux-arm64:3.1.2") // Linux (arm64) + implementation("com.caoccao.javet:javet-macos:3.1.2") // Mac OS (x86_64 and arm64) + implementation("com.caoccao.javet:javet-android-node:3.1.2") // Android Node (arm, arm64, x86 and x86_64) + implementation("com.caoccao.javet:javet-android-v8:3.1.2") // Android V8 (arm, arm64, x86 and x86_64) Gradle Groovy DSL ^^^^^^^^^^^^^^^^^ .. code-block:: groovy - implementation 'com.caoccao.javet:javet:3.1.1' // Linux and Windows (x86_64) - implementation 'com.caoccao.javet:javet-linux-arm64:3.1.1' // Linux (arm64) - implementation 'com.caoccao.javet:javet-macos:3.1.1' // Mac OS (x86_64 and arm64) - implementation 'com.caoccao.javet:javet-android-node:3.1.1' // Android Node (arm, arm64, x86 and x86_64) - implementation 'com.caoccao.javet:javet-android-v8:3.1.1' // Android V8 (arm, arm64, x86 and x86_64) + implementation 'com.caoccao.javet:javet:3.1.2' // Linux and Windows (x86_64) + implementation 'com.caoccao.javet:javet-linux-arm64:3.1.2' // Linux (arm64) + implementation 'com.caoccao.javet:javet-macos:3.1.2' // Mac OS (x86_64 and arm64) + implementation 'com.caoccao.javet:javet-android-node:3.1.2' // Android Node (arm, arm64, x86 and x86_64) + implementation 'com.caoccao.javet:javet-android-v8:3.1.2' // 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 index 5184e1110..d15db70be 100644 --- 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.1" + const val JAVET = "3.1.2" const val JUNIT = "5.10.1" } } diff --git a/android/javet-android/src/main/AndroidManifest.xml b/android/javet-android/src/main/AndroidManifest.xml index 218973245..f6df4f0e0 100644 --- a/android/javet-android/src/main/AndroidManifest.xml +++ b/android/javet-android/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/android/pom.xml b/android/pom.xml index 3210dcfa2..b96de79f4 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -3,7 +3,7 @@ com.caoccao.javet javet-android - 3.1.1 + 3.1.2 javet aar Javet is Java + V8 (JAVa + V + EighT). It is an awesome way of embedding V8 in Java. @@ -29,7 +29,7 @@ scm:git:git://github.com/caoccao/Javet.git scm:git:git@github.com:caoccao/caoccao.git https://github.com/caoccao/Javet - 3.1.1 + 3.1.2 diff --git a/build.gradle.kts b/build.gradle.kts index 25905039b..05d769a30 100644 --- 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.1" + const val JAVET = "3.1.2" 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 index f00f9ff17..b2badf2c0 100755 --- 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.1 +JAVET_VERSION=3.1.2 rm -rf build_android mkdir build_android cd build_android diff --git a/cpp/build-linux-arm64.sh b/cpp/build-linux-arm64.sh index a4542a02b..d3b38c4b5 100644 --- 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.1 +JAVET_VERSION=3.1.2 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 index 27938136e..638319774 100644 --- 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.1 +JAVET_VERSION=3.1.2 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 index 92636cab6..98405dedc 100755 --- 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.1 +JAVET_VERSION=3.1.2 rm -rf build_macos mkdir build_macos cd build_macos diff --git a/cpp/build-windows.cmd b/cpp/build-windows.cmd index a7e3cc94a..720aa0766 100644 --- 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.1 +SET JAVET_VERSION=3.1.2 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 index 42cdb774d..b259b009b 100644 --- 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,1,0 - PRODUCTVERSION 3,1,1,0 + FILEVERSION 3,1,2,0 + PRODUCTVERSION 3,1,2,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.1.0" - VALUE "InternalName", "libjavet-node-windows-x86_64.v.3.1.1.dll" + VALUE "FileVersion", "3.1.2.0" + VALUE "InternalName", "libjavet-node-windows-x86_64.v.3.1.2.dll" VALUE "LegalCopyright", "Copyright (c) 2021-2024." - VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.3.1.1.dll" + VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.3.1.2.dll" VALUE "ProductName", "Javet Windows" - VALUE "ProductVersion", "3.1.1.0" + VALUE "ProductVersion", "3.1.2.0" END END BLOCK "VarFileInfo" diff --git a/cpp/jni/javet_resource_v8.rc b/cpp/jni/javet_resource_v8.rc index aa6927ca6..529d81969 100644 --- 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,1,0 - PRODUCTVERSION 3,1,1,0 + FILEVERSION 3,1,2,0 + PRODUCTVERSION 3,1,2,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.1.0" - VALUE "InternalName", "libjavet-v8-windows-x86_64.v.3.1.1.dll" + VALUE "FileVersion", "3.1.2.0" + VALUE "InternalName", "libjavet-v8-windows-x86_64.v.3.1.2.dll" VALUE "LegalCopyright", "Copyright (c) 2021-2024." - VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.3.1.1.dll" + VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.3.1.2.dll" VALUE "ProductName", "Javet Windows" - VALUE "ProductVersion", "3.1.1.0" + VALUE "ProductVersion", "3.1.2.0" END END BLOCK "VarFileInfo" diff --git a/docker/android/base.Dockerfile b/docker/android/base.Dockerfile index 0543b9247..85b7ec4b1 100644 --- 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.1 -f docker/android/base.Dockerfile . +# Usage: docker build -t sjtucaocao/javet-android:3.1.2 -f docker/android/base.Dockerfile . ARG JAVET_V8_VERSION=12.4.254.9 diff --git a/docker/android/build.Dockerfile b/docker/android/build.Dockerfile index 07f69290c..2707520a8 100644 --- 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.1 +FROM sjtucaocao/javet-android:3.1.2 WORKDIR / # Copy Javet diff --git a/docker/linux-arm64/base_all_in_one.Dockerfile b/docker/linux-arm64/base_all_in_one.Dockerfile index 7c5f0399e..bcd99a582 100644 --- 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.1 -f docker/linux-arm64/base_all_in_one.Dockerfile . +# Usage: docker build -t sjtucaocao/javet-arm64:3.1.2 -f docker/linux-arm64/base_all_in_one.Dockerfile . ARG JAVET_NODE_VERSION=18.15.0 ARG JAVET_V8_VERSION=12.4.254.9 diff --git a/docker/linux-arm64/base_gradle.Dockerfile b/docker/linux-arm64/base_gradle.Dockerfile index 7f03aa060..dbd77d201 100644 --- 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.1 \ +# -t sjtucaocao/javet:arm64-3.1.2 \ # --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 index d518f7694..2c622d9e3 100644 --- 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.1 \ +# --build-arg JAVET_VERSION=3.1.2 \ # -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.1 +ARG JAVET_VERSION=3.1.2 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 index 26a855ad4..f9a32b2fc 100644 --- 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.1 -f docker/linux-x86_64/base_all_in_one.Dockerfile . +# Usage: docker build -t sjtucaocao/javet:3.1.2 -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 index fbf5295ef..3d5df67e6 100644 --- 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.1 \ +# -t sjtucaocao/javet:x86_64-3.1.2 \ # --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 index 22dbaddd5..592559c9a 100644 --- 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.1 +JAVET_VERSION=3.1.2 JAVET_V8_VERSION=12.4.254.9 JAVET_NODE_VERSION=20.12.2 diff --git a/docker/linux-x86_64/build_all_in_one.Dockerfile b/docker/linux-x86_64/build_all_in_one.Dockerfile index 347e6fcf3..d9243ca41 100644 --- 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.1 +FROM sjtucaocao/javet:3.1.2 WORKDIR / # Copy Javet diff --git a/docker/linux-x86_64/build_artifact.Dockerfile b/docker/linux-x86_64/build_artifact.Dockerfile index 695417baf..d2e0ddc40 100644 --- 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.1 \ +# --build-arg JAVET_VERSION=3.1.2 \ # -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.1 +ARG JAVET_VERSION=3.1.2 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 index 040f57fbc..a5200b12c 100644 --- 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.1 -m 4G -f docker/windows-x86_64/base.Dockerfile . +# Usage: docker build -t sjtucaocao/javet-windows:3.1.2 -m 4G -f docker/windows-x86_64/base.Dockerfile . ARG JAVET_NODE_VERSION=20.12.2 ARG JAVET_V8_VERSION=12.4.254.9 diff --git a/docker/windows-x86_64/build.Dockerfile b/docker/windows-x86_64/build.Dockerfile index ee22519e9..dda1f1810 100644 --- 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.1 +FROM sjtucaocao/javet-windows:3.1.2 SHELL ["cmd", "/S", "/C"] WORKDIR / diff --git a/docs/conf.py b/docs/conf.py index 110beb52a..882ac221f 100644 --- 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.1' +release = '3.1.2' # -- General configuration --------------------------------------------------- diff --git a/docs/tutorial/basic/installation.rst b/docs/tutorial/basic/installation.rst index 45e69634c..746c2a6bd 100644 --- a/docs/tutorial/basic/installation.rst +++ b/docs/tutorial/basic/installation.rst @@ -16,21 +16,21 @@ Maven com.caoccao.javet javet - 3.1.1 + 3.1.2 com.caoccao.javet javet-linux-arm64 - 3.1.1 + 3.1.2 com.caoccao.javet javet-macos - 3.1.1 + 3.1.2 .. tab:: Complete @@ -38,7 +38,7 @@ Maven .. code-block:: xml - 3.1.1 + 3.1.2 @@ -115,11 +115,11 @@ Gradle Kotlin DSL .. code-block:: kotlin - implementation("com.caoccao.javet:javet:3.1.1") // Linux and Windows (x86_64) - implementation("com.caoccao.javet:javet-linux-arm64:3.1.1") // Linux (arm64) - implementation("com.caoccao.javet:javet-macos:3.1.1") // Mac OS (x86_64 and arm64) - implementation("com.caoccao.javet:javet-android-node:3.1.1") // Android Node (arm, arm64, x86 and x86_64) - implementation("com.caoccao.javet:javet-android-v8:3.1.1") // Android V8 (arm, arm64, x86 and x86_64) + implementation("com.caoccao.javet:javet:3.1.2") // Linux and Windows (x86_64) + implementation("com.caoccao.javet:javet-linux-arm64:3.1.2") // Linux (arm64) + implementation("com.caoccao.javet:javet-macos:3.1.2") // Mac OS (x86_64 and arm64) + implementation("com.caoccao.javet:javet-android-node:3.1.2") // Android Node (arm, arm64, x86 and x86_64) + implementation("com.caoccao.javet:javet-android-v8:3.1.2") // Android V8 (arm, arm64, x86 and x86_64) .. tab:: Complete @@ -130,11 +130,11 @@ Gradle Kotlin DSL val os = OperatingSystem.current() val cpuArch = System.getProperty("os.arch") if (os.isMacOsX) { - implementation("com.caoccao.javet:javet:3.1.1") + implementation("com.caoccao.javet:javet:3.1.2") } else if (os.isLinux && (cpuArch == "aarch64" || cpuArch == "arm64")) { - implementation("com.caoccao.javet:javet-linux-arm64:3.1.1") + implementation("com.caoccao.javet:javet-linux-arm64:3.1.2") } else { - implementation("com.caoccao.javet:javet-macos:3.1.1") + implementation("com.caoccao.javet:javet-macos:3.1.2") } Gradle Groovy DSL @@ -142,11 +142,11 @@ Gradle Groovy DSL .. code-block:: groovy - implementation 'com.caoccao.javet:javet:3.1.1' // Linux and Windows (x86_64) - implementation 'com.caoccao.javet:javet-linux-arm64:3.1.1' // Linux (arm64) - implementation 'com.caoccao.javet:javet-macos:3.1.1' // Mac OS (x86_64 and arm64) - implementation 'com.caoccao.javet:javet-android-node:3.1.1' // Android Node (arm, arm64, x86 and x86_64) - implementation 'com.caoccao.javet:javet-android-v8:3.1.1' // Android V8 (arm, arm64, x86 and x86_64) + implementation 'com.caoccao.javet:javet:3.1.2' // Linux and Windows (x86_64) + implementation 'com.caoccao.javet:javet-linux-arm64:3.1.2' // Linux (arm64) + implementation 'com.caoccao.javet:javet-macos:3.1.2' // Mac OS (x86_64 and arm64) + implementation 'com.caoccao.javet:javet-android-node:3.1.2' // Android Node (arm, arm64, x86 and x86_64) + implementation 'com.caoccao.javet:javet-android-v8:3.1.2' // Android V8 (arm, arm64, x86 and x86_64) OS Compatibility ================ diff --git a/scripts/node/javet-rebuild/rebuild.cmd b/scripts/node/javet-rebuild/rebuild.cmd index 6ffa3dcac..2b2d33e2f 100644 --- a/scripts/node/javet-rebuild/rebuild.cmd +++ b/scripts/node/javet-rebuild/rebuild.cmd @@ -1,5 +1,5 @@ @echo off -SET NODE_LIB_FILE="..\..\..\..\..\..\build\libs\libjavet-node-windows-x86_64.v.3.1.1.lib" +SET NODE_LIB_FILE="..\..\..\..\..\..\build\libs\libjavet-node-windows-x86_64.v.3.1.2.lib" cd %NODE_MODULE_ROOT% call node-gyp clean call node-gyp configure --module_name=%NODE_MODULE_NAME% --module_path=%NODE_MODULE_PATH% --node_lib_file=%NODE_LIB_FILE% diff --git a/scripts/node/javet-rebuild/rebuild.sh b/scripts/node/javet-rebuild/rebuild.sh index f8416678c..f266a8fa1 100755 --- a/scripts/node/javet-rebuild/rebuild.sh +++ b/scripts/node/javet-rebuild/rebuild.sh @@ -1 +1 @@ -patchelf --add-needed libjavet-node-linux-x86_64.v.3.1.1.so ${NODE_MODULE_FILE} +patchelf --add-needed libjavet-node-linux-x86_64.v.3.1.2.so ${NODE_MODULE_FILE} diff --git a/scripts/python/change_javet_version.py b/scripts/python/change_javet_version.py index 3963ac801..caba5ba15 100644 --- a/scripts/python/change_javet_version.py +++ b/scripts/python/change_javet_version.py @@ -91,6 +91,9 @@ def update(self): self._update( 'docker/linux-x86_64/base_gradle.Dockerfile', '\n', re.compile(r'x86_64-(?P\d+\.\d+\.\d+) ')) + self._update( + 'docker/linux-x86_64/build.env', '\n', + re.compile(r'JAVET_VERSION=(?P\d+\.\d+\.\d+)')) self._update( 'docker/windows-x86_64/base.Dockerfile', '\n', re.compile(r'javet-windows:(?P\d+\.\d+\.\d+) ')) @@ -183,7 +186,7 @@ def _update(self, relative_file_path: str, line_separator: str, *patterns: list) logging.info(' Updated.') def main(): - change_javet_version = ChangeJavetVersion('3.1.1') + change_javet_version = ChangeJavetVersion('3.1.2') change_javet_version.update() return 0 diff --git a/src/main/java/com/caoccao/javet/interop/loader/JavetLibLoader.java b/src/main/java/com/caoccao/javet/interop/loader/JavetLibLoader.java index 14a7e958c..ed5f3898b 100644 --- a/src/main/java/com/caoccao/javet/interop/loader/JavetLibLoader.java +++ b/src/main/java/com/caoccao/javet/interop/loader/JavetLibLoader.java @@ -45,7 +45,7 @@ public final class JavetLibLoader { * * @since 0.8.0 */ - public static final String LIB_VERSION = "3.1.1"; + public static final String LIB_VERSION = "3.1.2"; private static final String ANDROID_ABI_ARM = "armeabi-v7a"; private static final String ANDROID_ABI_ARM64 = "arm64-v8a"; private static final String ANDROID_ABI_X86 = "x86";