From 5091fc3537b25e8b47727517d0ac1c853c29d95e Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Thu, 18 Nov 2021 15:27:57 +0100 Subject: [PATCH 1/3] Bump to Kotlin 1.5 --- buildSrc/src/main/java/Config.kt | 3 ++- sentry-android-okhttp/build.gradle.kts | 1 + sentry-android-timber/build.gradle.kts | 7 +------ sentry-apollo/build.gradle.kts | 1 + sentry-graphql/build.gradle.kts | 2 +- sentry-kotlin-extensions/build.gradle.kts | 1 + 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 18b922bdf6..8c80405119 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -1,12 +1,13 @@ import java.math.BigDecimal object Config { - val kotlinVersion = "1.4.32" + val kotlinVersion = "1.5.31" val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.4.4" // Spring is currently not compatible with Kotlin 1.4 val springKotlinCompatibleLanguageVersion = "1.3" + val kotlinCompatibleLanguageVersion = "1.4" object BuildPlugins { val androidGradle = "com.android.tools.build:gradle:7.0.3" diff --git a/sentry-android-okhttp/build.gradle.kts b/sentry-android-okhttp/build.gradle.kts index 971a9174c2..cd6c9553ef 100644 --- a/sentry-android-okhttp/build.gradle.kts +++ b/sentry-android-okhttp/build.gradle.kts @@ -30,6 +30,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion } testOptions { diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 9c5fae7fa0..7995ac241b 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -1,7 +1,6 @@ import io.gitlab.arturbosch.detekt.Detekt import io.gitlab.arturbosch.detekt.extensions.DetektExtension import org.jetbrains.kotlin.config.KotlinCompilerVersion -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("com.android.library") @@ -34,6 +33,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion } testOptions { @@ -69,11 +69,6 @@ kotlin { explicitApi() } -tasks.withType().configureEach { - // Timber uses Kotlin 1.2 - kotlinOptions.languageVersion = "1.2" -} - dependencies { api(projects.sentry) diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index f936ed717e..516bd7bd1d 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -17,6 +17,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion } dependencies { diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index 1dd3006032..c9fb4a6004 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -16,7 +16,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion } dependencies { diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index 69eb737fad..27bd5273ed 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -18,6 +18,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion } dependencies { From ce15a3d8adb7aa20ab9d10e47652584709f9d66f Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Tue, 23 Nov 2021 09:43:29 +0100 Subject: [PATCH 2/3] pr id --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d78ce2afe1..2fe83199a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +Breaking changes: + +* Bump: Kotlin to 1.5 and compatibility to 1.4 for sentry-android-timber (#1815) + ## 5.4.1 * Feat: Refactor OkHttp and Apollo to Kotlin functional interfaces (#1797) From 5d4d7d807d9324d5e7d0484561843e3260ca71d5 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Tue, 23 Nov 2021 09:44:46 +0100 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b3838c668..9642122857 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Feat: Use float instead of Date for protocol types for higher precision (#1737) * Ref: Bind external properties to a dedicated class. (#1750) * Ref: Debug log serializable objects (#1795) +* Ref: catch Throwable instead of Exception to suppress internal SDK errors (#1812) Breaking changes: @@ -25,11 +26,6 @@ Breaking changes: * Call `toString()` where object graphs exceed max depth. * Remove `gson` dependency. * Remove `IUnknownPropertiesConsumer` - -* Ref: catch Throwable instead of Exception to suppress internal SDK errors (#1812) - -Breaking changes: - * Bump: Kotlin to 1.5 and compatibility to 1.4 for sentry-android-timber (#1815) ## 5.4.1