summaryrefslogtreecommitdiff
path: root/buildSrc
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2021-10-09 13:13:14 +0530
committerGitHub <noreply@github.com>2021-10-09 13:13:14 +0530
commit6df3ba0083f89907a4393652f3b4392334c3b8a1 (patch)
treef76994d8bb6e7d9f03b3d2d9f6588cce19cae6fc /buildSrc
parentc7fdd913c599805a92c29a7d1ddd57140e182b6e (diff)
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
Diffstat (limited to 'buildSrc')
-rw-r--r--buildSrc/build.gradle.kts22
-rw-r--r--buildSrc/src/main/java/BaseProjectConfig.kt15
2 files changed, 6 insertions, 31 deletions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index c32745a0..fe72e9e0 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -6,21 +6,9 @@
plugins { `kotlin-dsl` }
repositories {
- google()
- gradlePluginPortal()
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")
- }
- }
+ gradlePluginPortal()
+ google()
}
gradlePlugin {
@@ -46,13 +34,13 @@ gradlePlugin {
dependencies {
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.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("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.kotlinx:binary-compatibility-validator:0.6.0")
}
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index 2c6f8fdc..a3ece4b8 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -10,9 +10,7 @@ import org.gradle.api.Project
import org.gradle.api.tasks.testing.Test
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.api.tasks.wrapper.Wrapper
-import org.gradle.kotlin.dsl.maven
import org.gradle.kotlin.dsl.register
-import org.gradle.kotlin.dsl.repositories
import org.gradle.kotlin.dsl.withType
import org.gradle.language.nativeplatform.internal.BuildType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -36,18 +34,7 @@ internal fun Project.configureForRootProject() {
/** Configure all projects including the root project */
internal fun Project.configureForAllProjects() {
- repositories {
- 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> {
+ tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
allWarningsAsErrors = true
jvmTarget = JavaVersion.VERSION_11.toString()