kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Upgrade Kotlin and AndroidX dependencies (#1402)

Browse source
This commit is contained in:
Harsh Shandilya 2021-05-06 12:23:53 +05:30 committed by GitHub
parent db77ceccad
commit 0f465d4b95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -5,6 +5,8 @@
plugins { plugins {
`binary-compatibility-validator` `binary-compatibility-validator`
`aps-plugin` `aps-plugin`
// Fix for leak in Kotlin Gradle Plugin: https://youtrack.jetbrains.com/issue/KT-46368
id("dev.zacsweers.kgp-150-leak-patcher") version "1.0.1"
} }
allprojects { apply(plugin = "com.ncorti.ktfmt.gradle") } allprojects { apply(plugin = "com.ncorti.ktfmt.gradle") }

16
buildSrc/build.gradle.kts
View file

@ -12,6 +12,18 @@ repositories {
google() google()
gradlePluginPortal() gradlePluginPortal()
mavenCentral() mavenCentral()
// Dokka's transitive kotlinx-html dependency is only published to their Space repo
// https://github.com/Kotlin/dokka/releases/tag/v1.4.32
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") {
name = "KotlinX HTML Maven"
content {
includeModule("org.jetbrains.kotlinx", "kotlinx-html")
includeModule("org.jetbrains.kotlinx", "kotlinx-html-assembly")
includeModule("org.jetbrains.kotlinx", "kotlinx-html-common")
includeModule("org.jetbrains.kotlinx", "kotlinx-html-js")
includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
}
}
} }
ktfmt { ktfmt {
@ -37,9 +49,9 @@ gradlePlugin {
} }
dependencies { dependencies {
implementation("com.android.tools.build:gradle:4.1.3") implementation("com.android.tools.build:gradle:4.2.0")
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0") implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.30") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32")
implementation("de.undercouch:gradle-download-task:4.1.1") implementation("de.undercouch:gradle-download-task:4.1.1")
implementation("com.google.dagger:hilt-android-gradle-plugin:2.35.1") implementation("com.google.dagger:hilt-android-gradle-plugin:2.35.1")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")

12
gradle/libs.versions.toml
View file

@ -1,6 +1,6 @@
# Centralized versions for dependencies that share versions # Centralized versions for dependencies that share versions
[versions] [versions]
androidx_test = "1.4.0-alpha05" androidx_test = "1.4.0-alpha06"
coroutines = "1.5.0-RC" coroutines = "1.5.0-RC"
hilt = "2.35.1" hilt = "2.35.1"
kotlin = "1.5.0" kotlin = "1.5.0"
@ -8,9 +8,9 @@ lifecycle = "2.4.0-alpha01"
[libraries] [libraries]
# buildSrc dependencies # buildSrc dependencies
androidGradlePlugin = "com.android.tools.build:gradle:4.1.3" androidGradlePlugin = "com.android.tools.build:gradle:4.2.0"
binaryCompatibilityValidator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0" binaryCompatibilityValidator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0"
dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30" dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.4.32"
downloadTaskPlugin = "de.undercouch:gradle-download-task:4.1.1" downloadTaskPlugin = "de.undercouch:gradle-download-task:4.1.1"
hiltGradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" } hiltGradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@ -29,7 +29,7 @@ androidx-annotation = "androidx.annotation:annotation:1.1.0"
androidx-autofill = "androidx.autofill:autofill:1.2.0-alpha01" androidx-autofill = "androidx.autofill:autofill:1.2.0-alpha01"
androidx-appcompat = "androidx.appcompat:appcompat:1.3.0-rc01" androidx-appcompat = "androidx.appcompat:appcompat:1.3.0-rc01"
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03" androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-beta01" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-beta02"
androidx-coreKtx = "androidx.core:core-ktx:1.6.0-alpha02" androidx-coreKtx = "androidx.core:core-ktx:1.6.0-alpha02"
androidx-documentfile = "androidx.documentfile:documentfile:1.0.1" androidx-documentfile = "androidx.documentfile:documentfile:1.0.1"
androidx-fragmentKtx = "androidx.fragment:fragment-ktx:1.3.3" androidx-fragmentKtx = "androidx.fragment:fragment-ktx:1.3.3"
@ -63,10 +63,10 @@ thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.5"
thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r" thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
thirdparty-kotlinResult = "com.michael-bull.kotlin-result:kotlin-result:1.1.11" thirdparty-kotlinResult = "com.michael-bull.kotlin-result:kotlin-result:1.1.11"
thirdparty-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.7" thirdparty-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.7"
thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.0" thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.1.0"
thirdparty-plumber = "com.squareup.leakcanary:plumber-android:2.7" thirdparty-plumber = "com.squareup.leakcanary:plumber-android:2.7"
thirdparty-sshj = "com.hierynomus:sshj:0.31.0" thirdparty-sshj = "com.hierynomus:sshj:0.31.0"
thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:v5.7.1" thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:5.7.5"
thirdparty-timber = "com.jakewharton.timber:timber:4.7.1" thirdparty-timber = "com.jakewharton.timber:timber:4.7.1"
thirdparty-timberkt = "com.github.ajalt:timberkt:1.5.1" thirdparty-timberkt = "com.github.ajalt:timberkt:1.5.1"
thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.0" thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.0"