From 8debc78b00a6b96ff43ddcb44668b3d93c1ac45f Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 27 Nov 2021 20:31:27 +0800 Subject: [PATCH] Simplify gradle kts (#6931) --- build.gradle.kts | 8 ++++---- mockwebserver-deprecated/build.gradle.kts | 3 +-- mockwebserver-junit4/build.gradle.kts | 3 +-- mockwebserver-junit5/build.gradle.kts | 3 +-- mockwebserver/build.gradle.kts | 3 +-- okcurl/build.gradle.kts | 5 ++--- okhttp-bom/build.gradle.kts | 6 +++--- okhttp-brotli/build.gradle.kts | 3 +-- okhttp-dnsoverhttps/build.gradle.kts | 3 +-- okhttp-logging-interceptor/build.gradle.kts | 3 +-- okhttp-sse/build.gradle.kts | 3 +-- okhttp-tls/build.gradle.kts | 3 +-- okhttp-urlconnection/build.gradle.kts | 3 +-- okhttp/build.gradle.kts | 11 ++++------- 14 files changed, 23 insertions(+), 37 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2f43c317d..ef653d96e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,7 +90,7 @@ subprojects { exclude("**/CipherSuite.java") } - val checkstyleConfig by configurations.creating + val checkstyleConfig: Configuration by configurations.creating dependencies { checkstyleConfig(Dependencies.checkStyle) { isTransitive = false @@ -110,7 +110,7 @@ subprojects { annotation = "okhttp3.internal.SuppressSignatureCheck" sourceSets = listOf(project.sourceSets["main"]) } - val signature by configurations.getting + val signature: Configuration by configurations.getting dependencies { signature(Dependencies.signatureAndroid21) signature(Dependencies.signatureJava18) @@ -129,7 +129,7 @@ subprojects { val platform = System.getProperty("okhttp.platform", "jdk9") val testJavaVersion = System.getProperty("test.java.version", "11").toInt() - val testRuntimeOnly by configurations.getting + val testRuntimeOnly: Configuration by configurations.getting dependencies { testRuntimeOnly(Dependencies.junit5JupiterEngine) testRuntimeOnly(Dependencies.junit5VintageEngine) @@ -236,6 +236,6 @@ subprojects { } } -tasks.withType { +tasks.wrapper { distributionType = Wrapper.DistributionType.ALL } diff --git a/mockwebserver-deprecated/build.gradle.kts b/mockwebserver-deprecated/build.gradle.kts index 4d29e27a6..ec71c9fba 100644 --- a/mockwebserver-deprecated/build.gradle.kts +++ b/mockwebserver-deprecated/build.gradle.kts @@ -1,7 +1,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import me.champeau.gradle.japicmp.JapicmpTask plugins { @@ -48,6 +47,6 @@ tasks.register("japicmp") { }.let(tasks.check::dependsOn) -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/mockwebserver-junit4/build.gradle.kts b/mockwebserver-junit4/build.gradle.kts index a24a508e6..3e118b0b5 100644 --- a/mockwebserver-junit4/build.gradle.kts +++ b/mockwebserver-junit4/build.gradle.kts @@ -1,6 +1,5 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension plugins { kotlin("jvm") @@ -21,6 +20,6 @@ dependencies { testImplementation(Dependencies.assertj) } -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/mockwebserver-junit5/build.gradle.kts b/mockwebserver-junit5/build.gradle.kts index 90765a83a..c8f270251 100644 --- a/mockwebserver-junit5/build.gradle.kts +++ b/mockwebserver-junit5/build.gradle.kts @@ -1,6 +1,5 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension plugins { kotlin("jvm") @@ -30,6 +29,6 @@ dependencies { testImplementation(Dependencies.kotlinJunit5) } -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/mockwebserver/build.gradle.kts b/mockwebserver/build.gradle.kts index 345ae40b8..1283431a6 100644 --- a/mockwebserver/build.gradle.kts +++ b/mockwebserver/build.gradle.kts @@ -1,6 +1,5 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension plugins { kotlin("jvm") @@ -24,6 +23,6 @@ dependencies { testImplementation(Dependencies.assertj) } -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/okcurl/build.gradle.kts b/okcurl/build.gradle.kts index dfbb40d91..358e40c2f 100644 --- a/okcurl/build.gradle.kts +++ b/okcurl/build.gradle.kts @@ -1,7 +1,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import java.nio.charset.StandardCharsets import org.apache.tools.ant.taskdefs.condition.Os @@ -62,7 +61,7 @@ graal { } } -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } @@ -73,5 +72,5 @@ tasks.register("copyResourcesTemplates") { filteringCharset = StandardCharsets.UTF_8.toString() }.let { tasks.processResources.dependsOn(it) - tasks.named("javaSourcesJar").dependsOn(it) + tasks["javaSourcesJar"].dependsOn(it) } diff --git a/okhttp-bom/build.gradle.kts b/okhttp-bom/build.gradle.kts index 99d0f26b0..4d5b9aad7 100644 --- a/okhttp-bom/build.gradle.kts +++ b/okhttp-bom/build.gradle.kts @@ -13,8 +13,8 @@ dependencies { } } -extensions.configure { - publications.create("maven", MavenPublication::class) { - from(project.components.getByName("javaPlatform")) +publishing { + publications.create("maven") { + from(project.components["javaPlatform"]) } } diff --git a/okhttp-brotli/build.gradle.kts b/okhttp-brotli/build.gradle.kts index d1a7446e7..ffe576b65 100644 --- a/okhttp-brotli/build.gradle.kts +++ b/okhttp-brotli/build.gradle.kts @@ -1,6 +1,5 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension plugins { kotlin("jvm") @@ -25,6 +24,6 @@ dependencies { testImplementation(Dependencies.assertj) } -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/okhttp-dnsoverhttps/build.gradle.kts b/okhttp-dnsoverhttps/build.gradle.kts index 7ec05e714..9df0b47fd 100644 --- a/okhttp-dnsoverhttps/build.gradle.kts +++ b/okhttp-dnsoverhttps/build.gradle.kts @@ -1,6 +1,5 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension plugins { kotlin("jvm") @@ -27,6 +26,6 @@ dependencies { testImplementation(Dependencies.assertj) } -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/okhttp-logging-interceptor/build.gradle.kts b/okhttp-logging-interceptor/build.gradle.kts index 024153a8d..598ef37f4 100644 --- a/okhttp-logging-interceptor/build.gradle.kts +++ b/okhttp-logging-interceptor/build.gradle.kts @@ -1,7 +1,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import me.champeau.gradle.japicmp.JapicmpTask plugins { @@ -41,6 +40,6 @@ tasks.register("japicmp") { isIncludeSynthetic = true }.let(tasks.check::dependsOn) -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/okhttp-sse/build.gradle.kts b/okhttp-sse/build.gradle.kts index 65059cc6b..11dac9748 100644 --- a/okhttp-sse/build.gradle.kts +++ b/okhttp-sse/build.gradle.kts @@ -1,7 +1,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import me.champeau.gradle.japicmp.JapicmpTask plugins { @@ -43,6 +42,6 @@ tasks.register("japicmp") { ) }.let(tasks.check::dependsOn) -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/okhttp-tls/build.gradle.kts b/okhttp-tls/build.gradle.kts index aef64e9d4..4f07ea6f3 100644 --- a/okhttp-tls/build.gradle.kts +++ b/okhttp-tls/build.gradle.kts @@ -1,7 +1,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import me.champeau.gradle.japicmp.JapicmpTask plugins { @@ -49,6 +48,6 @@ tasks.register("japicmp") { ) }.let(tasks.check::dependsOn) -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/okhttp-urlconnection/build.gradle.kts b/okhttp-urlconnection/build.gradle.kts index 3a9defc07..ba25df568 100644 --- a/okhttp-urlconnection/build.gradle.kts +++ b/okhttp-urlconnection/build.gradle.kts @@ -1,7 +1,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import me.champeau.gradle.japicmp.JapicmpTask plugins { @@ -44,6 +43,6 @@ tasks.register("japicmp") { }.let(tasks.check::dependsOn) -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } diff --git a/okhttp/build.gradle.kts b/okhttp/build.gradle.kts index c2cf2b69a..c68131890 100644 --- a/okhttp/build.gradle.kts +++ b/okhttp/build.gradle.kts @@ -1,7 +1,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import java.nio.charset.StandardCharsets import me.champeau.gradle.japicmp.JapicmpTask @@ -61,12 +60,10 @@ normalization { } // Expose OSGi jars to the test environment. -configurations { - create("osgiTestDeploy") -} +val osgiTestDeploy: Configuration by configurations.creating tasks.register("copyOsgiTestDeployment") { - from(configurations["osgiTestDeploy"]) + from(osgiTestDeploy) into("$buildDir/resources/test/okhttp3/osgi/deployments") }.let(tasks.test::dependsOn) @@ -173,7 +170,7 @@ tasks.register("japicmp") { ) }.let(tasks.check::dependsOn) -configure { +mavenPublishing { configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm"))) } @@ -184,6 +181,6 @@ tasks.register("copyJavaTemplates") { filteringCharset = StandardCharsets.UTF_8.toString() }.let { tasks.compileKotlin.dependsOn(it) - tasks.named("javaSourcesJar").dependsOn(it) + tasks["javaSourcesJar"].dependsOn(it) }