Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
upgrade Kotlin to 1.4.0
  • Loading branch information
marandaneto committed Sep 8, 2020
commit 963e50de2d69b20425d7beaa148ac538f066e4b7
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Config.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Config {
val kotlinVersion = "1.3.72"
val kotlinVersion = "1.4.0"
val kotlinStdLib = "stdlib-jdk8"

object BuildPlugins {
Expand Down
5 changes: 5 additions & 0 deletions sentry-android-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ android {
// We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
isCheckReleaseBuilds = false
}

// needed because of Kotlin 1.4.x
configurations.all {
resolutionStrategy.force(Config.CompileOnly.jetbrainsAnnotations)
}
}

dependencies {
Expand Down
5 changes: 5 additions & 0 deletions sentry-android-ndk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ android {
nativeBundleExport {
headerDir = "${project.projectDir}/$sentryNativeSrc/include"
}

// needed because of Kotlin 1.4.x
configurations.all {
resolutionStrategy.force(Config.CompileOnly.jetbrainsAnnotations)
}
}

dependencies {
Expand Down