Merge pull request #39 from amanshuraikwar/update-kotlin-1_6

amanshuraikwar · web-flow · commit 3995371b667d · 2021-12-28T14:06:25.000+08:00
Update kotlin 1 6
diff --git a/project-files/Portfolio/build.gradle.kts b/project-files/Portfolio/build.gradle.kts
@@ -1,13 +1,15 @@
 buildscript {
+    val kotlinVersion: String by project
+
     repositories {
         gradlePluginPortal()
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("com.android.tools.build:gradle:7.2.0-alpha06")
-        classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.31")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
     }
 }
 
@@ -18,6 +20,8 @@ allprojects {
     }
 }
 
-//tasks.register("clean", Delete::class) {
-//    delete(rootProject.buildDir)
-//}
+// On Apple Silicon we need Node.js 16.0.0
+// https://youtrack.jetbrains.com/issue/KT-49109
+rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) {
+    rootProject.the(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class).nodeVersion = "16.0.0"
+}
diff --git a/project-files/Portfolio/buildSrc/src/main/java/io/github/amanshuraikwar/nxtbuz/buildSrc/dependencies.kt b/project-files/Portfolio/buildSrc/src/main/java/io/github/amanshuraikwar/nxtbuz/buildSrc/dependencies.kt
@@ -3,7 +3,6 @@
 package io.github.amanshuraikwar.nxtbuz.buildSrc
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
     const val threeTenAbp = "com.jakewharton.threetenabp:threetenabp:1.2.4"
 
     const val multiplatformSettings = "com.russhwolf:multiplatform-settings:0.8.1"
@@ -13,7 +12,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 +28,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 +48,15 @@ object Libs {
     }
 
     object Kotlin {
-        private const val version = "1.5.31"
+        private const val version = "1.6.10"
         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"
     }
 
diff --git a/project-files/Portfolio/buildWebsite.kts b/project-files/Portfolio/buildWebsite.kts
@@ -65,12 +65,18 @@ File(".") exec "mkdir build/tests/shared/android-jvm"
 println("Copying contents from shared/build/reports/tests/testDebugUnitTest/ to build/tests/shared/android-jvm/...")
 File(".") exec "cp -R shared/build/reports/tests/testDebugUnitTest/ build/tests/shared/android-jvm/"
 
-println("Running tests in :shared for Js Browser...")
-File(".") exec "./gradlew :shared:cleanJsBrowserTest :shared:jsBrowserTest --stacktrace"
-println("Creating directory build/tests/shared/js-browser...")
-File(".") exec "mkdir build/tests/shared/js-browser"
-println("Copying contents from shared/build/reports/tests/jsBrowserTest/ to build/tests/shared/js-browser/...")
-File(".") exec "cp -R shared/build/reports/tests/jsBrowserTest/ build/tests/shared/js-browser/"
+try {
+    println("Running tests in :shared for Js Browser...")
+    File(".") exec "./gradlew :shared:cleanJsBrowserTest :shared:jsBrowserTest --stacktrace"
+    println("Creating directory build/tests/shared/js-browser...")
+    File(".") exec "mkdir build/tests/shared/js-browser"
+    println("Copying contents from shared/build/reports/tests/jsBrowserTest/ to build/tests/shared/js-browser/...")
+    File(".") exec "cp -R shared/build/reports/tests/jsBrowserTest/ build/tests/shared/js-browser/"
+} catch (e: Exception) {
+    // do nothing
+    println("Something went wrong while running tests in :shared for Js Browser.")
+    println(e)
+}
 
 println("Deleting build/js...")
 File(".") exec "rm -rf build/js"
diff --git a/project-files/Portfolio/gradle.properties b/project-files/Portfolio/gradle.properties
@@ -1,8 +1,17 @@
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" -XX:+UseParallelGC
 
 #Kotlin
 kotlin.code.style=official
 
 #Android
-android.useAndroidX=true
+android.useAndroidX=true
+
+# Kotlin/Native clients can override this through updating common.podspec
+kotlinVersion=1.6.10
+
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.mpp.stability.nowarn=true
+
+kotlin.native.binary.memoryModel=experimental
+kotlin.native.binary.freezing=disabled
diff --git a/project-files/Portfolio/iosApp/Podfile.lock b/project-files/Portfolio/iosApp/Podfile.lock
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  shared: 7e5bb3963fe6bd4de6f2c4da301b5f6251f84201
+  shared: 7b4d6aa8aa7ada5f9dae3229e2524d316cb9f063
 
 PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
 
diff --git a/project-files/Portfolio/iosApp/Pods/Local Podspecs/shared.podspec.json b/project-files/Portfolio/iosApp/Pods/Local Podspecs/shared.podspec.json
diff --git a/project-files/Portfolio/iosApp/Pods/Manifest.lock b/project-files/Portfolio/iosApp/Pods/Manifest.lock
diff --git a/project-files/Portfolio/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/project-files/Portfolio/iosApp/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/project-files/Portfolio/shared/build.gradle.kts b/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 {
diff --git a/project-files/Portfolio/shared/shared.podspec b/project-files/Portfolio/shared/shared.podspec
@@ -35,10 +35,7 @@ Pod::Spec.new do |spec|
                 "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
                     -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
                     -Pkotlin.native.cocoapods.archs="$ARCHS" \
-                    -Pkotlin.native.cocoapods.configuration=$CONFIGURATION \
-                    -Pkotlin.native.cocoapods.cflags="$OTHER_CFLAGS" \
-                    -Pkotlin.native.cocoapods.paths.headers="$HEADER_SEARCH_PATHS" \
-                    -Pkotlin.native.cocoapods.paths.frameworks="$FRAMEWORK_SEARCH_PATHS"
+                    -Pkotlin.native.cocoapods.configuration=$CONFIGURATION
             SCRIPT
         }
     ]
diff --git a/project-files/Portfolio/shared/src/androidTest/kotlin/io/github/amanshuraikwar/portfolio/TestFun.kt b/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
 )
diff --git a/project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/Factory.kt b/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) {
diff --git a/project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/network/PortfolioApi.kt b/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>()
 }
diff --git a/project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/theme/network/ThemeApi.kt b/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>()
 }
diff --git a/project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt b/project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt
@@ -1,7 +1,4 @@
 package io.github.amanshuraikwar.portfolio
 
-import kotlinx.coroutines.CoroutineScope
-
-expect fun runTest(block: suspend CoroutineScope.() -> Unit)
-
+@Suppress("NO_ACTUAL_FOR_EXPECT")
 expect annotation class JsName constructor(val name: String)
diff --git a/project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/ThemeDataTest.kt b/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,
diff --git a/project-files/Portfolio/shared/src/iosTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt b/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
 )
diff --git a/project-files/Portfolio/shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedBlogListDataStore.kt b/project-files/Portfolio/shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedBlogListDataStore.kt
diff --git a/project-files/Portfolio/shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedWebPageBuildDataStore.kt b/project-files/Portfolio/shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedWebPageBuildDataStore.kt
diff --git a/project-files/Portfolio/shared/src/jsTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt b/project-files/Portfolio/shared/src/jsTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt
diff --git a/project-files/Portfolio/web/build.gradle.kts b/project-files/Portfolio/web/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
`1`	`1`	`buildscript {`
	`2`	`+ val kotlinVersion: String by project`
	`3`	`+`
`2`	`4`	`repositories {`
`3`	`5`	`gradlePluginPortal()`
`4`	`6`	`google()`
`5`	`7`	`mavenCentral()`
`6`	`8`	`}`
`7`	`9`	`dependencies {`
`8`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")`
	`10`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")`
`9`	`11`	`classpath("com.android.tools.build:gradle:7.2.0-alpha06")`
`10`		`- classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.31")`
	`12`	`+ classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")`
`11`	`13`	`}`
`12`	`14`	`}`
`13`	`15`
`@@ -18,6 +20,8 @@ allprojects {`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`
`21`		`-//tasks.register("clean", Delete::class) {`
`22`		`-// delete(rootProject.buildDir)`
`23`		`-//}`
	`23`	`+// On Apple Silicon we need Node.js 16.0.0`
	`24`	`+// https://youtrack.jetbrains.com/issue/KT-49109`
	`25`	`+rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) {`
	`26`	`+ rootProject.the(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class).nodeVersion = "16.0.0"`
	`27`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ kotlin {`
`44`	`44`	`implementation(clientJson)`
`45`	`45`	`implementation(clientLogging)`
`46`	`46`	`implementation(clientSerialization)`
	`47`	`+ implementation(contentNegotiation)`
	`48`	`+ implementation(json)`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`with(Libs.Kotlinx) {`
`@@ -59,6 +61,7 @@ kotlin {`
`59`	`61`	`implementation(kotlin("test"))`
`60`	`62`	`implementation(Libs.Ktor.clientMock)`
`61`	`63`	`implementation(Libs.multiplatformSettingsTest)`
	`64`	`+ implementation(Libs.Coroutines.test)`
`62`	`65`	`}`
`63`	`66`	`}`
`64`	`67`	`val androidMain by getting {`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,7 @@ Pod::Spec.new do \|spec\|`
`35`	`35`	`"$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \`
`36`	`36`	`-Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \`
`37`	`37`	`-Pkotlin.native.cocoapods.archs="$ARCHS" \`
`38`		`- -Pkotlin.native.cocoapods.configuration=$CONFIGURATION \`
`39`		`- -Pkotlin.native.cocoapods.cflags="$OTHER_CFLAGS" \`
`40`		`- -Pkotlin.native.cocoapods.paths.headers="$HEADER_SEARCH_PATHS" \`
`41`		`- -Pkotlin.native.cocoapods.paths.frameworks="$FRAMEWORK_SEARCH_PATHS"`
	`38`	`+ -Pkotlin.native.cocoapods.configuration=$CONFIGURATION`
`42`	`39`	`SCRIPT`
`43`	`40`	`}`
`44`	`41`	`]`