Skip to content

Commit 59ed66d

Browse files
committed
Possibly make VAqua inclusion work with Conveyor?
1 parent 06f6ca4 commit 59ed66d

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

conveyor.conf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ app {
2020
windows.inputs += TASK/rendered-icons/windows
2121
linux.inputs += TASK/rendered-icons/linux
2222

23+
windows.package-extras += {
24+
from = "desktop/lib/icudtl.dat"
25+
to = "bin/icudtl.dat"
26+
}
27+
2328
license = "MIT"
2429

2530
vcs-url = "https://github.com/zacharee/SamloaderKotlin"
@@ -30,13 +35,10 @@ app {
3035
modules += -java.annotation
3136

3237
system-properties {
33-
dwmapi.nativeLibraryPath = system
34-
skiko.nativeLibraryPath = system
35-
skiko-windows.nativeLibraryPath = system
36-
skiko-windows-arm64.nativeLibraryPath = system
38+
skiko.library.path = <libpath>
3739
}
3840

39-
extract-native-libraries = false
41+
extract-native-libraries = true
4042
}
4143

4244
site {

desktop/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ kotlin {
3535
dependencies {
3636
implementation(project(":common"))
3737

38-
implementation(files("lib/VAqua.jar"))
38+
implementation(libs.vaqua)
3939
}
4040
}
4141
}
@@ -152,9 +152,9 @@ dependencies {
152152
linuxAarch64(compose.desktop.linux_arm64)
153153
linuxAmd64(compose.desktop.linux_x64)
154154
macAarch64(compose.desktop.macos_arm64)
155-
macAarch64(files("lib/VAqua.jar"))
155+
macAarch64(libs.vaqua)
156156
macAmd64(compose.desktop.macos_x64)
157-
macAmd64(files("lib/VAqua.jar"))
157+
macAmd64(libs.vaqua)
158158
windowsAarch64(compose.desktop.windows_arm64)
159159
windowsAmd64(compose.desktop.windows_x64)
160160
}

desktop/lib/VAqua.jar

-2.48 MB
Binary file not shown.

desktop/lib/icudtl.dat

9.98 MB
Binary file not shown.

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ oshi = "6.7.1"
3939
richeditorCompose = "1.0.0-rc12"
4040
semver = "2.0.0"
4141
slf4j = "2.0.17"
42+
vaqua = "13"
4243
windowStyler = "0.3.3-SNAPSHOT"
4344

4445
[libraries]
@@ -85,6 +86,7 @@ oshi-core = { module = "com.github.oshi:oshi-core", version.ref = "oshi" }
8586
richeditor-compose = { module = "com.mohamedrejeb.richeditor:richeditor-compose", version.ref = "richeditorCompose" }
8687
semver = { module = "io.github.z4kn4fein:semver", version.ref = "semver" }
8788
slf4j = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
89+
vaqua = { module = "org.violetlib:vaqua", version.ref = "vaqua" }
8890
window-styler = { module = "com.mayakapps.compose:window-styler", version.ref = "windowStyler" }
8991
zwander-composedialog = { module = "dev.zwander:composedialog", version.ref = "composedialog" }
9092
zwander-materialyou = { module = "dev.zwander:materialyou", version.ref = "materialyou" }

0 commit comments

Comments
 (0)