[full ci] feat: update project to build with Kotlin 1.4

bugsnag · Jan 6, 2022 · 57a0ef7 · 57a0ef7
1 parent ceec0a9
commit 57a0ef7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@
 * Explicitly define Kotlin api/language versions
   [#1564](/~https://github.com/bugsnag/bugsnag-android/pull/1564)
 
+* Build project with Kotlin 1.4, maintain compat with Kotlin 1.3
+  [#1565](/~https://github.com/bugsnag/bugsnag-android/pull/1565)
+
 ### Bug fixes
 
 * Delete persisted NDK events earlier in delivery process

diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/LastRunInfoStore.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/LastRunInfoStore.kt
@@ -89,7 +89,8 @@ private class KeyValueWriter {
     private val sb = StringBuilder()
 
     fun add(key: String, value: Any) {
-        sb.appendln("$key$KEY_VALUE_DELIMITER$value")
+        sb.append("$key$KEY_VALUE_DELIMITER$value")
+        sb.append("\n")
     }
 
     override fun toString() = sb.toString()

diff --git a/...nag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt b/...nag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt
@@ -84,7 +84,7 @@ class BugsnagOkHttpPlugin @JvmOverloads constructor(
     ): Map<String, Any> {
         val request = call.request()
 
-        val data = mutableMapOf(
+        val data = mutableMapOf<String, Any>(
             "method" to request.method,
             "url" to sanitizeUrl(request),
             "duration" to nowMs - info.startTime,

diff --git a/bugsnag-plugin-react-native/src/test/java/com/bugsnag/android/LeaveBreadcrumbTest.kt b/bugsnag-plugin-react-native/src/test/java/com/bugsnag/android/LeaveBreadcrumbTest.kt
@@ -30,7 +30,7 @@ class LeaveBreadcrumbTest {
         crumb["message"] = "JS: invoked API"
         crumb["type"] = "request"
 
-        val metadata = hashMapOf(
+        val metadata = hashMapOf<String, Any?>(
             "customFoo" to "Flobber",
             "isJs" to true,
             "naughtyValue" to null

diff --git a/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt b/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt
@@ -11,7 +11,7 @@ object Versions {
     val compileSdkVersion = 31
     val ndk = "17.2.4988734"
     val java = JavaVersion.VERSION_1_7
-    val kotlin = "1.3.72"
+    val kotlin = "1.4.32"
 
     // plugins
     val androidGradlePlugin = "7.0.4"

diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -3,6 +3,6 @@ android {
         allWarningsAsErrors = true
         jvmTarget = "1.6"
         apiVersion = "1.3"
-        languageVersion = "1.3"
+        languageVersion = "1.4"
     }
 }