Extract dependencies to Dependencies (#6799)

build.gradle

@@ -1,11 +1,12 @@
 buildscript {
   dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
-    classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
-    classpath "com.android.tools.build:gradle:7.0.0"
-    classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1"
-    classpath "gradle.plugin.com.palantir.graal:gradle-graal:0.9.0"
-    classpath Dependencies.bnd
+    classpath Dependencies.kotlinPlugin
+    classpath Dependencies.dokkaPlugin
+    classpath Dependencies.androidPlugin
+    classpath Dependencies.androidJunit5Plugin
+    classpath Dependencies.graalPlugin
+    classpath Dependencies.bndPlugin
+    classpath Dependencies.shadowPlugin
   }
 
   repositories {
@@ -17,7 +18,6 @@ buildscript {
 
 plugins {
   id "ru.vyarus.animalsniffer" version "1.5.3"
-  id "com.github.johnrengelman.shadow" version "5.2.0"
   id "me.champeau.gradle.japicmp" version "0.2.9"
   id "com.diffplug.spotless" version "5.1.2"
   id "net.ltgt.errorprone" version "1.2.1"
@@ -98,14 +98,14 @@ subprojects { project ->
     checkstyleConfig
   }
   dependencies {
-    checkstyleConfig dependencies.create("com.puppycrawl.tools:checkstyle:${Versions.checkstyle}") {
+    checkstyleConfig dependencies.create(Dependencies.checkStyle) {
       transitive = false
     }
   }
   afterEvaluate {
     checkstyle {
       config = resources.text.fromArchiveEntry(configurations.checkstyleConfig, 'google_checks.xml')
-      toolVersion "${Versions.checkstyle}"
+      toolVersion "${Versions.checkStyle}"
       sourceSets = [project.sourceSets.main]
     }
   }
@@ -165,7 +165,7 @@ subprojects { project ->
     }
   } else if (platform == "conscrypt") {
     dependencies {
-      testRuntimeOnly "org.conscrypt:conscrypt-openjdk-uber:${Versions.conscrypt}"
+      testRuntimeOnly Dependencies.conscrypt
     }
   } else if (platform == "openjsse") {
     dependencies {

buildSrc/src/main/kotlin/deps.kt

@@ -15,76 +15,70 @@
  */
 
 object Versions {
-  const val animalSniffer = "1.19"
-  const val assertj = "3.15.0"
   const val bnd = "5.1.2"
-  const val bouncycastle = "1.68"
-  const val brotli = "0.1.2"
-  const val checkstyle = "8.28"
+  const val bouncyCastle = "1.68"
+  const val checkStyle = "8.28"
   const val conscrypt = "2.5.2"
-  const val corretto = "1.3.1"
-  const val equinox = "3.16.0"
-  const val findbugs = "3.0.2"
-  const val guava = "28.2-jre"
-  const val jnrUnixsocket = "0.28"
-  const val jsoup = "1.13.1"
-  const val junit = "4.13"
   const val junit5 = "5.7.0"
   const val junit5Android = "1.2.2"
   const val kotlin = "1.5.21"
-  const val ktlint = "0.38.0"
   const val moshi = "1.12.0"
   const val okio = "3.0.0-alpha.8"
-  const val openjsse = "1.1.6"
   const val picocli = "4.5.1"
 }
 
 object Dependencies {
+  const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
+  const val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
+  const val androidPlugin = "com.android.tools.build:gradle:7.0.0"
+  const val androidJunit5Plugin = "de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1"
+  const val graalPlugin = "gradle.plugin.com.palantir.graal:gradle-graal:0.9.0"
+  const val bndPlugin = "biz.aQute.bnd:biz.aQute.bnd.gradle:${Versions.bnd}"
+  const val shadowPlugin = "gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0"
+
   const val android = "org.robolectric:android-all:11-robolectric-6757853"
-  const val animalSniffer = "org.codehaus.mojo:animal-sniffer-annotations:${Versions.animalSniffer}"
-  const val assertj = "org.assertj:assertj-core:${Versions.assertj}"
-  const val bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:${Versions.bnd}"
+  const val animalSniffer = "org.codehaus.mojo:animal-sniffer-annotations:1.19"
+  const val assertj = "org.assertj:assertj-core:3.15.0"
   const val bndResolve = "biz.aQute.bnd:biz.aQute.resolve:${Versions.bnd}"
-  const val bouncycastle = "org.bouncycastle:bcprov-jdk15to18:${Versions.bouncycastle}"
-  const val bouncycastlepkix = "org.bouncycastle:bcpkix-jdk15to18:${Versions.bouncycastle}"
-  const val bouncycastletls = "org.bouncycastle:bctls-jdk15to18:${Versions.bouncycastle}"
-  const val brotli = "org.brotli:dec:${Versions.brotli}"
+  const val bouncycastle = "org.bouncycastle:bcprov-jdk15to18:${Versions.bouncyCastle}"
+  const val bouncycastlepkix = "org.bouncycastle:bcpkix-jdk15to18:${Versions.bouncyCastle}"
+  const val bouncycastletls = "org.bouncycastle:bctls-jdk15to18:${Versions.bouncyCastle}"
+  const val brotli = "org.brotli:dec:0.1.2"
   const val conscrypt = "org.conscrypt:conscrypt-openjdk-uber:${Versions.conscrypt}"
   const val conscryptAndroid = "org.conscrypt:conscrypt-android:${Versions.conscrypt}"
-  const val corretto =
-    "software.amazon.cryptools:AmazonCorrettoCryptoProvider:${Versions.corretto}:linux-x86_64"
-  const val equinox = "org.eclipse.platform:org.eclipse.osgi:${Versions.equinox}"
-  const val guava = "com.google.guava:guava:${Versions.guava}"
+  const val corretto = "software.amazon.cryptools:AmazonCorrettoCryptoProvider:1.3.1:linux-x86_64"
+  const val equinox = "org.eclipse.platform:org.eclipse.osgi:3.16.0"
+  const val guava = "com.google.guava:guava:28.2-jre"
   const val hamcrest = "org.hamcrest:hamcrest-library:2.1"
-  const val jnrUnixsocket = "com.github.jnr:jnr-unixsocket:${Versions.jnrUnixsocket}"
-  const val jsoup = "org.jsoup:jsoup:${Versions.jsoup}"
-  const val jsr305 = "com.google.code.findbugs:jsr305:${Versions.findbugs}"
-  const val junit = "junit:junit:${Versions.junit}"
+  const val jnrUnixsocket = "com.github.jnr:jnr-unixsocket:0.28"
+  const val jsoup = "org.jsoup:jsoup:1.13.1"
+  const val jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
+  const val junit = "junit:junit:4.13.2"
   const val junit5Api = "org.junit.jupiter:junit-jupiter-api:${Versions.junit5}"
   const val junit5JupiterEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit5}"
   const val junit5JupiterParams = "org.junit.jupiter:junit-jupiter-params:${Versions.junit5}"
   const val junit5VintageEngine = "org.junit.vintage:junit-vintage-engine:${Versions.junit5}"
   const val junit5AndroidCore = "de.mannodermaus.junit5:android-test-core:${Versions.junit5Android}"
-  const val junit5AndroidRunner =
-    "de.mannodermaus.junit5:android-test-runner:${Versions.junit5Android}"
+  const val junit5AndroidRunner = "de.mannodermaus.junit5:android-test-runner:${Versions.junit5Android}"
   const val junitPlatformConsole = "org.junit.platform:junit-platform-console:1.7.0"
   const val kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
   const val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
   const val kotlinStdlibOsgi = "org.jetbrains.kotlin:kotlin-osgi-bundle:${Versions.kotlin}"
+  const val kotlinJunit5 = "org.jetbrains.kotlin:kotlin-test-junit5:${Versions.kotlin}"
   const val moshi = "com.squareup.moshi:moshi:${Versions.moshi}"
   const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:${Versions.moshi}"
   const val moshiCompiler = "com.squareup.moshi:moshi-kotlin-codegen:${Versions.moshi}"
   const val okio = "com.squareup.okio:okio:${Versions.okio}"
   const val okioFakeFileSystem = "com.squareup.okio:okio-fakefilesystem:${Versions.okio}"
-  const val openjsse = "org.openjsse:openjsse:${Versions.openjsse}"
+  const val openjsse = "org.openjsse:openjsse:1.1.6"
   const val picocli = "info.picocli:picocli:${Versions.picocli}"
+  const val picocliCompiler = "info.picocli:picocli-codegen:${Versions.picocli}"
   const val playServicesSafetynet = "com.google.android.gms:play-services-safetynet:17.0.1"
   const val androidxExtJunit = "androidx.test.ext:junit:1.1.3"
   const val androidxEspressoCore = "androidx.test.espresso:espresso-core:3.4.0"
   const val androidxTestRunner = "androidx.test:runner:1.4.0"
   const val httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.0"
-
-  object Kotlin {
-    const val version = "1.5.21"
-  }
+  const val nativeImageSvm = "org.graalvm.nativeimage:svm:21.2.0"
+  const val jettyClient = "org.eclipse.jetty:jetty-client:9.4.27.v20200227"
+  const val checkStyle = "com.puppycrawl.tools:checkstyle:${Versions.checkStyle}"
 }

mockwebserver-junit5/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
 
   testRuntimeOnly(Dependencies.junit5JupiterEngine)
   testImplementation(Dependencies.assertj)
-  testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:1.4.10")
+  testImplementation(Dependencies.kotlinJunit5)
 }
 
 afterEvaluate {

native-image-tests/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
   implementation(Dependencies.junit5Api)
   implementation(Dependencies.junit5JupiterParams)
 
-  implementation("org.graalvm.nativeimage:svm:21.2.0")
+  implementation(Dependencies.nativeImageSvm)
 
   compileOnly(Dependencies.jsr305)
 }

okcurl/build.gradle.kts

@@ -42,8 +42,8 @@ dependencies {
   implementation(Dependencies.picocli)
   implementation(Dependencies.guava)
 
-  implementation("info.picocli:picocli-codegen:4.5.2")
-  annotationProcessor("info.picocli:picocli-codegen:4.5.2")
+  implementation(Dependencies.picocliCompiler)
+  annotationProcessor(Dependencies.picocliCompiler)
 
   testImplementation(project(":okhttp-testing-support"))
   testImplementation(Dependencies.junit5Api)

samples/compare/build.gradle.kts

@@ -4,8 +4,8 @@ dependencies {
   testRuntimeOnly(project(":mockwebserver-junit5"))
   testImplementation(project(":okhttp-tls"))
   testImplementation(project(":okhttp-testing-support"))
-  testImplementation("org.apache.httpcomponents.client5:httpclient5:5.0")
-  testImplementation("org.eclipse.jetty:jetty-client:9.4.27.v20200227")
+  testImplementation(Dependencies.httpclient5)
+  testImplementation(Dependencies.jettyClient)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.assertj)
 }