Upgrade plugin dependencies and fix Javadoc generation (#1517)
* build: upgrade all plugins * autofill-parser/openpgp-ktx: apply Dokka plugin * Move repository configuration to settings.gradle.kts * Replace deprecated lintOptions * Reorder repositories
This commit is contained in:
parent
c7fdd913c5
commit
6df3ba0083
6 changed files with 25 additions and 33 deletions
|
@ -49,7 +49,7 @@ android {
|
||||||
|
|
||||||
buildFeatures.compose = true
|
buildFeatures.compose = true
|
||||||
|
|
||||||
lintOptions {
|
lint {
|
||||||
isAbortOnError = true
|
isAbortOnError = true
|
||||||
isCheckReleaseBuilds = false
|
isCheckReleaseBuilds = false
|
||||||
disable("MissingTranslation", "PluralsCandidate", "ImpliedQuantity")
|
disable("MissingTranslation", "PluralsCandidate", "ImpliedQuantity")
|
||||||
|
|
|
@ -7,6 +7,7 @@ plugins {
|
||||||
id("com.android.library")
|
id("com.android.library")
|
||||||
id("com.vanniktech.maven.publish")
|
id("com.vanniktech.maven.publish")
|
||||||
kotlin("android")
|
kotlin("android")
|
||||||
|
id("org.jetbrains.dokka")
|
||||||
`aps-plugin`
|
`aps-plugin`
|
||||||
`psl-plugin`
|
`psl-plugin`
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,21 +6,9 @@
|
||||||
plugins { `kotlin-dsl` }
|
plugins { `kotlin-dsl` }
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
|
||||||
gradlePluginPortal()
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
// Dokka's transitive kotlinx-html dependency is only published to their Space repo
|
gradlePluginPortal()
|
||||||
// https://github.com/Kotlin/dokka/releases/tag/v1.4.32
|
google()
|
||||||
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")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gradlePlugin {
|
gradlePlugin {
|
||||||
|
@ -46,13 +34,13 @@ gradlePlugin {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("com.android.tools.build:gradle:7.0.2")
|
implementation("com.android.tools.build:gradle:7.0.2")
|
||||||
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.14.2")
|
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
|
||||||
implementation("com.google.dagger:hilt-android-gradle-plugin:2.39.1")
|
implementation("com.google.dagger:hilt-android-gradle-plugin:2.39.1")
|
||||||
implementation("com.squareup.okhttp3:okhttp:4.9.0")
|
implementation("com.squareup.okhttp3:okhttp:4.9.0")
|
||||||
implementation("com.vanniktech:gradle-maven-publish-plugin:0.17.0")
|
implementation("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
|
||||||
implementation("com.vdurmont:semver4j:3.1.0")
|
implementation("com.vdurmont:semver4j:3.1.0")
|
||||||
implementation("de.undercouch:gradle-download-task:4.1.2")
|
implementation("de.undercouch:gradle-download-task:4.1.2")
|
||||||
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
|
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.31")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
|
||||||
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0")
|
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0")
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,9 +10,7 @@ import org.gradle.api.Project
|
||||||
import org.gradle.api.tasks.testing.Test
|
import org.gradle.api.tasks.testing.Test
|
||||||
import org.gradle.api.tasks.testing.logging.TestLogEvent
|
import org.gradle.api.tasks.testing.logging.TestLogEvent
|
||||||
import org.gradle.api.tasks.wrapper.Wrapper
|
import org.gradle.api.tasks.wrapper.Wrapper
|
||||||
import org.gradle.kotlin.dsl.maven
|
|
||||||
import org.gradle.kotlin.dsl.register
|
import org.gradle.kotlin.dsl.register
|
||||||
import org.gradle.kotlin.dsl.repositories
|
|
||||||
import org.gradle.kotlin.dsl.withType
|
import org.gradle.kotlin.dsl.withType
|
||||||
import org.gradle.language.nativeplatform.internal.BuildType
|
import org.gradle.language.nativeplatform.internal.BuildType
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
@ -36,18 +34,7 @@ internal fun Project.configureForRootProject() {
|
||||||
|
|
||||||
/** Configure all projects including the root project */
|
/** Configure all projects including the root project */
|
||||||
internal fun Project.configureForAllProjects() {
|
internal fun Project.configureForAllProjects() {
|
||||||
repositories {
|
tasks.withType<KotlinCompile>().configureEach {
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
maven("https://jitpack.io") {
|
|
||||||
name = "JitPack"
|
|
||||||
content {
|
|
||||||
includeModule("com.github.haroldadmin", "WhatTheStack")
|
|
||||||
includeModule("com.github.open-keychain.open-keychain", "sshauthentication-api")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tasks.withType<KotlinCompile> {
|
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
allWarningsAsErrors = true
|
allWarningsAsErrors = true
|
||||||
jvmTarget = JavaVersion.VERSION_11.toString()
|
jvmTarget = JavaVersion.VERSION_11.toString()
|
||||||
|
|
|
@ -7,6 +7,7 @@ plugins {
|
||||||
id("com.android.library")
|
id("com.android.library")
|
||||||
id("com.vanniktech.maven.publish")
|
id("com.vanniktech.maven.publish")
|
||||||
kotlin("android")
|
kotlin("android")
|
||||||
|
id("org.jetbrains.dokka")
|
||||||
`aps-plugin`
|
`aps-plugin`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,22 @@ enableFeaturePreview("VERSION_CATALOGS")
|
||||||
// Plugin repositories
|
// Plugin repositories
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencyResolutionManagement {
|
||||||
|
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
google()
|
||||||
|
maven("https://jitpack.io") {
|
||||||
|
name = "JitPack"
|
||||||
|
content {
|
||||||
|
includeModule("com.github.haroldadmin", "WhatTheStack")
|
||||||
|
includeModule("com.github.open-keychain.open-keychain", "sshauthentication-api")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue