Skip to content

Commit

Permalink
🍰 Javet v2.1.1 (#236)
Browse files Browse the repository at this point in the history
* Upgraded V8 to `v11.2.214.13` (2023-04-04)
* Added dockerfiles for building Linux arm64 binaries
* Upgraded C++ standard to 20
* Fixed a bug in closing Node.js runtime
  • Loading branch information
caoccao authored Apr 6, 2023
1 parent 7cbebda commit 6ff77b2
Show file tree
Hide file tree
Showing 483 changed files with 31,329 additions and 80,174 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux_build_artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
JAVET_NODE_VERSION: 18.15.0
JAVET_V8_VERSION: 11.1.277.14
JAVET_VERSION: 2.1.0
JAVET_V8_VERSION: 11.2.214.13
JAVET_VERSION: 2.1.1

jobs:
javet_linux_x86_64:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux_build_node_v8_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
JAVET_NODE_VERSION: 18.15.0
JAVET_V8_VERSION: 11.1.277.14
JAVET_VERSION: 2.1.0
JAVET_V8_VERSION: 11.2.214.13
JAVET_VERSION: 2.1.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
12 changes: 6 additions & 6 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.15.0`` + V8 ``v11.1.277.14``
* Node.js ``v18.15.0`` + V8 ``v11.2.214.13``
* 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,7 +58,7 @@ Maven
<dependency>
<groupId>com.caoccao.javet</groupId>
<artifactId>javet</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
</dependency>
<!-- Mac OS (x86_64 and arm64) -->
Expand All @@ -73,18 +73,18 @@ Gradle Kotlin DSL

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

.. code-block:: groovy
implementation 'com.caoccao.javet:javet:2.1.0' // Linux and Windows (x86_64)
implementation 'com.caoccao.javet:javet:2.1.1' // Linux and Windows (x86_64)
implementation 'com.caoccao.javet:javet-macos:2.1.0' // Mac OS (x86_64 and arm64)
implementation 'com.caoccao.javet:javet-android:2.1.0' // Android (arm, arm64, x86 and x86_64)
implementation 'com.caoccao.javet:javet-android:2.1.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.1.0"
version = "2.1.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.1.0"
android:versionName="2.1.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.1.0</version>
<version>2.1.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.1.0</tag>
<tag>2.1.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.1.0"
version = "2.1.1"

dependencies {
testImplementation("org.eclipse.jetty.websocket:websocket-server:9.4.49.v20220914")
Expand Down
5 changes: 2 additions & 3 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2021 caoccao.com Sam Cao
# Copyright (c) 2021-2023 caoccao.com Sam Cao
# All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -75,8 +75,8 @@ if(DEFINED ENABLE_LOGGING)
endif()

# Preparation
set(CMAKE_CXX_STANDARD 20)
if(DEFINED V8_DIR)
set(CMAKE_CXX_STANDARD 20)
if(CMAKE_SYSTEM_NAME STREQUAL "Android")
if(CMAKE_ANDROID_ARCH STREQUAL "arm64")
set(V8_RELEASE_DIR ${V8_DIR}/out.gn/arm64.release)
Expand Down Expand Up @@ -107,7 +107,6 @@ if(DEFINED V8_DIR)
set(JAVET_LIB_TYPE "v8")
endif()
if(DEFINED NODE_DIR)
set(CMAKE_CXX_STANDARD 17)
list(APPEND includeDirs
${NODE_DIR}/deps/uv/include
${NODE_DIR}/deps/v8
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.1.0
JAVET_VERSION=2.1.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.1.0
JAVET_VERSION=2.1.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.1.0
JAVET_VERSION=2.1.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.1.0
SET JAVET_VERSION=2.1.1
rd /s/q build
mkdir build
cd build
Expand Down
Loading

0 comments on commit 6ff77b2

Please sign in to comment.