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

Workaround AGP and Dokka conflict (#1872)

Browse source
This commit is contained in:
Harsh Shandilya 2022-04-26 01:43:37 +05:30 committed by GitHub
parent b855aa8bda
commit 109de59118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle.kts
View file

@ -20,4 +20,5 @@ plugins {
id("com.github.android-password-store.git-hooks") id("com.github.android-password-store.git-hooks")
id("com.github.android-password-store.spotless") id("com.github.android-password-store.spotless")
alias(libs.plugins.hilt) apply false alias(libs.plugins.hilt) apply false
alias(libs.plugins.dokka) apply false
} }

4
gradle/libs.versions.toml
View file

@ -4,6 +4,7 @@ androidx_activity = "1.4.0"
androidx_test = "1.4.1-alpha05" androidx_test = "1.4.1-alpha05"
compose = "1.2.0-alpha08" compose = "1.2.0-alpha08"
coroutines = "1.6.1" coroutines = "1.6.1"
dokka = "1.6.21"
flowbinding = "1.2.0" flowbinding = "1.2.0"
hilt = "2.41" hilt = "2.41"
kotlin = "1.6.21" kotlin = "1.6.21"
@ -11,6 +12,7 @@ leakcanary = "2.9.1"
lifecycle = "2.4.1" lifecycle = "2.4.1"
[plugins] [plugins]
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
[libraries] [libraries]
@ -41,7 +43,7 @@ aps-zxingAndroidEmbedded = "com.github.android-password-store:zxing-android-embe
build-agp = "com.android.tools.build:gradle:7.1.3" build-agp = "com.android.tools.build:gradle:7.1.3"
build-binarycompat = "org.jetbrains.kotlinx:binary-compatibility-validator:0.9.0" build-binarycompat = "org.jetbrains.kotlinx:binary-compatibility-validator:0.9.0"
build-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21" build-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
build-download = "de.undercouch:gradle-download-task:5.0.5" build-download = "de.undercouch:gradle-download-task:5.0.5"
build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.19.0" build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.19.0"