Skip to content

Commit 8a6e003

Browse files
committed
chore: commonMain changes
1 parent 29d0202 commit 8a6e003

File tree

5 files changed

+44
-9
lines changed

5 files changed

+44
-9
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.suresh
22

33
import dev.zacsweers.redacted.annotations.Redacted
4+
import kotlinx.serialization.Serializable
45

5-
data class KData(val name: String, val age: Int, @Redacted val password: String)
6+
@Serializable data class KData(val name: String, val age: Int, @Redacted val password: String)
Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,41 @@
11
package dev.suresh
22

33
import BuildConfig
4+
import kotlinx.datetime.Clock
5+
import kotlinx.datetime.TimeZone
6+
import kotlinx.datetime.toLocalDateTime
7+
import kotlinx.io.bytestring.*
8+
import kotlinx.serialization.encodeToString
9+
import kotlinx.serialization.json.Json
410

511
expect val platform: String
612

713
class Greeting {
8-
fun greeting() = "${BuildConfig.time} - ${KData("sdsds",123,"dssdsd")}: Kotlin $platform!"
14+
15+
val json = Json { prettyPrint = true }
16+
17+
fun greeting() =
18+
"""
19+
| ${BuildConfig.time} - ${KData("Foo", 123, "xxxx")}: Kotlin $platform!
20+
| ${kotlinxTests()}
21+
"""
22+
.trimMargin()
23+
24+
private fun kotlinxTests(): String {
25+
val ba = "Kotlinx".encodeToByteArray()
26+
val bs1 = ByteString(ba)
27+
val bs2 = "IO".encodeToByteString()
28+
29+
val bs = buildByteString {
30+
append(bs1)
31+
append(bs2)
32+
}
33+
34+
return """
35+
|${Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())}
36+
|${json.encodeToString(KData("Bar", 123, "xxxx"))}
37+
|${bs.decodeToString()}
38+
"""
39+
.trimMargin()
40+
}
941
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ kotlinMultiplatform.apply {
105105
implementation(libs.kotlinx.coroutines.core)
106106
implementation(libs.kotlinx.datetime)
107107
implementation(libs.kotlinx.serialization.json)
108+
implementation(libs.kotlinx.io.bytestring)
108109
implementation(libs.kotlinx.io.core)
109110
implementation(libs.ktor.client.core)
110111
implementation(libs.ktor.client.logging)

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serial
102102
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime" , version.ref = "kotlinx-datetime"}
103103
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu" , version.ref = "kotlinx-atomicfu"}
104104
kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core" , version.ref = "kotlinx-io"}
105+
kotlinx-io-bytestring = { module = "org.jetbrains.kotlinx:kotlinx-io-bytestring" , version.ref = "kotlinx-io"}
105106

106107
kotlinRetry = { module = "com.michael-bull.kotlin-retry:kotlin-retry" , version.ref = "kotlinRetry" }
107108
kotest-core = { module = "io.kotest:kotest-assertions-core" , version.ref = "kotest"}

web/src/jsMain/kotlin/App.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ import kotlinx.browser.document
55
import kotlinx.coroutines.await
66
import kotlinx.coroutines.delay
77
import kotlinx.dom.appendText
8-
import kotlinx.io.bytestring.ByteString
9-
import kotlinx.io.bytestring.decodeToString
108

119
suspend fun main() {
1210
val text = "${BuildConfig.time}: Hello, ${Greeting().greeting()}!"
13-
println(text)
1411
val root = document.getElementById("root")
15-
root?.appendText(text)
12+
13+
text.lines().forEach {
14+
println(it)
15+
root?.appendText(it)
16+
root?.appendChild(document.createElement("br"))
17+
}
18+
1619
delay(1.seconds)
1720
val promise = Promise.resolve("Promise")
1821
root?.appendText(promise.await())
19-
20-
val ba = ByteString("Kotlin-IO".encodeToByteArray())
21-
println(ba.decodeToString())
2222
}

0 commit comments

Comments
 (0)