From ceec0a94efae560aafc2c3c426e69e3fdc76e3bc Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Mon, 20 Dec 2021 15:48:33 +0000 Subject: [PATCH 1/2] dep: explicitly define Kotlin api/language versions --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d391906fcb..8efb70e34b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ * Explicitly define Kotlin api/language versions [#1564](https://github.com/bugsnag/bugsnag-android/pull/1564) +* Explicitly define Kotlin api/language versions + [#1564](https://github.com/bugsnag/bugsnag-android/pull/1564) + ### Bug fixes * Delete persisted NDK events earlier in delivery process From 57a0ef7e0054b4d814213e911b2c731fb935b5e2 Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Tue, 21 Dec 2021 10:53:33 +0000 Subject: [PATCH 2/2] [full ci] feat: update project to build with Kotlin 1.4 --- CHANGELOG.md | 3 +++ .../src/main/java/com/bugsnag/android/LastRunInfoStore.kt | 3 ++- .../java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt | 2 +- .../src/test/java/com/bugsnag/android/LeaveBreadcrumbTest.kt | 2 +- buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt | 2 +- gradle/kotlin.gradle | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8efb70e34b..35bbd7e36b 100644 --- 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 index 4e6f125f7f..6309bbdc93 100644 --- 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/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt b/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt index 05cb96f1dc..281968fd74 100644 --- a/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt +++ b/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt @@ -84,7 +84,7 @@ class BugsnagOkHttpPlugin @JvmOverloads constructor( ): Map { val request = call.request() - val data = mutableMapOf( + val data = mutableMapOf( "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 index 2d97c6593a..d1ba9a909e 100644 --- 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( "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 index 3e2e256408..194ee5237a 100644 --- 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 index f86459f1c3..8de5c98be5 100644 --- 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" } }