Bump to Kotlin 1.5 (getsentry#1815)

marandaneto · web-flow · commit 1ea60dcdff8d · 2021-11-23T10:11:35.000+01:00
diff --git 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,8 +26,7 @@ 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)
+* Bump: Kotlin to 1.5 and compatibility to 1.4 for sentry-android-timber (#1815)
 
 ## 5.4.1
 
diff --git 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
@@ -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
@@ -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<KotlinCompile>().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
@@ -17,6 +17,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().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
@@ -16,7 +16,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().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
@@ -18,6 +18,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ android {`
`30`	`30`
`31`	`31`	`kotlinOptions {`
`32`	`32`	`jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`33`	`+ kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`testOptions {`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ configure<JavaPluginExtension> {`
`17`	`17`
`18`	`18`	`tasks.withType<KotlinCompile>().configureEach {`
`19`	`19`	`kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`20`	`+ kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ configure<JavaPluginExtension> {`
`16`	`16`
`17`	`17`	`tasks.withType<KotlinCompile>().configureEach {`
`18`	`18`	`kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()`
`19`		`- kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion`
	`19`	`+ kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ configure<JavaPluginExtension> {`
`18`	`18`
`19`	`19`	`tasks.withType<KotlinCompile>().configureEach {`
`20`	`20`	`kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`21`	`+ kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`dependencies {`