File tree Expand file tree Collapse file tree 12 files changed +80
-25
lines changed
sentry-kotlin-multiplatform Expand file tree Collapse file tree 12 files changed +80
-25
lines changed Original file line number Diff line number Diff line change 1414 uses : actions/setup-java@v3
1515 with :
1616 distribution : " adopt"
17- java-version : " 11 "
17+ java-version : " 17 "
1818
1919 - name : Cache Gradle packages
2020 uses : actions/cache@v2
Original file line number Diff line number Diff line change 1- import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
31plugins {
42 `kotlin- dsl`
53}
@@ -8,8 +6,6 @@ repositories {
86 mavenCentral()
97}
108
11- tasks.withType<KotlinCompile >().configureEach {
12- kotlinOptions {
13- jvmTarget = properties[" jvm.version" ].toString()
14- }
9+ kotlin {
10+ jvmToolchain(17 )
1511}
Original file line number Diff line number Diff line change @@ -7,9 +7,6 @@ android.useAndroidX=true
77# Jetpack Compose
88compose.version =1.3.1-rc01
99
10- # JVM target when compiling Kotlin
11- jvm.version =1.8
12-
1310# Release information
1411versionName =0.5.0
1512
Original file line number Diff line number Diff line change 11# Mon Feb 27 16:36:52 CET 2023
22distributionBase =GRADLE_USER_HOME
3- distributionUrl =https\://services.gradle.org/distributions/gradle-7.5 -bin.zip
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.6 -bin.zip
44distributionPath =wrapper/dists
55zipStorePath =wrapper/dists
66zipStoreBase =GRADLE_USER_HOME
Original file line number Diff line number Diff line change 11import com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING
22import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
3+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
34
45plugins {
56 kotlin(Config .multiplatform)
@@ -32,6 +33,15 @@ android {
3233 }
3334}
3435
36+ java {
37+ sourceCompatibility = JavaVersion .VERSION_1_8
38+ targetCompatibility = JavaVersion .VERSION_1_8
39+ }
40+
41+ tasks.withType<KotlinCompile > {
42+ kotlinOptions.jvmTarget = " 1.8"
43+ }
44+
3545kotlin {
3646 explicitApi()
3747 applyDefaultHierarchyTemplate()
Original file line number Diff line number Diff line change 1+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13plugins {
24 id(" com.android.application" )
35 kotlin(" android" )
@@ -31,6 +33,15 @@ android {
3133 }
3234}
3335
36+ java {
37+ sourceCompatibility = JavaVersion .VERSION_1_8
38+ targetCompatibility = JavaVersion .VERSION_1_8
39+ }
40+
41+ tasks.withType<KotlinCompile > {
42+ kotlinOptions.jvmTarget = " 1.8"
43+ }
44+
3445dependencies {
3546 implementation(rootProject.project(" :sentry-samples:kmp-app-cocoapods:shared" ))
3647 implementation(" com.google.android.material:material:1.6.1" )
Original file line number Diff line number Diff line change 11import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23
34plugins {
45 kotlin(" multiplatform" )
@@ -14,11 +15,17 @@ repositories {
1415 maven(" https://maven.pkg.jetbrains.space/public/p/compose/dev" )
1516}
1617
18+ java {
19+ sourceCompatibility = JavaVersion .VERSION_1_8
20+ targetCompatibility = JavaVersion .VERSION_1_8
21+ }
22+
23+ tasks.withType<KotlinCompile > {
24+ kotlinOptions.jvmTarget = " 1.8"
25+ }
26+
1727kotlin {
1828 jvm {
19- compilations.all {
20- kotlinOptions.jvmTarget = " 11"
21- }
2229 withJava()
2330 }
2431 sourceSets {
Original file line number Diff line number Diff line change @@ -27,4 +27,4 @@ SPEC CHECKSUMS:
2727
2828PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
2929
30- COCOAPODS: 1.14.3
30+ COCOAPODS: 1.15.2
Original file line number Diff line number Diff line change 1+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13plugins {
24 kotlin(" multiplatform" )
35 kotlin(" native.cocoapods" )
46 id(" com.android.library" )
57}
68
9+ java {
10+ sourceCompatibility = JavaVersion .VERSION_1_8
11+ targetCompatibility = JavaVersion .VERSION_1_8
12+ }
13+
14+ tasks.withType<KotlinCompile > {
15+ kotlinOptions.jvmTarget = " 1.8"
16+ }
17+
718kotlin {
819 applyDefaultHierarchyTemplate()
920
10- androidTarget {
11- compilations.all {
12- kotlinOptions {
13- jvmTarget = " 1.8"
14- }
15- }
16- }
21+ androidTarget()
1722 jvm()
1823 iosX64()
1924 iosArm64()
Original file line number Diff line number Diff line change 1+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13plugins {
24 id(" com.android.application" )
35 kotlin(" android" )
46 id(" io.sentry.android.gradle" ) version " 4.0.0"
57}
68
9+ java {
10+ sourceCompatibility = JavaVersion .VERSION_1_8
11+ targetCompatibility = JavaVersion .VERSION_1_8
12+ }
13+
14+ tasks.withType<KotlinCompile > {
15+ kotlinOptions.jvmTarget = " 1.8"
16+ }
17+
718android {
819 compileSdk = Config .Android .compileSdkVersion
920 defaultConfig {
You can’t perform that action at this time.
0 commit comments