Skip to content

Commit af19fb4

Browse files
committed
🐳 chore: Upgrade Javet and swc4j
1 parent cbca687 commit af19fb4

3 files changed

Lines changed: 7 additions & 14 deletions

File tree

.github/workflows/console_build.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,15 @@ jobs:
3333
- name: Linux x86_64
3434
image: ubuntu-latest
3535
jar_name: linux-x86-64
36-
zip_exclude_files: "*.dll *arm64*.so *.dylib"
3736
- name: MacOS x86_64
3837
image: macos-13
3938
jar_name: macos-x86-64
40-
zip_exclude_files: "*.dll *.so *arm64*.dylib"
4139
- name: MacOS arm64
4240
image: macos-14
4341
jar_name: macos-arm64
44-
zip_exclude_files: "*.dll *.so *x86_64*.dylib"
4542
- name: Windows x86_64
4643
image: windows-latest
4744
jar_name: windows-x86-64
48-
zip_exclude_files: "*arm64*.dll *.dylib *.so"
4945

5046
name: Build Jar for ${{ matrix.name }}
5147
runs-on: ${{ matrix.image }}
@@ -70,11 +66,6 @@ jobs:
7066
cd console
7167
gradle build --debug
7268
73-
- name: Remove Binary Files for MacOS
74-
if: matrix.name == 'MacOS x86_64' || matrix.name == 'MacOS arm64'
75-
run: |
76-
7z d console/build/libs/*.jar ${{ matrix.zip_exclude_files }}
77-
7869
- name: Upload the Artifact
7970
uses: actions/upload-artifact@v4
8071
with:

console/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ object Config {
3434
const val JAVET_BUDDY = "com.caoccao.javet.buddy:javet-buddy:${Versions.JAVET_BUDDY}"
3535

3636
const val JAVET_SWC4J = "com.caoccao.javet:swc4j:${Versions.JAVET_SWC4J}"
37+
const val JAVET_SWC4J_BIN = "com.caoccao.javet:swc4j"
3738

3839
const val JAVENODE = "com.caoccao.javet:javenode:${Versions.JAVENODE}"
3940

@@ -63,13 +64,13 @@ object Config {
6364

6465
object Versions {
6566
const val BYTE_BUDDY = "1.15.5"
66-
const val JAVET = "4.1.1"
67+
const val JAVET = "4.1.4"
6768
const val JAVET_BUDDY = "0.4.0"
6869
const val JAVET_SHELL = "0.1.0"
69-
const val JAVET_SWC4J = "1.4.0"
70+
const val JAVET_SWC4J = "1.6.0"
7071
const val JAVENODE = "0.8.0"
7172
const val JETTY_WEBSOCKET = "9.4.53.v20231009"
72-
const val JUNIT = "5.10.1"
73+
const val JUNIT = "5.12.2"
7374
const val KOTLIN_STDLIB_JDK8 = "1.9.21"
7475
const val KOTLINX_CLI = "0.3.6"
7576
const val VERTX = "4.5.0"
@@ -104,6 +105,7 @@ dependencies {
104105
implementation("${Config.Projects.JAVET_V8}-$osType-$archType:${Config.Versions.JAVET}")
105106
implementation(Config.Projects.JAVET_BUDDY)
106107
implementation(Config.Projects.JAVET_SWC4J)
108+
implementation("${Config.Projects.JAVET_SWC4J_BIN}-$osType-$archType:${Config.Versions.JAVET_SWC4J}")
107109
implementation(Config.Projects.JAVENODE)
108110
implementation(Config.Projects.JETTY_JAVAX_WEBSOCKET_SERVER_IMPL)
109111
implementation(Config.Projects.JETTY_WEBSOCKET_SERVER)

docker/console.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2021-2024. caoccao.com Sam Cao
1+
# Copyright (c) 2021-2025. caoccao.com Sam Cao
22
# All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,7 @@ RUN gradle build
3535
# Build Cache
3636
WORKDIR /console/build/libs
3737
RUN unzip ./javet-shell-${VERSION}.jar 'libjavet-*.so'
38-
RUN zip -d ./javet-shell-${VERSION}.jar *.dll *.dylib libjavet-*.so
38+
RUN zip -d ./javet-shell-${VERSION}.jar libjavet-*.so
3939

4040
# Build Shell Scripts
4141
WORKDIR /console/build/libs

0 commit comments

Comments
 (0)