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

Upgrade Gradle and androidx.annotation (#1407)

Browse source
This commit is contained in:
Harsh Shandilya 2021-05-12 16:11:32 +05:30 • committed by GitHub
parent e6e52b3594
commit 859dc008bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -51,7 +51,7 @@ android {
dependencies { dependencies {
kapt(libs.dagger.hilt.compiler) kapt(libs.dagger.hilt.compiler)
compileOnly(libs.androidx.annotation) implementation(libs.androidx.annotation)
coreLibraryDesugaring(libs.android.desugarJdkLibs) coreLibraryDesugaring(libs.android.desugarJdkLibs)
implementation(projects.autofillParser) implementation(projects.autofillParser)
implementation(projects.formatCommon) implementation(projects.formatCommon)

2
autofill-parser/build.gradle.kts
View file

@ -19,7 +19,7 @@ android {
} }
dependencies { dependencies {
compileOnly(libs.androidx.annotation) implementation(libs.androidx.annotation)
implementation(libs.androidx.autofill) implementation(libs.androidx.autofill)
implementation(libs.kotlin.coroutines.android) implementation(libs.kotlin.coroutines.android)
implementation(libs.kotlin.coroutines.core) implementation(libs.kotlin.coroutines.core)

4
buildSrc/src/main/java/BaseProjectConfig.kt
View file

@ -21,9 +21,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
*/ */
internal fun Project.configureForRootProject() { internal fun Project.configureForRootProject() {
tasks.withType<Wrapper> { tasks.withType<Wrapper> {
gradleVersion = "7.0" gradleVersion = "7.0.1"
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
distributionSha256Sum = "81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd" distributionSha256Sum = "ca42877db3519b667cd531c414be517b294b0467059d401e7133f0e55b9bf265"
} }
configureBinaryCompatibilityValidator() configureBinaryCompatibilityValidator()
} }

2
format-common/build.gradle.kts
View file

@ -8,7 +8,7 @@ plugins {
} }
dependencies { dependencies {
compileOnly(libs.androidx.annotation) implementation(libs.androidx.annotation)
implementation(libs.dagger.hilt.core) implementation(libs.dagger.hilt.core)
implementation(libs.thirdparty.commons.codec) implementation(libs.thirdparty.commons.codec)
implementation(libs.thirdparty.kotlinResult) implementation(libs.thirdparty.kotlinResult)

2
gradle/libs.versions.toml
View file

@ -25,7 +25,7 @@ kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-co
# AndroidX dependencies # AndroidX dependencies
androidx-activityKtx = "androidx.activity:activity-ktx:1.3.0-alpha07" androidx-activityKtx = "androidx.activity:activity-ktx:1.3.0-alpha07"
androidx-annotation = "androidx.annotation:annotation:1.1.0" androidx-annotation = "androidx.annotation:annotation:1.2.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"

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd distributionSha256Sum=ca42877db3519b667cd531c414be517b294b0467059d401e7133f0e55b9bf265
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists