From e7db4a0bf63545128f5f0caccbf7df5946d2f99a Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 10 Sep 2020 20:10:16 +0200 Subject: [PATCH 1/3] Fix Kotlin version compatibility. --- gradle.properties | 3 +++ sentry-spring-boot-starter/build.gradle.kts | 1 + sentry-spring/build.gradle.kts | 1 + sentry-test-support/build.gradle.kts | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cce174a00..e93deafa5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,9 @@ android.defaults.buildfeatures.aidl=false # disable Resource Values generation android.defaults.buildfeatures.resvalues=false +# disable automatically adding Kotlin stdlib to compile dependencies +kotlin.stdlib.default.dependency=false + # TODO: Enable Prefab https://android-developers.googleblog.com/2020/02/native-dependencies-in-android-studio-40.html # android.enablePrefab=true # android.prefabVersion=1.0.0 diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index 0ca7e13e1..7ca181d52 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -29,6 +29,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.languageVersion = "1.3" } dependencies { diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index d50389923..60ad69d92 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -29,6 +29,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.languageVersion = "1.3" } dependencies { diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts index f36a71742..fefac4ef7 100644 --- a/sentry-test-support/build.gradle.kts +++ b/sentry-test-support/build.gradle.kts @@ -27,7 +27,7 @@ dependencies { compileOnly(Config.CompileOnly.jetbrainsAnnotations) // tests - api(kotlin(Config.kotlinStdLib)) + implementation(kotlin(Config.kotlinStdLib)) implementation(Config.TestLibs.kotlinTestJunit) implementation(Config.TestLibs.mockitoKotlin) } From f1e386e959cd88e089ee637d9f2157dd9f5b4a09 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 10 Sep 2020 20:22:49 +0200 Subject: [PATCH 2/3] Polish. --- buildSrc/src/main/java/Config.kt | 1 + sentry-spring-boot-starter/build.gradle.kts | 2 +- sentry-spring/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 33d13ac71..2003dc0c2 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -5,6 +5,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.3.3.RELEASE" + val springKotlinCompatibleLanguageVersion = "1.3" object BuildPlugins { val androidGradle = "com.android.tools.build:gradle:4.0.1" diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index 7ca181d52..a2adf698b 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -29,7 +29,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = "1.3" + kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion } dependencies { diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 60ad69d92..31d69e95a 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -29,7 +29,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = "1.3" + kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion } dependencies { From 29f0b15e241b4bf0732e23f14bcb48f09a5399b4 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 10 Sep 2020 20:24:34 +0200 Subject: [PATCH 3/3] Polish. --- buildSrc/src/main/java/Config.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 2003dc0c2..3ebc6dd1e 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -5,6 +5,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.3.3.RELEASE" + // Spring is currently not compatible with Kotlin 1.4 val springKotlinCompatibleLanguageVersion = "1.3" object BuildPlugins {