Skip to content

Commit

Permalink
✈️ Javet v2.2.1 (#247)
Browse files Browse the repository at this point in the history
* Upgraded V8 to `v11.5.150.12` (2023-06-23)
* Upgraded Node.js to `v18.16.1` `([2023-06-20](https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V18.md#18.16.1))
* Added `register***()` to `IJavetDirectProxyHandler`
* Added `V8VirtualIterator`
* Enhanced `JavetProxySymbolIterableConverter` to support `Symbol.iterator`
  • Loading branch information
caoccao authored Jun 27, 2023
1 parent ebe485f commit 44401b4
Show file tree
Hide file tree
Showing 455 changed files with 2,226 additions and 1,031 deletions.
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: 18.16.0
JAVET_V8_VERSION: 11.4.183.14
JAVET_VERSION: 2.2.0
JAVET_NODE_VERSION: 18.16.1
JAVET_V8_VERSION: 11.5.150.12
JAVET_VERSION: 2.2.1

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: 18.16.0
JAVET_V8_VERSION: 11.4.183.14
JAVET_VERSION: 2.2.0
JAVET_NODE_VERSION: 18.16.1
JAVET_V8_VERSION: 11.5.150.12
JAVET_VERSION: 2.2.1

# 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
18 changes: 9 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Major Features

* Linux (x86_64) + Mac OS (x86_64, arm64) + ️Windows (x86_64)
* Android (arm, arm64, x86 and x86_64)
* Node.js ``v18.16.0`` + V8 ``v11.4.183.14``
* Node.js ``v18.16.1`` + V8 ``v11.5.150.12``
* 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 @@ -58,33 +58,33 @@ Maven
<dependency>
<groupId>com.caoccao.javet</groupId>
<artifactId>javet</artifactId>
<version>2.2.0</version>
<version>2.2.1</version>
</dependency>
<!-- Mac OS (x86_64 and arm64) -->
<dependency>
<groupId>com.caoccao.javet</groupId>
<artifactId>javet-macos</artifactId>
<version>2.2.0</version>
<version>2.2.1</version>
</dependency>
Gradle Kotlin DSL
^^^^^^^^^^^^^^^^^

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

.. code-block:: groovy
implementation 'com.caoccao.javet:javet:2.2.0' // Linux and Windows (x86_64)
implementation 'com.caoccao.javet:javet-macos:2.2.0' // Mac OS (x86_64 and arm64)
implementation 'com.caoccao.javet:javet-android:2.2.0' // Android (arm, arm64, x86 and x86_64)
implementation 'com.caoccao.javet:javet:2.2.1' // Linux and Windows (x86_64)
implementation 'com.caoccao.javet:javet-macos:2.2.1' // Mac OS (x86_64 and arm64)
implementation 'com.caoccao.javet:javet-android:2.2.1' // Android (arm, arm64, x86 and x86_64)
Hello Javet
-----------
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 = "2.2.0"
version = "2.2.1"

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="2.2.0"
android:versionName="2.2.1"
>

</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>2.2.0</version>
<version>2.2.1</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>2.2.0</tag>
<tag>2.2.1</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 = "2.2.0"
version = "2.2.1"

dependencies {
testImplementation("org.eclipse.jetty.websocket:websocket-server:9.4.49.v20220914")
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=2.2.0
JAVET_VERSION=2.2.1
rm -rf build
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion cpp/build-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Usage for V8: sh build-linux.sh -DV8_DIR=${HOME}/v8
# Usage for Node: sh build-linux.sh -DNODE_DIR=${HOME}/node
JAVET_VERSION=2.2.0
JAVET_VERSION=2.2.1
rm -rf build
mkdir build
cd build
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=2.2.0
JAVET_VERSION=2.2.1
rm -rf build
mkdir build
cd build
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=2.2.0
SET JAVET_VERSION=2.2.1
rd /s/q build
mkdir build
cd build
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 2,2,0,0
PRODUCTVERSION 2,2,0,0
FILEVERSION 2,2,1,0
PRODUCTVERSION 2,2,1,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", "2.2.0.0"
VALUE "InternalName", "libjavet-node-windows-x86_64.v.2.2.0.dll"
VALUE "FileVersion", "2.2.1.0"
VALUE "InternalName", "libjavet-node-windows-x86_64.v.2.2.1.dll"
VALUE "LegalCopyright", "Copyright (C) 2021"
VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.2.2.0.dll"
VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.2.2.1.dll"
VALUE "ProductName", "Javet Windows"
VALUE "ProductVersion", "2.2.0.0"
VALUE "ProductVersion", "2.2.1.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 2,2,0,0
PRODUCTVERSION 2,2,0,0
FILEVERSION 2,2,1,0
PRODUCTVERSION 2,2,1,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", "2.2.0.0"
VALUE "InternalName", "libjavet-v8-windows-x86_64.v.2.2.0.dll"
VALUE "FileVersion", "2.2.1.0"
VALUE "InternalName", "libjavet-v8-windows-x86_64.v.2.2.1.dll"
VALUE "LegalCopyright", "Copyright (C) 2021"
VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.2.2.0.dll"
VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.2.2.1.dll"
VALUE "ProductName", "Javet Windows"
VALUE "ProductVersion", "2.2.0.0"
VALUE "ProductVersion", "2.2.1.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:2.2.0 -f docker/android/base.Dockerfile .
# Usage: docker build -t sjtucaocao/javet-android:2.2.1 -f docker/android/base.Dockerfile .

ARG JAVET_V8_VERSION=11.4.183.14
ARG JAVET_V8_VERSION=11.5.150.12

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:2.2.0
FROM sjtucaocao/javet-android:2.2.1
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:2.2.0 -f docker/linux-arm64/base_all_in_one.Dockerfile .
# Usage: docker build -t sjtucaocao/javet-arm64:2.2.1 -f docker/linux-arm64/base_all_in_one.Dockerfile .

ARG JAVET_NODE_VERSION=18.15.0
ARG JAVET_V8_VERSION=11.4.183.14
ARG JAVET_V8_VERSION=11.5.150.12

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-2.2.0 \
# -t sjtucaocao/javet:arm64-2.2.1 \
# --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.4.183.14 \
# -t sjtucaocao/javet:arm64-base-v8_11.5.150.12 \
# --build-arg JAVET_REPO=sjtucaocao/javet \
# --build-arg JAVET_V8_VERSION=11.4.183.14 \
# --build-arg JAVET_V8_VERSION=11.5.150.12 \
# -f docker/linux-arm64/base_v8.Dockerfile .

ARG JAVET_REPO=sjtucaocao/javet
ARG JAVET_V8_VERSION=11.4.183.14
ARG JAVET_V8_VERSION=11.5.150.12

FROM ${JAVET_REPO}:arm64-base-jvm

Expand Down
4 changes: 2 additions & 2 deletions docker/linux-arm64/build_artifact.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=2.2.0 \
# --build-arg JAVET_VERSION=2.2.1 \
# -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=2.2.0
ARG JAVET_VERSION=2.2.1

FROM ${JAVET_REPO}:arm64-base-node_${JAVET_NODE_VERSION} as base-node

Expand Down
6 changes: 3 additions & 3 deletions docker/linux-x86_64/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:2.2.0 -f docker/linux-x86_64/base_all_in_one.Dockerfile .
# Usage: docker build -t sjtucaocao/javet:2.2.1 -f docker/linux-x86_64/base_all_in_one.Dockerfile .

ARG JAVET_NODE_VERSION=18.16.0
ARG JAVET_V8_VERSION=11.4.183.14
ARG JAVET_NODE_VERSION=18.16.1
ARG JAVET_V8_VERSION=11.5.150.12

FROM ubuntu:20.04
WORKDIR /
Expand Down
2 changes: 1 addition & 1 deletion docker/linux-x86_64/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:x86_64-2.2.0 \
# -t sjtucaocao/javet:x86_64-2.2.1 \
# --build-arg JAVET_REPO=sjtucaocao/javet \
# -f docker/linux-x86_64/base_gradle.Dockerfile .

Expand Down
6 changes: 3 additions & 3 deletions docker/linux-x86_64/base_node.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:x86_64-base-node_18.16.0 \
# -t sjtucaocao/javet:x86_64-base-node_18.16.1 \
# --build-arg JAVET_REPO=sjtucaocao/javet \
# --build-arg JAVET_NODE_VERSION=18.16.0 \
# --build-arg JAVET_NODE_VERSION=18.16.1 \
# -f docker/linux-x86_64/base_node.Dockerfile .

ARG JAVET_REPO=sjtucaocao/javet
ARG JAVET_NODE_VERSION=18.16.0
ARG JAVET_NODE_VERSION=18.16.1

FROM ${JAVET_REPO}:x86_64-base-jvm

Expand Down
6 changes: 3 additions & 3 deletions docker/linux-x86_64/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:x86_64-base-v8_11.4.183.14 \
# -t sjtucaocao/javet:x86_64-base-v8_11.5.150.12 \
# --build-arg JAVET_REPO=sjtucaocao/javet \
# --build-arg JAVET_V8_VERSION=11.4.183.14 \
# --build-arg JAVET_V8_VERSION=11.5.150.12 \
# -f docker/linux-x86_64/base_v8.Dockerfile .

ARG JAVET_REPO=sjtucaocao/javet
ARG JAVET_V8_VERSION=11.4.183.14
ARG JAVET_V8_VERSION=11.5.150.12

FROM ${JAVET_REPO}:x86_64-base-jvm

Expand Down
2 changes: 1 addition & 1 deletion docker/linux-x86_64/build_all_in_one.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Usage: docker build -t javet:local -f docker/linux-x86_64/build_all_in_one.Dockerfile .

FROM sjtucaocao/javet:2.2.0
FROM sjtucaocao/javet:2.2.1
WORKDIR /

# Copy Javet
Expand Down
4 changes: 2 additions & 2 deletions docker/linux-x86_64/build_artifact.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=2.2.0 \
# --build-arg JAVET_VERSION=2.2.1 \
# -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=2.2.0
ARG JAVET_VERSION=2.2.1

FROM ${JAVET_REPO}:x86_64-base-node_${JAVET_NODE_VERSION} as base-v8

Expand Down
6 changes: 3 additions & 3 deletions docker/windows-x86_64/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
# 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:2.2.0 -m 4G -f docker/windows-x86_64/base.Dockerfile .
# Usage: docker build -t sjtucaocao/javet-windows:2.2.1 -m 4G -f docker/windows-x86_64/base.Dockerfile .

ARG JAVET_NODE_VERSION=18.16.0
ARG JAVET_V8_VERSION=11.4.183.14
ARG JAVET_NODE_VERSION=18.16.1
ARG JAVET_V8_VERSION=11.5.150.12

# https://hub.docker.com/_/microsoft-windows
FROM mcr.microsoft.com/windows:20H2-amd64
Expand Down
2 changes: 1 addition & 1 deletion docker/windows-x86_64/build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

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

FROM sjtucaocao/javet-windows:2.2.0
FROM sjtucaocao/javet-windows:2.2.1

SHELL ["cmd", "/S", "/C"]
WORKDIR /
Expand Down
Loading

0 comments on commit 44401b4

Please sign in to comment.