summaryrefslogtreecommitdiff
path: root/buildSrc
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2021-04-28 10:27:14 +0530
committerGitHub <noreply@github.com>2021-04-28 10:27:14 +0530
commit4880e1db276b4cf2ec29eeffbd38539ca643b4be (patch)
tree44d1a7948128e2f12b874167f8fe7db5df4e178f /buildSrc
parentd3bc28c1c38e51a642331973b10edfb49ec026b3 (diff)
Upgrade to Kotlin 1.5 (#1397)
* build: upgrade Kotlin to 1.5.0 and Hilt to 2.35.1 Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * all: address kotlin.time.seconds deprecation Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * autofill-parser/openpgp-ktx: require Kotlin 1.5 Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * all: address string method deprecations Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * build: disable NewApi lint Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'buildSrc')
-rw-r--r--buildSrc/build.gradle.kts4
-rw-r--r--buildSrc/src/main/java/BaseProjectConfig.kt3
2 files changed, 4 insertions, 3 deletions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 51a07fad..abdc6def 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -41,8 +41,8 @@ dependencies {
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.30")
implementation("de.undercouch:gradle-download-task:4.1.1")
- implementation("com.google.dagger:hilt-android-gradle-plugin:2.34.1-beta")
- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
+ implementation("com.google.dagger:hilt-android-gradle-plugin:2.35.1")
+ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
implementation("com.ncorti.ktfmt.gradle:plugin:0.5.0")
implementation("com.vanniktech:gradle-maven-publish-plugin:0.13.0")
implementation("com.vdurmont:semver4j:3.1.0")
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index 600a2e41..761146ba 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -36,6 +36,7 @@ internal fun Project.configureForAllProjects() {
repositories {
google()
mavenCentral()
+ @Suppress("DEPRECATION")
jcenter {
content {
// https://github.com/zhanghai/AndroidFastScroll/issues/35
@@ -57,7 +58,7 @@ internal fun Project.configureForAllProjects() {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
freeCompilerArgs = freeCompilerArgs + additionalCompilerArgs
- languageVersion = "1.4"
+ languageVersion = "1.5"
useIR = true
}
}