Skip to content

Commit e7f4c4c

Browse files
committed
chore: general version upgrades/fixes
Signed-off-by: Sam Gammon <sam@elide.ventures>
1 parent d7d3edf commit e7f4c4c

File tree

4 files changed

+18
-55
lines changed

4 files changed

+18
-55
lines changed

gradle/elide.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ kotlinx-collections = "0.4-wasm1"
135135
kotlinx-coroutines = "1.9.0-RC"
136136
kotlinx-datetime = "0.6.0"
137137
kotlinx-html = "0.11.0"
138-
kotlinx-io = "0.3.5"
138+
kotlinx-io = "0.4.0"
139139
kotlinx-knit = "0.5.0"
140140
kotlinx-metadata = "0.9.0"
141141
kotlinx-metadata-jvm = "0.6.0"
142142
kotlinx-nodejs = "0.0.7"
143-
kotlinx-serialization = "1.7.0-RC"
143+
kotlinx-serialization = "1.7.0"
144144
kotlinx-wrappers-bom = "1.0.0-pre.754"
145145
kotlinx-wrappers-browser = "1.0.0-pre.754"
146146
kotlinx-wrappers-cesium = "1.114.0-pre.754"
@@ -198,7 +198,7 @@ micronaut-xml = "3.1.0"
198198
mockito-bom = "5.10.0"
199199
mockito-junit = "5.10.0"
200200
mordant = "2.4.0"
201-
mosaic = "0.12.0"
201+
mosaic = "0.13.0"
202202
mrjar = "0.1.1"
203203
msgpack = "0.9.4"
204204
netty = "4.1.110.Final"

gradle/mn-override.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22
jackson = "2.16.1"
3-
micronaut-core = "4.5.1"
4-
micronaut-core-processor = "4.5.1"
5-
micronaut-context = "4.5.1"
6-
micronaut-graal = "4.5.1"
7-
micronaut-inject = "4.5.1"
8-
micronaut-inject-java = "4.5.1"
9-
micronaut-http = "4.5.1"
10-
micronaut-http-client = "4.5.1"
11-
micronaut-http-netty = "4.5.1"
12-
micronaut-http-server = "4.5.1"
13-
micronaut-runtime = "4.5.1"
14-
micronaut-runtime-osx = "4.5.1"
15-
micronaut-websocket = "4.5.1"
16-
micronaut-platform = "4.4.3"
3+
micronaut-core = "4.5.3"
4+
micronaut-core-processor = "4.5.3"
5+
micronaut-context = "4.5.3"
6+
micronaut-graal = "4.5.3"
7+
micronaut-inject = "4.5.3"
8+
micronaut-inject-java = "4.5.3"
9+
micronaut-http = "4.5.3"
10+
micronaut-http-client = "4.5.3"
11+
micronaut-http-netty = "4.5.3"
12+
micronaut-http-server = "4.5.3"
13+
micronaut-runtime = "4.5.3"
14+
micronaut-runtime-osx = "4.5.3"
15+
micronaut-websocket = "4.5.3"
16+
micronaut-platform = "4.5.0"
1717
micronaut-picocli = "5.4.0"

packages/graalvm-java/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@ dependencies {
5555
api(projects.packages.engine)
5656
implementation(libs.kotlinx.coroutines.core)
5757
implementation(projects.packages.graalvmJvm)
58-
implementation(libs.kotlin.scripting.common)
59-
implementation(libs.kotlin.scripting.dependencies)
60-
implementation(libs.kotlin.scripting.dependencies.maven)
61-
implementation(libs.kotlin.scripting.jvm)
62-
implementation(libs.kotlin.scripting.jvm.host)
63-
implementation(libs.kotlin.scripting.jvm.engine)
64-
implementation(libs.kotlin.compiler.embedded)
6558

6659
// Testing
6760
testImplementation(projects.packages.test)

packages/runtime/build.gradle.kts

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"UnstableApiUsage",
1717
)
1818

19-
import com.jakewharton.mosaic.gradle.MosaicExtension
2019
import io.micronaut.gradle.MicronautRuntime
2120
import org.apache.tools.ant.taskdefs.condition.Os
2221
import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
@@ -39,7 +38,7 @@ plugins {
3938

4039
kotlin("jvm")
4140
kotlin("kapt")
42-
// kotlin("plugin.compose")
41+
kotlin("plugin.compose")
4342
kotlin("plugin.serialization")
4443
alias(libs.plugins.buildConfig)
4544
alias(libs.plugins.micronaut.minimal.application)
@@ -48,28 +47,6 @@ plugins {
4847
alias(libs.plugins.elide.conventions)
4948
}
5049

51-
buildscript {
52-
repositories {
53-
maven {
54-
name = "elide-snapshots"
55-
url = uri("https://maven.elide.dev")
56-
content {
57-
includeGroup("dev.elide")
58-
includeGroup("org.capnproto")
59-
includeGroup("com.jakewharton.mosaic")
60-
}
61-
}
62-
maven {
63-
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
64-
}
65-
mavenCentral()
66-
google()
67-
}
68-
dependencies {
69-
classpath(libs.plugin.mosaic)
70-
}
71-
}
72-
7350
// Flags affecting this build script:
7451
//
7552
// - `elide.release`: true/false
@@ -239,10 +216,6 @@ val ktCompilerArgs = mutableListOf(
239216

240217
// opt-in to Elide's delicate runtime API
241218
"-opt-in=elide.runtime.core.DelicateElideApi",
242-
243-
// Fix: Suppress Kotlin version compatibility check for Compose plugin (applied by Mosaic).
244-
// Note: Re-enable this if the Kotlin version differs from what Compose/Mosaic expects.
245-
"-P=plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=2.0.0",
246219
)
247220

248221
elide {
@@ -307,9 +280,6 @@ sourceSets {
307280
}
308281
}
309282

310-
apply(plugin = "com.jakewharton.mosaic")
311-
the<MosaicExtension>().kotlinCompilerPlugin = libs.androidx.compose.compiler.get().toString()
312-
313283
val stamp = (project.properties["elide.stamp"] as? String ?: "false").toBooleanStrictOrNull() ?: false
314284
val cliVersion = if (stamp) {
315285
libs.versions.elide.asProvider().get()

0 commit comments

Comments
 (0)