Skip to content

Commit

Permalink
🥗 Javet v3.0.2 (#288)
Browse files Browse the repository at this point in the history
* Upgraded V8 to `v12.0.267.8` (2023-11-21)
* Upgraded Node.js to `v20.10.0` ([2023-11-22](https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.10.0))
* Fixed Linux arm64 build addressing the changes in V8 v12
  • Loading branch information
caoccao authored Nov 24, 2023
1 parent ea4a679 commit 28f9bb8
Show file tree
Hide file tree
Showing 461 changed files with 1,630 additions and 1,774 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/android_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
workflow_dispatch:

env:
JAVET_NODE_VERSION: 20.9.0
JAVET_V8_VERSION: 11.9.169.6
JAVET_VERSION: 3.0.1
JAVET_NODE_VERSION: 20.10.0
JAVET_V8_VERSION: 12.0.267.8
JAVET_VERSION: 3.0.2
ROOT: /home/runner/work/Javet

jobs:
Expand Down Expand Up @@ -326,7 +326,7 @@ jobs:
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.1
gradle-version: 8.2

- name: Prepare JNI Libs
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux_build_artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ on:
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
JAVET_NODE_VERSION: 20.9.0
JAVET_V8_VERSION: 11.9.169.6
JAVET_VERSION: 3.0.1
JAVET_NODE_VERSION: 20.10.0
JAVET_V8_VERSION: 12.0.267.8
JAVET_VERSION: 3.0.2

jobs:
javet_linux_x86_64:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux_build_node_v8_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ on:
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
JAVET_NODE_VERSION: 20.9.0
JAVET_V8_VERSION: 11.9.169.6
JAVET_VERSION: 3.0.1
JAVET_NODE_VERSION: 20.10.0
JAVET_V8_VERSION: 12.0.267.8
JAVET_VERSION: 3.0.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.
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux_x86_64_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
workflow_dispatch:

env:
JAVET_NODE_VERSION: 20.9.0
JAVET_V8_VERSION: 11.9.169.6
JAVET_VERSION: 3.0.1
JAVET_NODE_VERSION: 20.10.0
JAVET_V8_VERSION: 12.0.267.8
JAVET_VERSION: 3.0.2
ROOT: /home/runner/work/Javet

jobs:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.1
gradle-version: 8.2

- name: Download Javet V8
uses: actions/download-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos_arm64_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
env:
JAVET_NODE_VERSION: 11.8.172.15
JAVET_V8_VERSION: 11.8.172.15
JAVET_VERSION: 3.0.1
JAVET_VERSION: 3.0.2
ROOT: /Users/runner/work/Javet

jobs:
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.1
gradle-version: 8.2

- name: Download Javet V8
uses: actions/download-artifact@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macos_x86_64_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
workflow_dispatch:

env:
JAVET_NODE_VERSION: 20.9.0
JAVET_V8_VERSION: 11.9.169.6
JAVET_VERSION: 3.0.1
JAVET_NODE_VERSION: 20.10.0
JAVET_V8_VERSION: 12.0.267.8
JAVET_VERSION: 3.0.2
ROOT: /Users/runner/work/Javet

jobs:
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.1
gradle-version: 8.2

- name: Download Javet V8
uses: actions/download-artifact@v3
Expand Down
27 changes: 14 additions & 13 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ arm ✔️ ❌ ❌ ❌
arm64 ✔️ ✔️ ✔️ ❌
=========== ======= ======= ======= =======

* Node.js ``v20.9.0`` + V8 ``v11.9.169.6``
* Node.js ``v20.10.0`` + V8 ``v12.0.267.8``
* 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
Expand All @@ -67,42 +67,42 @@ Maven
<dependency>
<groupId>com.caoccao.javet</groupId>
<artifactId>javet</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
</dependency>
<!-- Linux (arm64) -->
<dependency>
<groupId>com.caoccao.javet</groupId>
<artifactId>javet-linux-arm64</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
</dependency>
<!-- Mac OS (x86_64 and arm64) -->
<dependency>
<groupId>com.caoccao.javet</groupId>
<artifactId>javet-macos</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
</dependency>
Gradle Kotlin DSL
^^^^^^^^^^^^^^^^^

.. code-block:: kotlin
implementation("com.caoccao.javet:javet:3.0.1") // Linux and Windows (x86_64)
implementation("com.caoccao.javet:javet-linux-arm64:3.0.1") // Linux (arm64)
implementation("com.caoccao.javet:javet-macos:3.0.1") // Mac OS (x86_64 and arm64)
implementation("com.caoccao.javet:javet-android:3.0.1") // Android (arm, arm64, x86 and x86_64)
implementation("com.caoccao.javet:javet:3.0.2") // Linux and Windows (x86_64)
implementation("com.caoccao.javet:javet-linux-arm64:3.0.2") // Linux (arm64)
implementation("com.caoccao.javet:javet-macos:3.0.2") // Mac OS (x86_64 and arm64)
implementation("com.caoccao.javet:javet-android:3.0.2") // Android (arm, arm64, x86 and x86_64)
Gradle Groovy DSL
^^^^^^^^^^^^^^^^^

.. code-block:: groovy
implementation 'com.caoccao.javet:javet:3.0.1' // Linux and Windows (x86_64)
implementation 'com.caoccao.javet:javet-linux-arm64:3.0.1' // Linux (arm64)
implementation 'com.caoccao.javet:javet-macos:3.0.1' // Mac OS (x86_64 and arm64)
implementation 'com.caoccao.javet:javet-android:3.0.1' // Android (arm, arm64, x86 and x86_64)
implementation 'com.caoccao.javet:javet:3.0.2' // Linux and Windows (x86_64)
implementation 'com.caoccao.javet:javet-linux-arm64:3.0.2' // Linux (arm64)
implementation 'com.caoccao.javet:javet-macos:3.0.2' // Mac OS (x86_64 and arm64)
implementation 'com.caoccao.javet:javet-android:3.0.2' // Android (arm, arm64, x86 and x86_64)
Hello Javet
-----------
Expand All @@ -127,14 +127,15 @@ Sponsors
License
=======

`APACHE LICENSE, VERSION 2.0 <LICENSE>`_
`APACHE LICENSE, VERSION 2.0 <https://github.com/caoccao/Javet/blob/main/LICENSE>`_

Blog
====

* `Performance Comparison of GraalJS, Javet and Nashorn <https://medium.com/towardsdev/performance-comparison-of-graaljs-javet-and-nashorn-7bae6925826a>`_
* `How to Elegantly Expose JsonNode in V8 <https://medium.com/stackademic/how-to-elegantly-expose-jsonnode-in-v8-638aff9da549>`_
* `How to Compromise V8 on JVM <https://sjtucaocao.medium.com/how-to-compromise-v8-on-jvm-ceb385572461>`_
* `Is TypeScript a Good Choice for a Script Engine? <https://sjtucaocao.medium.com/is-typescript-a-good-choice-for-a-script-engine-01fe69921ace>`_

Documents
=========
Expand Down
2 changes: 1 addition & 1 deletion android/javet-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
id("com.android.library")
}

version = "3.0.1"
version = "3.0.2"

android {
compileSdk = 30
Expand Down
2 changes: 1 addition & 1 deletion android/javet-android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.caoccao.javet"
android:versionCode="1"
android:versionName="3.0.1"
android:versionName="3.0.2"
>

</manifest>
4 changes: 2 additions & 2 deletions android/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.caoccao.javet</groupId>
<artifactId>javet-android</artifactId>
<version>3.0.1</version>
<version>3.0.2</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>
Expand All @@ -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.0.1</tag>
<tag>3.0.2</tag>
</scm>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repositories {
}

group = "com.caoccao.javet"
version = "3.0.1"
version = "3.0.2"

dependencies {
testImplementation("org.eclipse.jetty.websocket:websocket-server:9.4.51.v20230217")
Expand Down
2 changes: 1 addition & 1 deletion cpp/build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.1
JAVET_VERSION=3.0.2
rm -rf build_android
mkdir build_android
cd build_android
Expand Down
2 changes: 1 addition & 1 deletion cpp/build-linux-arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.1
JAVET_VERSION=3.0.2
rm -rf build_linux_arm64
mkdir build_linux_arm64
cd build_linux_arm64
Expand Down
2 changes: 1 addition & 1 deletion cpp/build-linux-x86_64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.1
JAVET_VERSION=3.0.2
rm -rf build_linux_x86_64
mkdir build_linux_x86_64
cd build_linux_x86_64
Expand Down
2 changes: 1 addition & 1 deletion cpp/build-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.1
JAVET_VERSION=3.0.2
rm -rf build_macos
mkdir build_macos
cd build_macos
Expand Down
2 changes: 1 addition & 1 deletion cpp/build-windows.cmd
Original file line number Diff line number Diff line change
@@ -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.0.1
SET JAVET_VERSION=3.0.2
rd /s/q build_windows
mkdir build_windows
cd build_windows
Expand Down
12 changes: 6 additions & 6 deletions cpp/jni/javet_resource_node.rc
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,1,0
PRODUCTVERSION 3,0,1,0
FILEVERSION 3,0,2,0
PRODUCTVERSION 3,0,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "caoccao.com"
VALUE "FileDescription", "caoccao.com"
VALUE "FileVersion", "3.0.1.0"
VALUE "InternalName", "libjavet-node-windows-x86_64.v.3.0.1.dll"
VALUE "FileVersion", "3.0.2.0"
VALUE "InternalName", "libjavet-node-windows-x86_64.v.3.0.2.dll"
VALUE "LegalCopyright", "Copyright (C) 2021-2023"
VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.3.0.1.dll"
VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.3.0.2.dll"
VALUE "ProductName", "Javet Windows"
VALUE "ProductVersion", "3.0.1.0"
VALUE "ProductVersion", "3.0.2.0"
END
END
BLOCK "VarFileInfo"
Expand Down
12 changes: 6 additions & 6 deletions cpp/jni/javet_resource_v8.rc
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,1,0
PRODUCTVERSION 3,0,1,0
FILEVERSION 3,0,2,0
PRODUCTVERSION 3,0,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "caoccao.com"
VALUE "FileDescription", "caoccao.com"
VALUE "FileVersion", "3.0.1.0"
VALUE "InternalName", "libjavet-v8-windows-x86_64.v.3.0.1.dll"
VALUE "FileVersion", "3.0.2.0"
VALUE "InternalName", "libjavet-v8-windows-x86_64.v.3.0.2.dll"
VALUE "LegalCopyright", "Copyright (C) 2021-2023"
VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.3.0.1.dll"
VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.3.0.2.dll"
VALUE "ProductName", "Javet Windows"
VALUE "ProductVersion", "3.0.1.0"
VALUE "ProductVersion", "3.0.2.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions docker/android/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Usage: docker build -t sjtucaocao/javet-android:3.0.1 -f docker/android/base.Dockerfile .
# Usage: docker build -t sjtucaocao/javet-android:3.0.2 -f docker/android/base.Dockerfile .

ARG JAVET_V8_VERSION=11.9.169.6
ARG JAVET_V8_VERSION=12.0.267.8

FROM ubuntu:20.04
WORKDIR /
Expand Down
2 changes: 1 addition & 1 deletion docker/android/build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Usage: docker build -t javet-android:local -f docker/android/build.Dockerfile .

FROM sjtucaocao/javet-android:3.0.1
FROM sjtucaocao/javet-android:3.0.2
WORKDIR /

# Copy Javet
Expand Down
4 changes: 2 additions & 2 deletions docker/linux-arm64/base_all_in_one.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Usage: docker build -t sjtucaocao/javet-arm64:3.0.1 -f docker/linux-arm64/base_all_in_one.Dockerfile .
# Usage: docker build -t sjtucaocao/javet-arm64:3.0.2 -f docker/linux-arm64/base_all_in_one.Dockerfile .

ARG JAVET_NODE_VERSION=18.15.0
ARG JAVET_V8_VERSION=11.9.169.6
ARG JAVET_V8_VERSION=12.0.267.8

FROM ubuntu:20.04
WORKDIR /
Expand Down
2 changes: 1 addition & 1 deletion docker/linux-arm64/base_gradle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

# Usage: docker build \
# -t sjtucaocao/javet:arm64-3.0.1 \
# -t sjtucaocao/javet:arm64-3.0.2 \
# --build-arg JAVET_REPO=sjtucaocao/javet \
# -f docker/linux-arm64/base_gradle.Dockerfile .

Expand Down
6 changes: 3 additions & 3 deletions docker/linux-arm64/base_v8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
# limitations under the License.

# Usage: docker build \
# -t sjtucaocao/javet:arm64-base-v8_11.9.169.6 \
# -t sjtucaocao/javet:arm64-base-v8_12.0.267.8 \
# --build-arg JAVET_REPO=sjtucaocao/javet \
# --build-arg JAVET_V8_VERSION=11.9.169.6 \
# --build-arg JAVET_V8_VERSION=12.0.267.8 \
# -f docker/linux-arm64/base_v8.Dockerfile .

ARG JAVET_REPO=sjtucaocao/javet
ARG JAVET_V8_VERSION=11.9.169.6
ARG JAVET_V8_VERSION=12.0.267.8

FROM ${JAVET_REPO}:arm64-base-jvm

Expand Down
Loading

0 comments on commit 28f9bb8

Please sign in to comment.