From 893af65b450ebb44c4f65bf46dadca5fd728fd65 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 16 Apr 2021 16:35:27 +0530 Subject: [PATCH] buildSrc: replace dependencies with direct references Signed-off-by: Harsh Shandilya --- buildSrc/build.gradle.kts | 16 ++++++++-------- buildSrc/settings.gradle.kts | 4 ++++ buildSrc/src/main/java/BaseProjectConfig.kt | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 05fc2284..e7709d69 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -39,12 +39,12 @@ gradlePlugin { } dependencies { - implementation(libs.androidGradlePlugin) - implementation(libs.binaryCompatibilityValidator) - implementation(libs.dokkaPlugin) - implementation(libs.downloadTaskPlugin) - implementation(libs.kotlinGradlePlugin) - implementation(libs.ktfmtGradlePlugin) - implementation(libs.mavenPublishPlugin) - implementation(libs.semver4j) + implementation("com.android.tools.build:gradle:4.1.3") + implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.2.4") + implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.30") + implementation("de.undercouch:gradle-download-task:4.1.1") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32") + implementation("com.ncorti.ktfmt.gradle:plugin:0.5.0") + implementation("com.vanniktech:gradle-maven-publish-plugin:0.13.0") + implementation("com.vdurmont:semver4j:3.1.0") } diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 215a5d58..fae32dd6 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,3 +1,6 @@ +/** + * IDEs don't support this very well for buildSrc, so we use the regular dependency format + * until that changes. dependencyResolutionManagement { versionCatalogs { create("libs") { @@ -5,3 +8,4 @@ dependencyResolutionManagement { } } } +*/ diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index f212bc61..722383c8 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -36,7 +36,7 @@ internal fun Project.configureForAllProjects() { repositories { google() mavenCentral() - jcenter() { + jcenter { content { // https://github.com/zhanghai/AndroidFastScroll/issues/35 includeModule("me.zhanghai.android.fastscroll", "library")