Skip to content

Commit ea66ae2

Browse files
committed
chore: dep update and fix kotlin native container image
1 parent 2c02a6e commit ea66ae2

File tree

8 files changed

+73
-37
lines changed

8 files changed

+73
-37
lines changed

backend/native/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ kotlin {
2727
executable(setOf(RELEASE)) {
2828
entryPoint = "main"
2929

30-
// Fix for libcrypt.so.1 not found error on distroless
30+
// Fix for libcrypt.so.1 not-found error on distroless
3131
if (target.targetName.startsWith("linux")) {
3232
linkerOpts("--as-needed")
3333
freeCompilerArgs += "-Xoverride-konan-properties=linkerGccFlags.linux=-lgcc -lgcc_eh -lc"
@@ -67,8 +67,7 @@ kotlin {
6767

6868
jib {
6969
from {
70-
// image = "gcr.io/distroless/cc-debian12"
71-
image = "debian:stable-slim"
70+
image = "gcr.io/distroless/cc-debian12"
7271
platforms {
7372
platform {
7473
architecture = "arm64"

backend/native/src/nativeMain/kotlin/Main.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@ expect fun readPassword(prompt: String): String?
1717
fun main(args: Array<String>): Unit = runBlocking {
1818
println("Kotlin Native App: ${BuildConfig.version}")
1919
println(json.encodeToString(platform.info))
20+
2021
val count = args.firstOrNull()?.toIntOrNull() ?: 5
2122
timerComposeFlow().take(count).collect(::println)
23+
2224
println("Executing command...")
23-
execute("ls", "-l").also(::println)
25+
runCatching { execute("ls", "-l").also(::println) }
26+
.onFailure { println("Failed to execute command: ${it.message}") }
27+
2428
println("Reflection Simple name ${this::class.simpleName}")
2529
println("Reflection Simple name ${this::class.qualifiedName}")
2630
println(prop("Hello"))

compose/cmp/build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,16 @@ kotlin {
2828
implementation(compose.ui)
2929
implementation(compose.components.resources)
3030
implementation(compose.components.uiToolingPreview)
31-
// implementation(compose.materialIconsExtended)
31+
3232
implementation(libs.compose.navigation)
3333
implementation(libs.compose.lifecycle.viewmodel)
34+
implementation(libs.compose.material3.adaptive)
35+
implementation(libs.compose.material3.adaptive.layout)
36+
implementation(libs.compose.material3.adaptive.nav)
37+
implementation(libs.compose.material3.windowsize)
3438
implementation(libs.compose.kottie)
39+
40+
// implementation(compose.materialIconsExtended)
3541
// project.dependencies.detektPlugins(libs.detekt.compose.rules)
3642
}
3743

compose/cmp/src/commonMain/kotlin/ui/Image.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,15 @@ import androidx.compose.ui.draw.drawWithContent
1010
import androidx.compose.ui.graphics.*
1111
import androidx.compose.ui.graphics.layer.drawLayer
1212
import kotlinx.coroutines.launch
13+
import org.jetbrains.compose.resources.*
1314

14-
fun ByteArray.toImageBitmap(): ImageBitmap =
15-
org.jetbrains.skia.Image.makeFromEncoded(this).toComposeImageBitmap()
16-
15+
/**
16+
* Image decoders for [ByteArray]
17+
*
18+
* @see [JPEG, PNG, BMP, WEBP to ImageBitmap][ByteArray.decodeToImageBitmap]
19+
* @see [Vector XML file to an ImageVector][ByteArray.decodeToImageVector]
20+
* @see [SVG file to a compose Painter][ByteArray.decodeToSvgPainter]
21+
*/
1722
fun ImageBitmap.toByteArray(): ByteArray? = asSkiaBitmap().readPixels()
1823

1924
@Composable
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package ui.misc
2+
3+
import androidx.compose.foundation.layout.Box
4+
import androidx.compose.foundation.layout.fillMaxSize
5+
import androidx.compose.material3.Text
6+
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
7+
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
8+
import androidx.compose.runtime.Composable
9+
import androidx.compose.ui.Alignment
10+
import androidx.compose.ui.Modifier
11+
12+
@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
13+
@Composable
14+
fun WindowSizeClass() {
15+
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
16+
val size = calculateWindowSizeClass()
17+
Text("width = ${size.widthSizeClass}\nheight = ${size.heightSizeClass}")
18+
}
19+
}

gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,10 @@ tasks {
117117

118118
processResources {
119119
inputs.property("version", project.version.toString())
120-
filesMatching("*-res.txt") {
120+
filesMatching("**/*-res.txt") {
121121
expand(
122-
"name" to project.name,
122+
"name" to rootProject.name,
123+
"module" to project.name,
123124
"version" to project.version,
124125
)
125126
}

gradle/build-logic/src/main/kotlin/plugins/kotlin.mpp.gradle.kts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,13 @@ tasks {
135135

136136
withType<ProcessResources>().configureEach {
137137
inputs.property("version", project.version.toString())
138-
filesMatching("*-res.txt") {
138+
filesMatching("**/*-res.txt") {
139139
expand(
140-
"name" to project.name,
140+
"name" to rootProject.name,
141+
"module" to project.name,
141142
"version" to project.version,
142143
)
143144
}
144-
filesMatching("manifest.json") {
145-
expand(
146-
"name" to project.name,
147-
"version" to project.version.toString().substringBeforeLast("."),
148-
)
149-
}
150145
}
151146

152147
pluginManager.withPlugin("org.jetbrains.kotlinx.binary-compatibility-validator") {

gradle/libs.versions.toml

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ org-url = "https://suresh.dev"
2121

2222
# Gradle Dependencies Versions
2323
kotlinx-kover = "0.8.3"
24-
kotlinx-io = "0.5.2"
24+
kotlinx-io = "0.5.3"
2525
kotlinx-atomicfu = "0.25.0"
2626
kotlinx-coroutines = "1.9.0-RC.2"
27-
kotlinx-datetime = "0.6.0"
27+
kotlinx-datetime = "0.6.1"
2828
kotlinx-serialization = "1.7.1"
2929
kotlinx-rpc = "0.1.0"
3030
kotlinx-collections-immutable = "0.3.7"
@@ -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 = "1.9.20"
39-
kotlin-wrappers = "1.0.0-pre.793"
39+
kotlin-wrappers = "1.0.0-pre.795"
4040
kotlin-redacted = "1.9.0"
4141
kotlinx-multik = "0.2.3"
4242
kotlinx-dataframe = "0.13.1"
@@ -114,12 +114,12 @@ arrow-suspendapp = "0.4.1-alpha.5"
114114
exposed = "0.53.0"
115115
postgresql = "42.7.3"
116116
hikariCP = "5.1.0"
117-
h2 = "2.2.220"
117+
h2 = "2.3.232"
118118
micrometer = "1.13.2"
119119
swagger-ui = "5.17.14"
120120
hoplite = "2.8.0-RC1"
121121
config4k = "0.6.0"
122-
shedlock = "5.13.0"
122+
shedlock = "5.15.0"
123123
sherlock = "1.0.1"
124124
sqids = "0.1.0"
125125
tsid = "2.1.1"
@@ -134,9 +134,6 @@ konsist = "0.15.1"
134134
kubernetes-client = "21.0.1"
135135
reflect-typeparamresolver = "1.0.2"
136136
reflect-typetools = "0.6.3"
137-
compose-icons = "1.1.0"
138-
compose-routing = "0.2.14"
139-
kottie = "1.9.6"
140137
async-profiler = "3.0"
141138
ap-loader-all = "3.0-9"
142139
openjdk-jmc = "9.0.0"
@@ -157,6 +154,18 @@ langchain4j = "0.33.0"
157154
jlama = "0.2.1"
158155
chicory = "0.0.12"
159156

157+
# Compose
158+
jetbrains-compose = "1.7.0-alpha03"
159+
jetbrains-compose-viewmodel = "2.8.0"
160+
jetbrains-compose-nav = "2.8.0-alpha09"
161+
jetbrains-compose-adaptive = "1.0.0-alpha01"
162+
kobweb = "0.19.0"
163+
detekt = "1.23.6"
164+
detekt-compose-rules = "0.4.10"
165+
compose-icons = "1.1.0"
166+
compose-routing = "0.2.14"
167+
kottie = "1.9.6"
168+
160169
# NPM Dependencies
161170
npm-highlightjs = "11.10.0"
162171
npm-kotlin-playground = "1.30.0"
@@ -167,7 +176,7 @@ npm-jsjoda-tz = "2.21.1"
167176
# Plugin versions
168177
benmanes = "0.51.0"
169178
foojay-resolver = "0.8.0"
170-
gradle-develocity = "3.17.6"
179+
gradle-develocity = "3.18"
171180
nmcp = "0.0.9"
172181
nexus-publish = "2.0.0"
173182
shadow = "8.3.0"
@@ -179,7 +188,7 @@ best-practices-plugin = "0.10"
179188
graalvm-nativeimage = "0.10.2"
180189
github-depgraph = "0.1.0"
181190
github-changelog = "2.2.0"
182-
wire-plugin = "4.9.8"
191+
wire-plugin = "5.0.0"
183192
poko-plugin = "0.15.3"
184193
buildkonfig = "0.13.3"
185194
akkurate = "0.1.0"
@@ -193,12 +202,6 @@ jib-plugin = "3.4.3"
193202
jib-nativeimage-extn = "0.1.0"
194203
includegit-plugin = "0.1.6"
195204
kmp-hierarchy = "1.1"
196-
jetbrains-compose = "1.7.0-alpha02"
197-
jetbrains-compose-nav = "2.8.0-alpha08"
198-
jetbrains-compose-viewmodel = "2.8.0"
199-
kobweb = "0.19.0"
200-
detekt = "1.23.6"
201-
detekt-compose-rules = "0.4.9"
202205
mappie = "0.6.0"
203206

204207
[libraries]
@@ -509,9 +512,9 @@ imageio-extns = { module = "com.twelvemonkeys.imageio:ima
509512
okapibarcode = { module = "uk.org.okapibarcode:okapibarcode" , version.ref = "okapibarcode"}
510513

511514
# OpenTelemetry
512-
otel-bom = { module = "io.opentelemetry:opentelemetry-bom" , version.ref = "otel"}
513-
otel-api = { module = "io.opentelemetry:opentelemetry-api" , version.ref = "otel"}
514-
otel-extension-kotlin = { module = "io.opentelemetry:opentelemetry-extension-kotlin" , version.ref = "otel"}
515+
otel-bom = { module = "io.opentelemetry:opentelemetry-bom" , version.ref = "otel"}
516+
otel-api = { module = "io.opentelemetry:opentelemetry-api" , version.ref = "otel"}
517+
otel-extension-kotlin = { module = "io.opentelemetry:opentelemetry-extension-kotlin" , version.ref = "otel"}
515518

516519
otel-instr-bom = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom" , version.ref = "otel-instr"}
517520
otel-instr-javaagent = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent" , version.ref = "otel-instr"}
@@ -527,6 +530,10 @@ compose-runtime = { module = "org.jetbrains.compose.runtime
527530
compose-html-core = { module = "org.jetbrains.compose.html:html-core" , version.ref = "jetbrains-compose" }
528531
compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose" , version.ref = "jetbrains-compose-nav" }
529532
compose-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose" , version.ref = "jetbrains-compose-viewmodel" }
533+
compose-material3-windowsize = { module = "org.jetbrains.compose.material3:material3-window-size-class" , version.ref = "jetbrains-compose" }
534+
compose-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive" , version.ref = "jetbrains-compose-adaptive" }
535+
compose-material3-adaptive-layout = { module = "org.jetbrains.compose.material3.adaptive:adaptive-layout" , version.ref = "jetbrains-compose-adaptive" }
536+
compose-material3-adaptive-nav = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation" , version.ref = "jetbrains-compose-adaptive" }
530537
compose-routing = { module = "app.softwork:routing-compose" , version.ref = "compose-routing" }
531538
compose-icons-fontAwesome = { module = "br.com.devsrsouza.compose.icons:font-awesome" , version.ref = "compose-icons" }
532539
detekt-compose-rules = { module = "io.nlopez.compose.rules:detekt" , version.ref = "detekt-compose-rules" }

0 commit comments

Comments
 (0)