Skip to content

Commit c876418

Browse files
committed
🐳 chore: Upgrade Javet to v4.0.0
1 parent 2615fe2 commit c876418

File tree

2 files changed

+46
-15
lines changed

2 files changed

+46
-15
lines changed

build.gradle.kts

+45-14
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,17 @@ object Config {
4747
}
4848

4949
object Projects {
50-
const val JAVET = "com.caoccao.javet:javet:${Versions.JAVET}"
51-
const val JAVET_LINUX_ARM64 = "com.caoccao.javet:javet-linux-arm64:${Versions.JAVET}"
52-
const val JAVET_MACOS = "com.caoccao.javet:javet-macos:${Versions.JAVET}"
50+
const val JAVET = "com.caoccao.javet:javet-core:${Versions.JAVET}"
51+
const val JAVET_NODE_LINUX_ARM64 = "com.caoccao.javet:javet-node-linux-arm64:${Versions.JAVET}"
52+
const val JAVET_NODE_LINUX_X86_64 = "com.caoccao.javet:javet-node-linux-x86_64:${Versions.JAVET}"
53+
const val JAVET_NODE_MACOS_ARM64 = "com.caoccao.javet:javet-node-macos-arm64:${Versions.JAVET}"
54+
const val JAVET_NODE_MACOS_X86_64 = "com.caoccao.javet:javet-node-macos-x86_64:${Versions.JAVET}"
55+
const val JAVET_NODE_WINDOWS_X86_64 = "com.caoccao.javet:javet-node-windows-x86_64:${Versions.JAVET}"
56+
const val JAVET_V8_LINUX_ARM64 = "com.caoccao.javet:javet-v8-linux-arm64:${Versions.JAVET}"
57+
const val JAVET_V8_LINUX_X86_64 = "com.caoccao.javet:javet-v8-linux-x86_64:${Versions.JAVET}"
58+
const val JAVET_V8_MACOS_ARM64 = "com.caoccao.javet:javet-v8-macos-arm64:${Versions.JAVET}"
59+
const val JAVET_V8_MACOS_X86_64 = "com.caoccao.javet:javet-v8-macos-x86_64:${Versions.JAVET}"
60+
const val JAVET_V8_WINDOWS_X86_64 = "com.caoccao.javet:javet-v8-windows-x86_64:${Versions.JAVET}"
5361

5462
// https://mvnrepository.com/artifact/com.caoccao.javet.buddy/javet-buddy
5563
const val JAVET_BUDDY = "com.caoccao.javet.buddy:javet-buddy:${Versions.JAVET_BUDDY}"
@@ -67,9 +75,9 @@ object Config {
6775
object Versions {
6876
const val BYTE_BUDDY = "1.14.10"
6977
const val JAVA_VERSION = "1.8"
70-
const val JAVET = "3.1.8"
78+
const val JAVET = "4.0.0"
7179
const val JAVET_BUDDY = "0.2.0"
72-
const val JAVENODE = "0.8.0"
80+
const val JAVENODE = "0.9.0"
7381
const val JUNIT = "5.10.1"
7482
const val VERTX = "4.4.6"
7583
}
@@ -104,15 +112,38 @@ java {
104112
dependencies {
105113
val os = OperatingSystem.current()
106114
val cpuArch = System.getProperty("os.arch")
107-
if (os.isMacOsX) {
108-
compileOnly(Config.Projects.JAVET_MACOS)
109-
testImplementation(Config.Projects.JAVET_MACOS)
110-
} else if (os.isLinux && (cpuArch == "aarch64" || cpuArch == "arm64")) {
111-
compileOnly(Config.Projects.JAVET_LINUX_ARM64)
112-
testImplementation(Config.Projects.JAVET_LINUX_ARM64)
113-
} else {
114-
compileOnly(Config.Projects.JAVET)
115-
testImplementation(Config.Projects.JAVET)
115+
val isArm64 = cpuArch == "aarch64" || cpuArch == "arm64";
116+
compileOnly(Config.Projects.JAVET)
117+
testImplementation(Config.Projects.JAVET)
118+
if (os.isLinux) {
119+
if (isArm64) {
120+
compileOnly(Config.Projects.JAVET_NODE_LINUX_ARM64)
121+
testImplementation(Config.Projects.JAVET_NODE_LINUX_ARM64)
122+
compileOnly(Config.Projects.JAVET_V8_LINUX_ARM64)
123+
testImplementation(Config.Projects.JAVET_V8_LINUX_ARM64)
124+
} else {
125+
compileOnly(Config.Projects.JAVET_NODE_LINUX_X86_64)
126+
testImplementation(Config.Projects.JAVET_NODE_LINUX_X86_64)
127+
compileOnly(Config.Projects.JAVET_V8_LINUX_X86_64)
128+
testImplementation(Config.Projects.JAVET_V8_LINUX_X86_64)
129+
}
130+
} else if (os.isMacOsX) {
131+
if (isArm64) {
132+
compileOnly(Config.Projects.JAVET_NODE_MACOS_ARM64)
133+
testImplementation(Config.Projects.JAVET_NODE_MACOS_ARM64)
134+
compileOnly(Config.Projects.JAVET_V8_MACOS_ARM64)
135+
testImplementation(Config.Projects.JAVET_V8_MACOS_ARM64)
136+
} else {
137+
compileOnly(Config.Projects.JAVET_NODE_MACOS_X86_64)
138+
testImplementation(Config.Projects.JAVET_NODE_MACOS_X86_64)
139+
compileOnly(Config.Projects.JAVET_V8_MACOS_X86_64)
140+
testImplementation(Config.Projects.JAVET_V8_MACOS_X86_64)
141+
}
142+
} else if (os.isWindows && !isArm64) {
143+
compileOnly(Config.Projects.JAVET_NODE_WINDOWS_X86_64)
144+
testImplementation(Config.Projects.JAVET_NODE_WINDOWS_X86_64)
145+
compileOnly(Config.Projects.JAVET_V8_WINDOWS_X86_64)
146+
testImplementation(Config.Projects.JAVET_V8_WINDOWS_X86_64)
116147
}
117148
implementation(Config.Projects.JAVET_BUDDY)
118149
implementation(Config.Projects.VERTX)

scripts/ts/change-version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,5 @@ class ChangeVersion {
103103
}
104104
}
105105

106-
const changeVersion = new ChangeVersion("0.8.0", "0.8.0");
106+
const changeVersion = new ChangeVersion("0.8.0", "0.9.0");
107107
changeVersion.change();

0 commit comments

Comments
 (0)