Upgrade Kotlin to v2.0.21 and other deps (#145)

* Upgrade Kotlin to 2.0.21 * Fix _Float16 error for iosX64 target
shepeliev · Oct 18, 2024 · 0800521 · 0800521
1 parent 6444981
commit 0800521
Show file tree

Hide file tree

Showing 27 changed files with 29,376 additions and 130 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,9 @@ import java.util.Properties
 plugins {
     alias(libs.plugins.ktlint)
     alias(libs.plugins.nexus)
+    alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.androidApplication) apply false
+    alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrains.compose) apply false
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
diff --git a/buildSrc/src/main/kotlin/KotlinAndroidTarget.kt b/buildSrc/src/main/kotlin/KotlinAndroidTarget.kt
diff --git a/buildSrc/src/main/kotlin/KotlinMultiplatformExtension.kt b/buildSrc/src/main/kotlin/KotlinMultiplatformExtension.kt
diff --git a/buildSrc/src/main/kotlin/webrtc.multiplatform.gradle.kts b/buildSrc/src/main/kotlin/webrtc.multiplatform.gradle.kts
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-kotlin = "2.0.10"
-kotlin-coroutines = "1.8.0"
+kotlin = "2.0.21"
+kotlin-coroutines = "1.9.0"
 androidx-activity-compose = "1.9.0"
-androidx-appcompat = "1.6.1"
-androidx-core = "1.13.0"
-androidx-material = "1.11.0"
-androidx-lifecycle = "2.7.0"
-androidx-startup = "1.1.1"
-androidx-test-core = "1.5.0"
-androidx-test-runner = "1.5.2"
-androidx-test-rules = "1.5.0"
+androidx-appcompat = "1.7.0"
+androidx-core = "1.13.1"
+androidx-material = "1.12.0"
+androidx-lifecycle = "2.8.6"
+androidx-startup = "1.2.0"
+androidx-test-core = "1.6.1"
+androidx-test-runner = "1.6.2"
+androidx-test-rules = "1.6.1"
 accompanist-permision = "0.34.0"
 kermit = "2.0.3"
 kotlin-wrappers = "1.0.0-pre.732"
@@ -49,12 +49,11 @@ kotlin-wrappers-react = { module = "org.jetbrains.kotlin-wrappers:kotlin-react"
 kotlin-wrappers-reactDom = { module = "org.jetbrains.kotlin-wrappers:kotlin-react-dom" }
 kotlin-wrappers-mui = { module = "org.jetbrains.kotlin-wrappers:kotlin-mui-material" }
 
-# Plugin dependencies
-kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-agp-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
-
 [plugins]
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
diff --git a/sample/composeApp/build.gradle.kts b/sample/composeApp/build.gradle.kts
@@ -1,21 +1,18 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
 
-
 plugins {
-    kotlin("multiplatform")
-    id("com.android.application")
-    kotlin("native.cocoapods")
-
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrains.compose)
     alias(libs.plugins.compose.compiler)
+    kotlin("native.cocoapods")
 }
 
 kotlin {
-    configureKotlinCompilerArgs()
-
     cocoapods {
         version = "1.0"
         summary = "Compose app"
@@ -26,6 +23,7 @@ kotlin {
             version = libs.versions.webrtc.ios.sdk.get()
             moduleName = "WebRTC"
             packageName = "WebRTC"
+            linkOnly = true
         }
 
         podfile = project.file("../iosApp/Podfile")
@@ -40,8 +38,11 @@ kotlin {
         xcodeConfigurationToNativeBuildType["CUSTOM_RELEASE"] = NativeBuildType.RELEASE
     }
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     androidTarget {
-        configureJvmTarget()
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
+        }
     }
 
     iosX64()
@@ -134,7 +135,3 @@ android {
         debugImplementation(compose.uiTooling)
     }
 }
-
-compose.experimental {
-    web.application {}
-}
diff --git a/sample/iosApp/iosApp.xcodeproj/project.pbxproj b/sample/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -125,8 +125,8 @@
 				7555FF77242A565900829871 /* Sources */,
 				B92378962B6B1156000C7307 /* Frameworks */,
 				7555FF79242A565900829871 /* Resources */,
-				931F3CF07987B7B6B6CCC6ED /* [CP] Copy Pods Resources */,
-				F3D8C08FB2F2F9B33C43EA14 /* [CP] Embed Pods Frameworks */,
+				9D30E8BF2257B72354B2C936 /* [CP] Embed Pods Frameworks */,
+				02E3B32A3BA45C3A2057CD5D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -184,46 +184,46 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		5BCD90D29F45499A62B89A70 /* [CP] Check Pods Manifest.lock */ = {
+		02E3B32A3BA45C3A2057CD5D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		931F3CF07987B7B6B6CCC6ED /* [CP] Copy Pods Resources */ = {
+		5BCD90D29F45499A62B89A70 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F3D8C08FB2F2F9B33C43EA14 /* [CP] Embed Pods Frameworks */ = {
+		9D30E8BF2257B72354B2C936 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (