diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 885e6a5..6a3d31f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,14 +4,14 @@ kotlin = "1.9.10" compose = "1.5.4" compose-compiler = "1.5.3" compose-material3 = "1.1.2" -androidx-activityCompose = "1.8.0" +androidx-activityCompose = "1.8.1" kotlinxCoroutinesCore = "1.7.1" kotlinxDatetime = "0.4.0" ktorVersion = "2.3.2" animationCoreAndroid = "1.5.4" animationAndroid = "1.5.4" uiToolingPreviewAndroid = "1.5.4" -uiToolingPreviewDesktop = "1.6.0-alpha08" +uiToolingPreviewDesktop = "1.6.0-beta01" appcompat = "1.6.1" mockk = "1.12.4" @@ -46,4 +46,5 @@ androidLibrary = { id = "com.android.library", version.ref = "android-gradle-plu kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" } -compose = {id = "org.jetbrains.compose", version.ref = "compose-compiler"} \ No newline at end of file +compose = {id = "org.jetbrains.compose", version.ref = "compose-compiler"} +serialization = {id = "plugin.serialization", version.ref = "kotlin"} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbb4608..e0e127e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 22 16:56:53 CDT 2023 +#Sat Nov 25 19:59:47 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/shared/src/androidUnitTest/kotlin/com/example/kmptemplate/Test.android.kt b/shared/src/androidUnitTest/kotlin/com/example/kmptemplate/Test.android.kt index adba748..ec8542c 100644 --- a/shared/src/androidUnitTest/kotlin/com/example/kmptemplate/Test.android.kt +++ b/shared/src/androidUnitTest/kotlin/com/example/kmptemplate/Test.android.kt @@ -18,7 +18,7 @@ class AndroidGreetingTest { @Test fun testExample() { runTest{ - val mockEngine = MockEngine { request -> + val mockEngine = MockEngine { _ -> respond( content = ByteReadChannel("""[{"name":"CTS21","flight_number":42,"success":true,"date_utc":"2021-09-15T00:00:00Z"}]"""), status = HttpStatusCode.OK, diff --git a/shared/src/commonTest/kotlin/com/example/kmptemplate/Test.kt b/shared/src/commonTest/kotlin/com/example/kmptemplate/Test.kt index 4453209..0198831 100644 --- a/shared/src/commonTest/kotlin/com/example/kmptemplate/Test.kt +++ b/shared/src/commonTest/kotlin/com/example/kmptemplate/Test.kt @@ -16,7 +16,7 @@ class CommonGreetingTest { fun testExample() { runTest{ - val mockEngine = MockEngine { request -> + val mockEngine = MockEngine { _ -> respond( content = ByteReadChannel("""[{"name":"CTS21","flight_number":42,"success":true,"date_utc":"2021-09-15T00:00:00Z"}]"""), status = HttpStatusCode.OK, @@ -34,7 +34,7 @@ class CommonGreetingTest { } } assertTrue { - "Check 2021-09 is mentioned".equals( Greeting(mockHttpClient).greet().contains("Greetings!")) + Greeting(mockHttpClient).greet().contains("Greetings!") } } } diff --git a/shared/src/iosTest/kotlin/com/example/kmptemplate/Test.ios.kt b/shared/src/iosTest/kotlin/com/example/kmptemplate/Test.ios.kt index f5ca35b..aaa8c63 100644 --- a/shared/src/iosTest/kotlin/com/example/kmptemplate/Test.ios.kt +++ b/shared/src/iosTest/kotlin/com/example/kmptemplate/Test.ios.kt @@ -37,7 +37,7 @@ class IosGreetingTest { } } assertTrue { - "Check 2021-09 is mentioned".equals( Greeting(mockHttpClient).greet().contains("Greetings!")) + Greeting(mockHttpClient).greet().contains("Greetings!") } }