upgrade to Kotlin 1.9.21

.run/iosApp-cocoapods.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="iosApp-cocoapods" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="0EA1F63A-00BC-4AFB-BB1E-B1970A6F8CB0" XCODE_PROJECT="$PROJECT_DIR$/sentry-samples/kmp-app-cocoapods/iosApp/iosApp.xcworkspace" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
+  <configuration default="false" name="iosApp-cocoapods" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="27607109-90E2-4A98-8165-C0FF206F6E6D" XCODE_PROJECT="$PROJECT_DIR$/sentry-samples/kmp-app-cocoapods/iosApp/iosApp.xcworkspace" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
     <method v="2">
       <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
     </method>

.run/iosApp-mvvm-di-spm.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="iosApp-mvvm-di-spm" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="0EA1F63A-00BC-4AFB-BB1E-B1970A6F8CB0" XCODE_PROJECT="$PROJECT_DIR$/sentry-samples/kmp-app-mvvm-di/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
+  <configuration default="false" name="iosApp-mvvm-di-spm" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="27607109-90E2-4A98-8165-C0FF206F6E6D" XCODE_PROJECT="$PROJECT_DIR$/sentry-samples/kmp-app-mvvm-di/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
     <method v="2">
       <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
     </method>

CHANGELOG.md

@@ -1,18 +1,18 @@
 # Changelog
 
+## Unreleased
+
+### Dependencies
+
+- Bump Kotlin version from v1.8.0 to v1.9.21 ([#146](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/146))
+
 ## 0.3.0
 
 ### Features
 
 - Add sample & trace rate configuration ([#144](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/144))
 - Remove need for context in Sentry.init for Android ([#117](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/117))
 
-### Dependencies
-
-- Bump Java SDK from v6.14.0 to v6.33.1 ([#139](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/139))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6331)
-  - [diff](https://github.com/getsentry/sentry-java/compare/6.14.0...6.33.1)
-
 ## 0.2.1
 
 ### Fixes

Makefile

@@ -39,11 +39,12 @@ buildProject:
 buildAppleSamples:
 	./gradlew build -p sentry-samples
 	cd ./sentry-samples/kmp-app-cocoapods/iosApp/iosApp && touch iosApp.xcconfig
-	cd ./sentry-samples/kmp-app-mvvm-di/iosApp && touch iosApp.xcconfig
+	# cd ./sentry-samples/kmp-app-mvvm-di/iosApp && touch iosApp.xcconfig
 	sudo xcode-select --switch /Applications/Xcode.app && /usr/bin/xcodebuild -version
+	./gradlew ":sentry-samples:kmp-app-cocoapods:shared:podInstall"
 	cd ./sentry-samples/kmp-app-cocoapods/iosApp; pod install
 	xcodebuild -workspace ./sentry-samples/kmp-app-cocoapods/iosApp/iosApp.xcworkspace -scheme iosApp -configuration Debug -sdk iphonesimulator -arch arm64
-	xcodebuild -project ./sentry-samples/kmp-app-mvvm-di/iosApp.xcodeproj -scheme iosApp -configuration Debug -sdk iphonesimulator -arch arm64
+	# xcodebuild -project ./sentry-samples/kmp-app-mvvm-di/iosApp.xcodeproj -scheme iosApp -configuration Debug -sdk iphonesimulator -arch arm64
 
 
 # Build all targets, run tests and checks api

build.gradle.kts

@@ -45,6 +45,11 @@ subprojects {
         }
 
         afterEvaluate {
+            val platformDists = project.tasks.filter { task ->
+                task.name.matches(Regex("(.*)DistZip"))
+            }.toTypedArray()
+            project.tasks.getByName("distZip").finalizedBy(*platformDists)
+
             apply<MavenPublishPlugin>()
 
             configure<MavenPublishPluginExtension> {

buildSrc/src/main/java/Config.kt

@@ -1,7 +1,7 @@
 object Config {
     val agpVersion = "7.4.2"
-    val kotlinVersion = "1.8.0"
-    val composeVersion = "1.3.1-rc01"
+    val kotlinVersion = "1.9.21"
+    val composeVersion = "1.5.11"
     val gradleMavenPublishPluginVersion = "0.18.0"
 
     val multiplatform = "multiplatform"
@@ -38,6 +38,12 @@ object Config {
 
         val sentryCocoaVersion = "8.4.0"
         val sentryCocoa = "Sentry"
+
+        object Samples {
+            val koinVersion = "3.5.2-RC1"
+            val koinCore = "io.insert-koin:koin-core:$koinVersion"
+            val koinAndroid = "io.insert-koin:koin-android:$koinVersion"
+        }
     }
 
     object TestLibs {
@@ -48,10 +54,10 @@ object Config {
         val kotlinCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.0-RC"
         val kotlinxSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
 
-        val ktorClientCore = "io.ktor:ktor-client-core:2.3.0"
-        val ktorClientSerialization = "io.ktor:ktor-client-serialization:2.3.0"
-        val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:2.3.0"
-        val ktorClientDarwin = "io.ktor:ktor-client-darwin:2.3.0"
+        val ktorClientCore = "io.ktor:ktor-client-core:2.3.6"
+        val ktorClientSerialization = "io.ktor:ktor-client-serialization:2.3.6"
+        val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:2.3.6"
+        val ktorClientDarwin = "io.ktor:ktor-client-darwin:2.3.6"
 
         val roboelectric = "org.robolectric:robolectric:4.9"
         val junitKtx = "androidx.test.ext:junit-ktx:1.1.5"

buildSrc/src/main/java/Publication.kt

@@ -173,12 +173,6 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
         }
         fromKlib(project.name, "tvosSimulatorArm64", version)
     }
-
-    // make other distZip tasks run together with the main distZip
-    val platformDists = project.tasks.filter { task ->
-        task.name.matches(Consts.taskRegex)
-    }.toTypedArray()
-    project.tasks.getByName("distZip").finalizedBy(*platformDists)
 }
 
 private fun CopySpec.fromKlib(projectName: String, target: String, version: String) {

gradle.properties

@@ -14,13 +14,10 @@ jvm.version=1.8
 versionName=0.3.0
 
 # Increase memory for in-process compiler execution.
-org.gradle.jvmargs=-Xmx3g
+org.gradle.jvmargs=-Xmx6g
 
 # https://kotlinlang.org/docs/migrating-multiplatform-project-to-14.html#migrate-to-the-hierarchical-project-structure
-kotlin.mpp.enableCompatibilityMetadataVariant=true
 kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.enableHierarchicalCommonization=true
-kotlin.mpp.androidSourceSetLayoutVersion=2
 
 # Publication pom properties
 POM_NAME=Sentry Kotlin Multiplatform SDK

sentry-kotlin-multiplatform/api/android/sentry-kotlin-multiplatform.api

@@ -150,6 +150,7 @@ public final class io/sentry/kotlin/multiplatform/SentryLevel : java/lang/Enum {
 	public static final field FATAL Lio/sentry/kotlin/multiplatform/SentryLevel;
 	public static final field INFO Lio/sentry/kotlin/multiplatform/SentryLevel;
 	public static final field WARNING Lio/sentry/kotlin/multiplatform/SentryLevel;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lio/sentry/kotlin/multiplatform/SentryLevel;
 	public static fun values ()[Lio/sentry/kotlin/multiplatform/SentryLevel;
 }

sentry-kotlin-multiplatform/api/jvm/sentry-kotlin-multiplatform.api

@@ -147,6 +147,7 @@ public final class io/sentry/kotlin/multiplatform/SentryLevel : java/lang/Enum {
 	public static final field FATAL Lio/sentry/kotlin/multiplatform/SentryLevel;
 	public static final field INFO Lio/sentry/kotlin/multiplatform/SentryLevel;
 	public static final field WARNING Lio/sentry/kotlin/multiplatform/SentryLevel;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lio/sentry/kotlin/multiplatform/SentryLevel;
 	public static fun values ()[Lio/sentry/kotlin/multiplatform/SentryLevel;
 }