updated kotlin to 1.6.0

Author: amanshuraikwar

project-files/Portfolio/buildSrc/src/main/java/io/github/amanshuraikwar/nxtbuz/buildSrc/dependencies.kt

@@ -13,7 +13,9 @@ object Libs {
     const val coilCompose = "io.coil-kt:coil-compose:1.3.1"
 
     object Ktor {
-        private const val version = "1.6.1"
+        private const val version = "2.0.0-beta-1"
+        const val json = "io.ktor:ktor-serialization-kotlinx-json:$version"
+        const val contentNegotiation = "io.ktor:ktor-client-content-negotiation:$version"
         const val clientCore = "io.ktor:ktor-client-core:$version"
         const val clientJson = "io.ktor:ktor-client-json:$version"
         const val clientLogging = "io.ktor:ktor-client-logging:$version"
@@ -27,8 +29,9 @@ object Libs {
     }
 
     object Kotlinx {
-        const val serializationCore = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.1"
-        const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1"
+        private const val version = "1.3.2"
+        const val serializationCore = "org.jetbrains.kotlinx:kotlinx-serialization-core:$version"
+        const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:$version"
     }
 
     object Google {
@@ -46,15 +49,16 @@ object Libs {
     }
 
     object Kotlin {
-        private const val version = "1.5.31"
+        private const val version = "1.6.0"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
     }
 
     object Coroutines {
-        private const val version = "1.5.2-native-mt"
+        private const val version = "1.6.0-native-mt"
         const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
+        const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
         const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
     }
 

project-files/Portfolio/shared/build.gradle.kts

@@ -44,6 +44,8 @@ kotlin {
                     implementation(clientJson)
                     implementation(clientLogging)
                     implementation(clientSerialization)
+                    implementation(contentNegotiation)
+                    implementation(json)
                 }
 
                 with(Libs.Kotlinx) {
@@ -59,6 +61,7 @@ kotlin {
                 implementation(kotlin("test"))
                 implementation(Libs.Ktor.clientMock)
                 implementation(Libs.multiplatformSettingsTest)
+                implementation(Libs.Coroutines.test)
             }
         }
         val androidMain by getting {

project-files/Portfolio/shared/src/androidTest/kotlin/io/github/amanshuraikwar/portfolio/TestFun.kt

@@ -1,10 +1,5 @@
 package io.github.amanshuraikwar.portfolio
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
-
-actual fun runTest(block: suspend CoroutineScope.() -> Unit) = runBlocking { block() }
-
 actual annotation class JsName actual constructor(
     actual val name: String
 )

project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/Factory.kt

@@ -2,12 +2,12 @@ package io.github.amanshuraikwar.portfolio
 
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.HttpClientEngine
-import io.ktor.client.features.json.JsonFeature
-import io.ktor.client.features.json.serializer.KotlinxSerializer
-import io.ktor.client.features.logging.DEFAULT
-import io.ktor.client.features.logging.LogLevel
-import io.ktor.client.features.logging.Logger
-import io.ktor.client.features.logging.Logging
+import io.ktor.client.plugins.ContentNegotiation
+import io.ktor.client.plugins.logging.DEFAULT
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logger
+import io.ktor.client.plugins.logging.Logging
+import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
 
 object Factory {
@@ -16,8 +16,8 @@ object Factory {
         json: Json = createJson(),
         enableNetworkLogs: Boolean
     ) = HttpClient(engine) {
-        install(JsonFeature) {
-            serializer = KotlinxSerializer(json)
+        install(ContentNegotiation) {
+            json(json)
         }
         if (enableNetworkLogs) {
             install(Logging) {
@@ -31,8 +31,8 @@ object Factory {
         json: Json = createJson(),
         enableNetworkLogs: Boolean
     ) = HttpClient {
-        install(JsonFeature) {
-            serializer = KotlinxSerializer(json)
+        install(ContentNegotiation) {
+            json(json)
         }
         if (enableNetworkLogs) {
             install(Logging) {

project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/network/PortfolioApi.kt

@@ -1,16 +1,18 @@
 package io.github.amanshuraikwar.portfolio.network
 
+import io.github.amanshuraikwar.portfolio.network.model.AppDataResponse
 import io.github.amanshuraikwar.portfolio.network.model.PortfolioDataResponse
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.request.get
 
 class PortfolioApi(
     private val client: HttpClient,
     private val baseUrl: String = "https://amanshuraikwar.github.io/api",
 ) {
     suspend fun getPortfolioData() =
-        client.get<PortfolioDataResponse>("$baseUrl/portfolio_data.json")
+        client.get("$baseUrl/portfolio_data.json").body<PortfolioDataResponse>()
 
     suspend fun getAppData(appId: String) =
-        client.get<PortfolioDataResponse>("$baseUrl/app_data_$appId.json")
+        client.get("$baseUrl/app_data_$appId.json").body<AppDataResponse>()
 }

project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/theme/network/ThemeApi.kt

@@ -2,12 +2,13 @@ package io.github.amanshuraikwar.portfolio.theme.network
 
 import io.github.amanshuraikwar.portfolio.theme.network.model.ThemeDataResponse
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.request.get
 
 class ThemeApi(
     private val client: HttpClient,
     private val baseUrl: String = "https://amanshuraikwar.github.io/api",
 ) {
-    suspend fun getThemeData() =
-        client.get<ThemeDataResponse>("$baseUrl/theme.json")
+    suspend fun getThemeData()=
+        client.get("$baseUrl/theme.json").body<ThemeDataResponse>()
 }

project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt

@@ -1,7 +1,3 @@
 package io.github.amanshuraikwar.portfolio
 
-import kotlinx.coroutines.CoroutineScope
-
-expect fun runTest(block: suspend CoroutineScope.() -> Unit)
-
 expect annotation class JsName constructor(val name: String)

project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/ThemeDataTest.kt

@@ -15,14 +15,17 @@ import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
 import io.ktor.utils.io.ByteReadChannel
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.json.Json
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 
+@ExperimentalCoroutinesApi
 class ThemeDataTest {
     //region api
     @Test
@@ -51,6 +54,7 @@ class ThemeDataTest {
             )
         )
 
+
         runTest {
             assertEquals(
                 DEFAULT_THEME_DATA_RESPONSE,

project-files/Portfolio/shared/src/iosTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt

@@ -3,8 +3,6 @@ package io.github.amanshuraikwar.portfolio
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.runBlocking
 
-actual fun runTest(block: suspend CoroutineScope.() -> Unit) = runBlocking { block() }
-
 actual annotation class JsName actual constructor(
     actual val name: String
 )

project-files/Portfolio/shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedBlogListDataStore.kt

@@ -8,31 +8,6 @@ import io.github.amanshuraikwar.portfolio.blog.BlogListDataItem
 class GeneratedBlogListDataStore {
 
 	fun getBlogListData(): List<BlogListDataItem> {
-		return listOf(
-            BlogListDataItem(
-                title = "My Portfolio",
-                date = "December 27, 2021",
-                firstParagraph = "This is my portfolio. It is a KMM project which currently supports Web, Android & iOS clients coming soon. The Web app is written in Kotlin, built using Jetpack Compose for Web and it has a KMM shared module for business logic.",
-                link = "https://amanshuraikwar.github.io/portfolio",
-            ),
-            BlogListDataItem(
-                title = "How to use highlight.js in your Jetpack Compose Web project",
-                date = "December 14, 2021",
-                firstParagraph = "If you are building your web app using Jetpack Compose for Web and want to use highlight.js, this is the blog for you.",
-                link = "https://amanshuraikwar.github.io/jetpack-compose-web-highlight-js",
-            ),
-            BlogListDataItem(
-                title = "Issues using MockK in a KMM shared module",
-                date = "December 12, 2021",
-                firstParagraph = "If you are writing unit tests for your Kotlin project and need to mock certain objects, there is high chance that you are using MockK. Here are a couple of issues that I faced while using MockK in my KMM project. The project has Android and iOS apps with business logic written in shared KMM modules, I was writing unit tests to test this business logic.",
-                link = "https://amanshuraikwar.github.io/mockk-kmm-issues",
-            ),
-            BlogListDataItem(
-                title = "Introducing Next Bus SG",
-                date = "December 8, 2021",
-                firstParagraph = "After working on it for more than a year, I present to you Next Bus SG. Next Bus SG is a minimal & light app to see bus arrival timings in Singapore. Scroll down to the bottom for download links.",
-                link = "https://amanshuraikwar.github.io/nextbus",
-            ),
-		)
+		return listOf()
 	}
 }