chore(deps): update kotlin monorepo to v2 (major) (#152)

* chore(deps): update kotlin monorepo to v2

* fix kotlin 2.0, fix warnings

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jordon de Hoog <jordon.dehoog@gmail.com>

.gitignore

@@ -31,3 +31,4 @@ demo/iosApp/iosApp.xcodeproj/*
 !demo/iosApp/iosApp.xcodeproj/project.pbxproj
 shared/shared.podspec
 publish.sh
+.kotlin

build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.multiplatform) apply false
     alias(libs.plugins.cocoapods) apply false
     alias(libs.plugins.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false

demo/composeApp/build.gradle.kts

@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 plugins {
     alias(libs.plugins.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.cocoapods)
     alias(libs.plugins.android.application)
 }
@@ -130,8 +131,4 @@ compose.desktop {
             packageVersion = "1.0.0"
         }
     }
-}
-
-compose.experimental {
-    web.application {}
-}
+}

demo/composeApp/composeApp.podspec

@@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
     spec.summary                  = 'Compose application framework'
     spec.vendored_frameworks      = 'build/cocoapods/framework/ComposeApp.framework'
     spec.libraries                = 'c++'
-    spec.ios.deployment_target = '11.0'
+    spec.ios.deployment_target    = '11.0'
 
 
     if !Dir.exist?('build/cocoapods/framework/ComposeApp.framework') || Dir.empty?('build/cocoapods/framework/ComposeApp.framework')
@@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
         Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
     end
 
+    spec.xcconfig = {
+        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
+    }
+
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':demo:composeApp',
         'PRODUCT_MODULE_NAME' => 'ComposeApp',
@@ -46,5 +50,5 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-    spec.resources = ['build/compose/ios/ComposeApp/compose-resources']
+    spec.resources = ['build/compose/cocoapods/compose-resources']
 end

demo/iosApp/iosApp.xcodeproj/project.pbxproj

@@ -99,7 +99,6 @@
 				A93A953329CC810C00F8E227 /* Sources */,
 				A93A953429CC810C00F8E227 /* Frameworks */,
 				A93A953529CC810C00F8E227 /* Resources */,
-				05B5633B6342D18051296078 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -156,23 +155,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		05B5633B6342D18051296078 /* [CP] Copy Pods Resources */ = {
-			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";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		D3665D361753A60B1A6EEEB7 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

gradle.properties

@@ -13,6 +13,7 @@ android.nonTransitiveRClass=true
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 
 # Compose
 org.jetbrains.compose.experimental.uikit.enabled=true

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ sdk-target = "33"
 sdk-compile = "33"
 sdk-min = "21"
 agp = "8.4.1"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 versions = "0.51.0"
 compose-multiplatform = "1.6.10"
 androidx-core-ktx = "1.13.1"
@@ -18,7 +18,7 @@ binaryCompatibility = "0.14.0"
 dokka = "1.9.20"
 publish = "0.28.0"
 colormath = "3.5.0"
-poko = "0.15.3"
+poko = "0.16.0-beta01"
 
 [libraries]
 androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
@@ -35,6 +35,7 @@ espresso-core = { group = "androidx.test.espresso", name = "espresso-core", vers
 [plugins]
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

material-kolor/build.gradle.kts

@@ -1,8 +1,7 @@
-@file:Suppress("OPT_IN_USAGE")
-
 plugins {
     alias(libs.plugins.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.library)
     alias(libs.plugins.dokka)
     alias(libs.plugins.publish)

settings.gradle.kts

@@ -17,15 +17,13 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise") version "3.17.4"
+    id("com.gradle.develocity") version "3.17.4"
 }
 
-gradleEnterprise {
-    if (System.getenv("CI") != null) {
-        buildScan {
-            publishAlways()
-            termsOfServiceUrl = "https://gradle.com/terms-of-service"
-            termsOfServiceAgree = "yes"
+develocity {
+    buildScan {
+        publishing.onlyIf { context ->
+            context.buildResult.failures.isNotEmpty() && !System.getenv("CI").isNullOrEmpty()
         }
     }
 }