updates: kotlin 2.0.0, etc

softartdev · Jun 12, 2024 · 0dcd4fa · 0dcd4fa
1 parent 9fc52de
commit 0dcd4fa
Show file tree

Hide file tree

Showing 19 changed files with 65 additions and 43 deletions.
diff --git a/android-compose-app/build.gradle.kts b/android-compose-app/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.gms)
     alias(libs.plugins.crashlytics)
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.kotlin.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.sqlDelight) apply false

diff --git a/desktop-compose-app/build.gradle.kts b/desktop-compose-app/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 group = "com.softartdev"
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,13 +3,13 @@ compileSdk = "34"
 targetSdk = "34"
 minSdk = "21"
 jdk = "17"
-kotlin = "1.9.24"
-agp = "8.4.1"
-gms = "4.4.1"
+kotlin = "2.0.0"
+agp = "8.4.2"
+gms = "4.4.2"
 crashlytics = "3.0.1"
-compose = "1.6.10"
+compose = "1.6.11"
 composeCompiler = "1.5.14"
-coroutines = "1.8.0"
+coroutines = "1.8.1"
 sqlDelight = "2.0.2"
 androidxSqlite = "2.4.0"
 saferoom = "1.3.0"
@@ -19,24 +19,24 @@ sqlcipherKtnPod = "1.4.2"
 decompose = "2.2.2-compose-experimental"
 koin = "3.5.3"
 kotlinx-serialization = "1.6.3"
-kotlinx-datetime = "0.5.0"
+kotlinx-datetime = "0.6.0"
 napier = "2.7.1"
-mokoResources = "0.24.0-beta-5"
-materialThemePrefs = "0.8.1"
+mokoResources = "0.24.0"
+materialThemePrefs = "0.8.3"
 androidxActivityCompose = "1.9.0"
 androidxComposeTest = "1.6.7"
 androidxCoreSplashscreen = "1.0.1"
 androidxLegacySupport = "1.0.0"
 androidxPreference = "1.2.1"
 androidxMultidex = "2.0.1"
 androidxTracing = "1.2.0"
-androidxLifecycle = "2.8.0"
+androidxLifecycle = "2.8.1"
 androidxArch = "2.2.0"
 androidxTestExt = "1.1.5"
 androidxTest = "1.5.2"
 androidxTestOrchestrator = "1.4.2"
 googleAndroidMaterial = "1.12.0"
-firebase = "33.0.0"
+firebase = "33.1.0"
 leakCanary = "2.14"
 junit = "4.13.2"
 mockito = "5.11.0"
@@ -134,7 +134,7 @@ appdirs = { module = "net.harawata:appdirs", version.ref = "appdirs" }
 
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
-espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.0-alpha08" }
+espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.0-rc01" }
 espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
 
 desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }
@@ -147,6 +147,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 05 16:36:26 GET 2024
+#Wed Jun 12 03:28:45 GET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ios-compose-kit/build.gradle.kts b/ios-compose-kit/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.cocoapods)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 compose {
     kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())

diff --git a/ios-compose-kit/iosComposePod.podspec b/ios-compose-kit/iosComposePod.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
     spec.summary                  = 'Common UI-kit for the NoteDelight app'
     spec.vendored_frameworks      = 'build/cocoapods/framework/iosComposeKit.framework'
     spec.libraries                = 'c++'
-    spec.ios.deployment_target = '14.1'
+    spec.ios.deployment_target    = '14.1'
     spec.dependency 'SQLCipher', '4.5.4'
 
     if !Dir.exist?('build/cocoapods/framework/iosComposeKit.framework') || Dir.empty?('build/cocoapods/framework/iosComposeKit.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' => ':ios-compose-kit',
         'PRODUCT_MODULE_NAME' => 'iosComposeKit',

diff --git a/iosApp/Podfile.lock b/iosApp/Podfile.lock
@@ -19,7 +19,7 @@ EXTERNAL SOURCES:
     :path: "../ios-compose-kit"
 
 SPEC CHECKSUMS:
-  iosComposePod: 990ac956967f04395c98fc0610af2a907d3a90e4
+  iosComposePod: 6b1a3839625a6f599db79573723c6c16d038f9d4
   SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381
 
 PODFILE CHECKSUM: 0dc93a6f6109335ea8cd3f91d2c87cc8c99f04a3

diff --git a/iosApp/Pods/Local Podspecs/iosComposePod.podspec.json b/iosApp/Pods/Local Podspecs/iosComposePod.podspec.json
diff --git a/iosApp/Pods/Manifest.lock b/iosApp/Pods/Manifest.lock
diff --git a/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/iosApp/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig b/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig
diff --git a/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig b/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig
diff --git a/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.debug.xcconfig b/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.debug.xcconfig
diff --git a/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.release.xcconfig b/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.release.xcconfig
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -158,7 +158,7 @@
 				75CF0FBEED43B2BAC7F61B5C /* Frameworks */,
 				7594048B29365286005183CD /* Copy moko-resources */,
 				A798D07A9F8F09FA2C8C3203 /* [CP] Embed Pods Frameworks */,
-				E18A1A6173D08382371A14BE /* [CP] Copy Pods Resources */,
+				0B98927A77A645700C19BF69 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -247,6 +247,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		0B98927A77A645700C19BF69 /* [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;
+		};
 		7594048B29365286005183CD /* Copy moko-resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -304,23 +321,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E18A1A6173D08382371A14BE /* [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;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/jvm-compose-test/build.gradle.kts b/jvm-compose-test/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     `java-library`
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 compose {

diff --git a/shared-compose-ui/build.gradle.kts b/shared-compose-ui/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.serialization)
 }
 compose {

diff --git a/shared/shared.podspec b/shared/shared.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
     spec.summary                  = 'Common library for the NoteDelight app'
     spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
     spec.libraries                = 'c++'
-    spec.ios.deployment_target = '14.0'
+    spec.ios.deployment_target    = '14.0'
     spec.dependency 'SQLCipher', '4.5.4'
 
     if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.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' => ':shared',
         'PRODUCT_MODULE_NAME' => 'shared',