Skip to content

Commit aaf5170

Browse files
committed
chore: dep updates and add chicory
1 parent cfdda22 commit aaf5170

File tree

6 files changed

+39
-16
lines changed

6 files changed

+39
-16
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: 🕸 Deploy Wasm, Js & Compose webapp to Github Pages
124124
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
125-
uses: JamesIves/[email protected].8
125+
uses: JamesIves/[email protected].9
126126
with:
127127
branch: gh-pages
128128
folder: backend/jvm/build/resources/main/app
@@ -132,7 +132,7 @@ jobs:
132132

133133
- name: 📡 Publish documentation to Github Pages
134134
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
135-
uses: JamesIves/[email protected].8
135+
uses: JamesIves/[email protected].9
136136
with:
137137
branch: gh-pages
138138
folder: build/dokka/html
@@ -142,7 +142,7 @@ jobs:
142142

143143
- name: 🏖️ Publish coverage report to Github Pages
144144
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
145-
uses: JamesIves/[email protected].8
145+
uses: JamesIves/[email protected].9
146146
with:
147147
branch: gh-pages
148148
folder: build/reports/kover/html
@@ -152,7 +152,7 @@ jobs:
152152

153153
- name: 🧪️ Publish test report to Github Pages
154154
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
155-
uses: JamesIves/[email protected].8
155+
uses: JamesIves/[email protected].9
156156
with:
157157
branch: gh-pages
158158
folder: build/reports/allTests

backend/jvm/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ dependencies {
205205
implementation(libs.hikariCP)
206206
implementation(libs.sherlock.sql)
207207

208+
// Wasm
209+
implementation(libs.chicory)
210+
implementation(libs.chicory.aot)
211+
208212
// Templating
209213
jteGenerate(libs.jte.models)
210214
implementation(libs.jte.runtime)

backend/jvm/src/main/kotlin/dev/suresh/routes/Service.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import dev.suresh.lang.FFM
66
import dev.suresh.lang.VThread
77
import dev.suresh.log.RespLogger
88
import dev.suresh.plugins.custom.CookieSession
9+
import dev.suresh.wasm.wasm
910
import io.github.oshai.kotlinlogging.KLogger
1011
import io.github.oshai.kotlinlogging.KotlinLogging
1112
import io.ktor.http.*
@@ -40,6 +41,8 @@ fun Routing.services() {
4041
call.respondText("Current Session: $session")
4142
}
4243
}
44+
45+
wasm()
4346
}
4447

4548
@WithSpan suspend fun mediaApiCall() = MediaApiClient().images().size
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package dev.suresh.wasm
2+
3+
import io.ktor.server.response.respondText
4+
import io.ktor.server.routing.Routing
5+
import io.ktor.server.routing.get
6+
7+
fun Routing.wasm() {
8+
get("/wasm") { call.respondText("WASM: WebAssembly") }
9+
}
10+
11+
// https://github.com/extism/plugins/releases

gradle/libs.versions.toml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
22
java = "24"
33
kotlin = "2.1.0-RC"
4-
kotlin-ksp = "2.1.0-RC-1.0.26"
4+
kotlin-ksp = "2.1.0-RC-1.0.27"
55
kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "2.1"
88
kotlin-lang-version = "2.1"
9-
gradle = "8.11-rc-2"
9+
gradle = "8.11"
1010
java-vendor = "Oracle"
1111
java-jvmArguments = "--enable-preview"
1212
java-addModules = "jdk.incubator.vector"
@@ -36,7 +36,7 @@ kotlinx-metadata = "0.9.0"
3636
kotlinx-reflect-lite = "1.1.0"
3737
kotlinx-bcv = "0.16.3"
3838
kotlin-dokka = "2.0.0-Beta"
39-
kotlin-wrappers = "1.0.0-pre.824"
39+
kotlin-wrappers = "1.0.0-pre.829"
4040
kotlin-redacted = "1.11.0-alpha01"
4141
kotlinx-multik = "0.2.3"
4242
kotlinx-dataframe = "0.13.1"
@@ -46,7 +46,7 @@ kopy = "0.12.0+2.0.21"
4646
poko = "0.17.2"
4747
mappie = "0.8.0"
4848
akkurate = "0.10.0"
49-
kaml = "0.62.2"
49+
kaml = "0.63.0"
5050
snakeyaml-engine-kmp = "3.0.3"
5151
konsist = "0.16.1"
5252
karakum = "1.0.0-alpha.40-K2"
@@ -55,7 +55,7 @@ spring-boot = "3.3.5"
5555
spring-depmgmt = "1.1.6"
5656
ktor = "3.0.1"
5757
ktor-cohort = "2.6.0"
58-
otel = "1.43.0"
58+
otel = "1.44.1"
5959
otel-instr = "2.9.0"
6060
otel-instr-alpha = "2.9.0-alpha"
6161
otel-semconv = "1.28.0-alpha"
@@ -74,7 +74,7 @@ cache4k = "0.13.0"
7474
intellij-coverage = "1.0.754"
7575
intellij-markdown = "0.7.3"
7676
jgit = "7.0.0.202409031743-r"
77-
jte = "3.1.13"
77+
jte = "3.1.14"
7878
jimfs = "1.3.0"
7979
sshj = "0.39.0"
8080
jsch = "0.2.21"
@@ -125,7 +125,7 @@ webjars-xterm = "5.1.0"
125125
arrow-suspendapp = "0.4.1-alpha.5"
126126
exposed = "0.56.0"
127127
postgresql = "42.7.4"
128-
hikariCP = "6.0.0"
128+
hikariCP = "6.1.0"
129129
h2 = "2.3.232"
130130
micrometer = "1.13.3"
131131
swagger-ui = "5.17.14"
@@ -142,7 +142,7 @@ apache-commons-imaging = "1.0-alpha3"
142142
testcontainers = "1.20.3"
143143
sourceBuddy = "2.5.0"
144144
tcp-javanioproxy = "1.6"
145-
kubernetes-client = "21.0.2"
145+
kubernetes-client = "22.0.0"
146146
reflect-typeparamresolver = "1.0.2"
147147
reflect-typetools = "0.6.3"
148148
async-profiler = "3.0"
@@ -159,12 +159,12 @@ xchart = "3.8.7"
159159
batik = "1.18"
160160
twelvemonkeys = "3.12.0"
161161
okapibarcode = "0.4.1"
162-
chasm = "0.7.1"
162+
chasm = "0.9.2"
163163
kfswatch = "1.3.0"
164164
langchain4j = "0.35.0"
165165
jlama = "0.8.2"
166166
ldaptive = "2.3.2"
167-
chicory = "0.0.12"
167+
chicory = "1.0.0-M1"
168168

169169
# Compose
170170
jetbrains-compose = "1.7.0"
@@ -194,6 +194,7 @@ gradle-develocity = "3.18.1"
194194
nmcp = "0.0.9"
195195
nexus-publish = "2.0.0"
196196
vanniktech-publish = "0.30.0"
197+
gradle-publish = "1.3.0"
197198
shadow = "8.3.5"
198199
spotless = "7.0.0.BETA4"
199200
semver-plugin = "0.8.0"
@@ -251,6 +252,7 @@ build-jte-plugin = { module = "gg.jte:jte-gradle-plugin"
251252
build-nmcp-plugin = { module = "com.gradleup.nmcp:nmcp" , version.ref = "nmcp"}
252253
build-nexus-plugin = { module = "io.github.gradle-nexus:publish-plugin" , version.ref = "nexus-publish"}
253254
build-vanniktech-publish = { module = "com.vanniktech:gradle-maven-publish-plugin" , version.ref = "vanniktech-publish"}
255+
build-gradle-publish = { module = "com.gradle.publish:plugin-publish-plugin" , version.ref = "gradle-publish"}
254256
build-spotless-plugin = { module = "com.diffplug.spotless:spotless-plugin-gradle" , version.ref = "spotless"}
255257
build-shadow-plugin = { module = "com.gradleup.shadow:shadow-gradle-plugin" , version.ref = "shadow"}
256258
build-tasktree = { module = "com.dorongold.plugins:task-tree" , version.ref = "tasktree" }
@@ -409,7 +411,6 @@ uri-kmp = { module = "com.eygraber:uri-kmp"
409411
kotlinx-jsonpath = { module = "com.eygraber:jsonpathkt-kotlinx" , version.ref = "kotlinx-jsonpath"}
410412
kotlinx-json-schema = { module = "io.github.optimumcode:json-schema-validator" , version.ref = "kotlinx-json-schema"}
411413
urlencoder = { module = "net.thauvin.erik.urlencoder:urlencoder-lib" , version.ref = "urlencoder"}
412-
chasm = { module = "io.github.charlietap.chasm:chasm" , version.ref = "chasm"}
413414

414415
logback-classic = { module = "ch.qos.logback:logback-classic" , version.ref = "logback"}
415416
exposeb-bom = { module = "org.jetbrains.exposed:exposed-bom" , version.ref = "exposed"}
@@ -606,6 +607,9 @@ kfswatch = { module = "io.github.irgaly.kfswatch:kfs
606607

607608
# Wasm
608609
chicory = { module = "com.dylibso.chicory:runtime" , version.ref = "chicory" }
610+
chicory-aot = { module = "com.dylibso.chicory:aot-experimental" , version.ref = "chicory" }
611+
chicory-hostmodule-annproc = { module = "com.dylibso.chicory:host-module-annotations-experimental" , version.ref = "chicory" }
612+
chasm = { module = "io.github.charlietap.chasm:chasm" , version.ref = "chasm" }
609613

610614
# AI/ML
611615
langchain4j = { module = "dev.langchain4j:langchain4j" , version.ref = "langchain4j" }
@@ -666,6 +670,7 @@ graalvm-nativeimage = { id = "org.graalvm.buildtools.native"
666670
buildkonfig = { id = "com.codingfeline.buildkonfig" , version.ref = "buildkonfig"}
667671
detekt = { id = "io.github.detekt.gradle.compiler-plugin" , version.ref = "detekt"}
668672
vanniktech-publish = { id = "com.vanniktech.maven.publish" , version.ref = "vanniktech-publish" }
673+
gradle-publish = { id = "com.gradle.plugin-publish" , version.ref = "gradle-publish" }
669674
kobweb-application = { id = "com.varabyte.kobweb.application" , version.ref = "kobweb" }
670675
kobweb-library = { id = "com.varabyte.kobweb.library" , version.ref = "kobweb" }
671676
kobwebx-markdown = { id = "com.varabyte.kobwebx.markdown" , version.ref = "kobweb" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-rc-2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)