Skip to content

Commit 403e823

Browse files
buenaflorgetsentry-botromtsn
authored
upgrade to Kotlin 1.9.21 (#146)
* intial poc * update api * Fix distZip * update changelog * update * remove optin * include samples * fix * Migrate samples to 1.9.20 * Add e2e test * Add optin * Disable automatic proguard upload * Increase jvm memory usage * Update changelog * fix sample * fix sample * use large macos image * Fix ci * Update optIn * Update to 1.9.21 * Update compose to 1.5.11 for samples * remove build.yml * Fix samples by updating koin * Remove dependencies changelog * Update CHANGELOG * Update import * Format code * Update readme * Update sentry-samples/README.md Co-authored-by: Roman Zavarnitsyn <[email protected]> * Disable koin sample for now - add it back later when koin supports kotlin 1.9.21 --------- Co-authored-by: Sentry Github Bot <[email protected]> Co-authored-by: Roman Zavarnitsyn <[email protected]>
1 parent add53d3 commit 403e823

File tree

57 files changed

+207
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+207
-291
lines changed

‎.run/iosApp-cocoapods.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="ProjectRunConfigurationManager">
2-
<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">
2+
<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">
33
<method v="2">
44
<option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
55
</method>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="ProjectRunConfigurationManager">
2-
<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">
2+
<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">
33
<method v="2">
44
<option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
55
</method>

‎CHANGELOG.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Dependencies
6+
7+
- Bump Kotlin version from v1.8.0 to v1.9.21 ([#146](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/146))
8+
39
## 0.3.0
410

511
### Features
612

713
- Add sample & trace rate configuration ([#144](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/144))
814
- Remove need for context in Sentry.init for Android ([#117](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/117))
915

10-
### Dependencies
11-
12-
- Bump Java SDK from v6.14.0 to v6.33.1 ([#139](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/139))
13-
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6331)
14-
- [diff](https://github.com/getsentry/sentry-java/compare/6.14.0...6.33.1)
15-
1616
## 0.2.1
1717

1818
### Fixes

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ buildProject:
3939
buildAppleSamples:
4040
./gradlew build -p sentry-samples
4141
cd ./sentry-samples/kmp-app-cocoapods/iosApp/iosApp && touch iosApp.xcconfig
42-
cd ./sentry-samples/kmp-app-mvvm-di/iosApp && touch iosApp.xcconfig
42+
# cd ./sentry-samples/kmp-app-mvvm-di/iosApp && touch iosApp.xcconfig
4343
sudo xcode-select --switch /Applications/Xcode.app && /usr/bin/xcodebuild -version
44+
./gradlew ":sentry-samples:kmp-app-cocoapods:shared:podInstall"
4445
cd ./sentry-samples/kmp-app-cocoapods/iosApp; pod install
4546
xcodebuild -workspace ./sentry-samples/kmp-app-cocoapods/iosApp/iosApp.xcworkspace -scheme iosApp -configuration Debug -sdk iphonesimulator -arch arm64
46-
xcodebuild -project ./sentry-samples/kmp-app-mvvm-di/iosApp.xcodeproj -scheme iosApp -configuration Debug -sdk iphonesimulator -arch arm64
47+
# xcodebuild -project ./sentry-samples/kmp-app-mvvm-di/iosApp.xcodeproj -scheme iosApp -configuration Debug -sdk iphonesimulator -arch arm64
4748

4849

4950
# Build all targets, run tests and checks api

‎build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ subprojects {
4545
}
4646

4747
afterEvaluate {
48+
val platformDists = project.tasks.filter { task ->
49+
task.name.matches(Regex("(.*)DistZip"))
50+
}.toTypedArray()
51+
project.tasks.getByName("distZip").finalizedBy(*platformDists)
52+
4853
apply<MavenPublishPlugin>()
4954

5055
configure<MavenPublishPluginExtension> {

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Config {
22
val agpVersion = "7.4.2"
3-
val kotlinVersion = "1.8.0"
4-
val composeVersion = "1.3.1-rc01"
3+
val kotlinVersion = "1.9.21"
4+
val composeVersion = "1.5.11"
55
val gradleMavenPublishPluginVersion = "0.18.0"
66

77
val multiplatform = "multiplatform"
@@ -38,6 +38,12 @@ object Config {
3838

3939
val sentryCocoaVersion = "8.4.0"
4040
val sentryCocoa = "Sentry"
41+
42+
object Samples {
43+
val koinVersion = "3.5.2-RC1"
44+
val koinCore = "io.insert-koin:koin-core:$koinVersion"
45+
val koinAndroid = "io.insert-koin:koin-android:$koinVersion"
46+
}
4147
}
4248

4349
object TestLibs {
@@ -48,10 +54,10 @@ object Config {
4854
val kotlinCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.0-RC"
4955
val kotlinxSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
5056

51-
val ktorClientCore = "io.ktor:ktor-client-core:2.3.0"
52-
val ktorClientSerialization = "io.ktor:ktor-client-serialization:2.3.0"
53-
val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:2.3.0"
54-
val ktorClientDarwin = "io.ktor:ktor-client-darwin:2.3.0"
57+
val ktorClientCore = "io.ktor:ktor-client-core:2.3.6"
58+
val ktorClientSerialization = "io.ktor:ktor-client-serialization:2.3.6"
59+
val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:2.3.6"
60+
val ktorClientDarwin = "io.ktor:ktor-client-darwin:2.3.6"
5561

5662
val roboelectric = "org.robolectric:robolectric:4.9"
5763
val junitKtx = "androidx.test.ext:junit-ktx:1.1.5"

‎buildSrc/src/main/java/Publication.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,6 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
173173
}
174174
fromKlib(project.name, "tvosSimulatorArm64", version)
175175
}
176-
177-
// make other distZip tasks run together with the main distZip
178-
val platformDists = project.tasks.filter { task ->
179-
task.name.matches(Consts.taskRegex)
180-
}.toTypedArray()
181-
project.tasks.getByName("distZip").finalizedBy(*platformDists)
182176
}
183177

184178
private fun CopySpec.fromKlib(projectName: String, target: String, version: String) {

‎gradle.properties‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ jvm.version=1.8
1414
versionName=0.3.0
1515

1616
# Increase memory for in-process compiler execution.
17-
org.gradle.jvmargs=-Xmx3g
17+
org.gradle.jvmargs=-Xmx6g
1818

1919
# https://kotlinlang.org/docs/migrating-multiplatform-project-to-14.html#migrate-to-the-hierarchical-project-structure
20-
kotlin.mpp.enableCompatibilityMetadataVariant=true
2120
kotlin.mpp.enableCInteropCommonization=true
22-
kotlin.mpp.enableHierarchicalCommonization=true
23-
kotlin.mpp.androidSourceSetLayoutVersion=2
2421

2522
# Publication pom properties
2623
POM_NAME=Sentry Kotlin Multiplatform SDK

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ public final class io/sentry/kotlin/multiplatform/SentryLevel : java/lang/Enum {
150150
public static final field FATAL Lio/sentry/kotlin/multiplatform/SentryLevel;
151151
public static final field INFO Lio/sentry/kotlin/multiplatform/SentryLevel;
152152
public static final field WARNING Lio/sentry/kotlin/multiplatform/SentryLevel;
153+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
153154
public static fun valueOf (Ljava/lang/String;)Lio/sentry/kotlin/multiplatform/SentryLevel;
154155
public static fun values ()[Lio/sentry/kotlin/multiplatform/SentryLevel;
155156
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public final class io/sentry/kotlin/multiplatform/SentryLevel : java/lang/Enum {
147147
public static final field FATAL Lio/sentry/kotlin/multiplatform/SentryLevel;
148148
public static final field INFO Lio/sentry/kotlin/multiplatform/SentryLevel;
149149
public static final field WARNING Lio/sentry/kotlin/multiplatform/SentryLevel;
150+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
150151
public static fun valueOf (Ljava/lang/String;)Lio/sentry/kotlin/multiplatform/SentryLevel;
151152
public static fun values ()[Lio/sentry/kotlin/multiplatform/SentryLevel;
152153
}

0 commit comments

Comments
 (0)