Use version catelog, correct greeting

pahill · pahill · commit 0afbb943e20e · 2024-01-04T10:18:46.000+02:00
diff --git a/step4/gradle/libs.versions.toml b/step4/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ compose = "1.5.4"
 compose-compiler = "1.5.4"
 compose-material3 = "1.1.2"
 androidx-activityCompose = "1.8.0"
+kotlinxDatetime = "0.4.1"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -14,6 +15,7 @@ compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref =
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
diff --git a/step4/shared/build.gradle.kts b/step4/shared/build.gradle.kts
@@ -25,7 +25,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+            implementation(libs.kotlinx.datetime)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)
diff --git a/step4/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/kotlinmultiplatformsandbox/Greeting.kt b/step4/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/kotlinmultiplatformsandbox/Greeting.kt
@@ -7,7 +7,7 @@ class Greeting {
 
     fun greet(): List<String> = buildList {
         add(if (Random.nextBoolean()) "Hi!" else "Hello!")
-        add("Guess what it is! > ${platform.name.reversed()}!")
+        add("Guess what this is! > ${platform.name.reversed()}!")
         add(daysPhrase())
     }
 }
diff --git a/step5/gradle/libs.versions.toml b/step5/gradle/libs.versions.toml
@@ -5,6 +5,9 @@ compose = "1.5.4"
 compose-compiler = "1.5.4"
 compose-material3 = "1.1.2"
 androidx-activityCompose = "1.8.0"
+kotlinxCoroutinesCore = "1.7.3"
+kotlinxDatetime = "0.4.1"
+ktorVersion = "2.3.7"
 lifecycleRuntimeCompose = "2.6.2"
 
 [libraries]
@@ -16,6 +19,13 @@ compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref =
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
+ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktorVersion" }
+ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" }
+ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktorVersion" }
+ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
diff --git a/step5/shared/build.gradle.kts b/step5/shared/build.gradle.kts
@@ -25,21 +25,19 @@ kotlin {
         }
     }
 
-    val ktorVersion = "2.3.7"
-
     sourceSets {
         all {
             languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")
         }
 
         commonMain {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+                implementation(libs.kotlinx.datetime)
+                implementation(libs.kotlinx.coroutines.core)
 
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
-                implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+                implementation(libs.ktor.client.core)
+                implementation(libs.ktor.client.content.negotiation)
+                implementation(libs.ktor.serialization.kotlinx.json)
             }
         }
         commonTest {
@@ -49,12 +47,12 @@ kotlin {
         }
         androidMain {
             dependencies {
-                implementation("io.ktor:ktor-client-android:$ktorVersion")
+                implementation(libs.ktor.client.android)
             }
         }
         iosMain {
             dependencies {
-                implementation("io.ktor:ktor-client-darwin:$ktorVersion")
+                implementation(libs.ktor.client.darwin)
             }
         }
     }
diff --git a/step5/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/kotlinmultiplatformsandbox/Greeting.kt b/step5/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/kotlinmultiplatformsandbox/Greeting.kt
@@ -15,7 +15,7 @@ class Greeting {
     fun greet(): Flow<String> = flow {
         emit(if (Random.nextBoolean()) "Hi!" else "Hello!")
         delay(1.seconds)
-        emit("Guess what it is! > ${platform.name.reversed()}")
+        emit("Guess what this is! > ${platform.name.reversed()}")
         delay(1.seconds)
         emit(daysPhrase())
         emit(rocketComponent.launchPhrase())
diff --git a/step5_skie/gradle/libs.versions.toml b/step5_skie/gradle/libs.versions.toml
@@ -5,6 +5,9 @@ compose = "1.5.4"
 compose-compiler = "1.5.4"
 compose-material3 = "1.1.2"
 androidx-activityCompose = "1.8.0"
+kotlinxCoroutinesCore = "1.7.3"
+kotlinxDatetime = "0.4.1"
+ktorVersion = "2.3.7"
 lifecycleRuntimeCompose = "2.6.2"
 
 [libraries]
@@ -16,6 +19,13 @@ compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref =
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
+ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktorVersion" }
+ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" }
+ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktorVersion" }
+ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
diff --git a/step5_skie/shared/build.gradle.kts b/step5_skie/shared/build.gradle.kts
@@ -24,21 +24,19 @@ kotlin {
         }
     }
 
-    val ktorVersion = "2.3.7"
-
     sourceSets {
         all {
             languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")
         }
 
         commonMain {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+                implementation(libs.kotlinx.datetime)
+                implementation(libs.kotlinx.coroutines.core)
 
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
-                implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+                implementation(libs.ktor.client.core)
+                implementation(libs.ktor.client.content.negotiation)
+                implementation(libs.ktor.serialization.kotlinx.json)
             }
         }
         commonTest {
@@ -48,12 +46,12 @@ kotlin {
         }
         androidMain {
             dependencies {
-                implementation("io.ktor:ktor-client-android:$ktorVersion")
+                implementation(libs.ktor.client.android)
             }
         }
         iosMain {
             dependencies {
-                implementation("io.ktor:ktor-client-darwin:$ktorVersion")
+                implementation(libs.ktor.client.darwin)
             }
         }
     }
diff --git a/step5_skie/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/kotlinmultiplatformsandbox/Greeting.kt b/step5_skie/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/kotlinmultiplatformsandbox/Greeting.kt
@@ -13,7 +13,7 @@ class Greeting {
     fun greet(): Flow<String> = flow {
         emit(if (Random.nextBoolean()) "Hi!" else "Hello!")
         delay(1.seconds)
-        emit("Guess what it is! > ${platform.name.reversed()}")
+        emit("Guess what this is! > ${platform.name.reversed()}")
         delay(1.seconds)
         emit(daysPhrase())
         emit(rocketComponent.launchPhrase())

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ kotlin {`
`25`	`25`
`26`	`26`	`sourceSets {`
`27`	`27`	`commonMain.dependencies {`
`28`		`- implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")`
	`28`	`+ implementation(libs.kotlinx.datetime)`
`29`	`29`	`}`
`30`	`30`	`commonTest.dependencies {`
`31`	`31`	`implementation(libs.kotlin.test)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class Greeting {`
`7`	`7`
`8`	`8`	`fun greet(): List<String> = buildList {`
`9`	`9`	`add(if (Random.nextBoolean()) "Hi!" else "Hello!")`
`10`		`- add("Guess what it is! > ${platform.name.reversed()}!")`
	`10`	`+ add("Guess what this is! > ${platform.name.reversed()}!")`
`11`	`11`	`add(daysPhrase())`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,21 +25,19 @@ kotlin {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- val ktorVersion = "2.3.7"`
`29`		`-`
`30`	`28`	`sourceSets {`
`31`	`29`	`all {`
`32`	`30`	`languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`commonMain {`
`36`	`34`	`dependencies {`
`37`		`- implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")`
`38`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")`
	`35`	`+ implementation(libs.kotlinx.datetime)`
	`36`	`+ implementation(libs.kotlinx.coroutines.core)`
`39`	`37`
`40`		`- implementation("io.ktor:ktor-client-core:$ktorVersion")`
`41`		`- implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")`
`42`		`- implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")`
	`38`	`+ implementation(libs.ktor.client.core)`
	`39`	`+ implementation(libs.ktor.client.content.negotiation)`
	`40`	`+ implementation(libs.ktor.serialization.kotlinx.json)`
`43`	`41`	`}`
`44`	`42`	`}`
`45`	`43`	`commonTest {`
`@@ -49,12 +47,12 @@ kotlin {`
`49`	`47`	`}`
`50`	`48`	`androidMain {`
`51`	`49`	`dependencies {`
`52`		`- implementation("io.ktor:ktor-client-android:$ktorVersion")`
	`50`	`+ implementation(libs.ktor.client.android)`
`53`	`51`	`}`
`54`	`52`	`}`
`55`	`53`	`iosMain {`
`56`	`54`	`dependencies {`
`57`		`- implementation("io.ktor:ktor-client-darwin:$ktorVersion")`
	`55`	`+ implementation(libs.ktor.client.darwin)`
`58`	`56`	`}`
`59`	`57`	`}`
`60`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,21 +24,19 @@ kotlin {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- val ktorVersion = "2.3.7"`
`28`		`-`
`29`	`27`	`sourceSets {`
`30`	`28`	`all {`
`31`	`29`	`languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`commonMain {`
`35`	`33`	`dependencies {`
`36`		`- implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")`
`37`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")`
	`34`	`+ implementation(libs.kotlinx.datetime)`
	`35`	`+ implementation(libs.kotlinx.coroutines.core)`
`38`	`36`
`39`		`- implementation("io.ktor:ktor-client-core:$ktorVersion")`
`40`		`- implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")`
`41`		`- implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")`
	`37`	`+ implementation(libs.ktor.client.core)`
	`38`	`+ implementation(libs.ktor.client.content.negotiation)`
	`39`	`+ implementation(libs.ktor.serialization.kotlinx.json)`
`42`	`40`	`}`
`43`	`41`	`}`
`44`	`42`	`commonTest {`
`@@ -48,12 +46,12 @@ kotlin {`
`48`	`46`	`}`
`49`	`47`	`androidMain {`
`50`	`48`	`dependencies {`
`51`		`- implementation("io.ktor:ktor-client-android:$ktorVersion")`
	`49`	`+ implementation(libs.ktor.client.android)`
`52`	`50`	`}`
`53`	`51`	`}`
`54`	`52`	`iosMain {`
`55`	`53`	`dependencies {`
`56`		`- implementation("io.ktor:ktor-client-darwin:$ktorVersion")`
	`54`	`+ implementation(libs.ktor.client.darwin)`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`	`}`