android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-04-19 07:42:15 +03:00
Code Releases Activity

Simplify gradle kts (#6931)

Browse Source
This commit is contained in:
Goooler 2021-11-27 20:31:27 +08:00 committed by GitHub
parent d9a65a85c5
commit 8debc78b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -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<Wrapper> {
tasks.wrapper {
distributionType = Wrapper.DistributionType.ALL
}

3
mockwebserver-deprecated/build.gradle.kts
View File

@ -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<JapicmpTask>("japicmp") {
}.let(tasks.check::dependsOn)
configure<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
mockwebserver-junit4/build.gradle.kts
View File

@ -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<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
mockwebserver-junit5/build.gradle.kts
View File

@ -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<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
mockwebserver/build.gradle.kts
View File

@ -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<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

5
okcurl/build.gradle.kts
View File

@ -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<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}
@ -73,5 +72,5 @@ tasks.register<Copy>("copyResourcesTemplates") {
filteringCharset = StandardCharsets.UTF_8.toString()
}.let {
tasks.processResources.dependsOn(it)
tasks.named("javaSourcesJar").dependsOn(it)
tasks["javaSourcesJar"].dependsOn(it)
}

6
okhttp-bom/build.gradle.kts
View File

@ -13,8 +13,8 @@ dependencies {
}
}
extensions.configure<PublishingExtension> {
publications.create("maven", MavenPublication::class) {
from(project.components.getByName("javaPlatform"))
publishing {
publications.create<MavenPublication>("maven") {
from(project.components["javaPlatform"])
}
}

3
okhttp-brotli/build.gradle.kts
View File

@ -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<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
okhttp-dnsoverhttps/build.gradle.kts
View File

@ -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<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
okhttp-logging-interceptor/build.gradle.kts
View File

@ -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<JapicmpTask>("japicmp") {
isIncludeSynthetic = true
}.let(tasks.check::dependsOn)
configure<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
okhttp-sse/build.gradle.kts
View File

@ -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<JapicmpTask>("japicmp") {
)
}.let(tasks.check::dependsOn)
configure<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
okhttp-tls/build.gradle.kts
View File

@ -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<JapicmpTask>("japicmp") {
)
}.let(tasks.check::dependsOn)
configure<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

3
okhttp-urlconnection/build.gradle.kts
View File

@ -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<JapicmpTask>("japicmp") {
}.let(tasks.check::dependsOn)
configure<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}

11
okhttp/build.gradle.kts
View File

@ -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<Copy>("copyOsgiTestDeployment") {
from(configurations["osgiTestDeploy"])
from(osgiTestDeploy)
into("$buildDir/resources/test/okhttp3/osgi/deployments")
}.let(tasks.test::dependsOn)
@ -173,7 +170,7 @@ tasks.register<JapicmpTask>("japicmp") {
)
}.let(tasks.check::dependsOn)
configure<MavenPublishBaseExtension> {
mavenPublishing {
configure(KotlinJvm(javadocJar = JavadocJar.Dokka("dokkaGfm")))
}
@ -184,6 +181,6 @@ tasks.register<Copy>("copyJavaTemplates") {
filteringCharset = StandardCharsets.UTF_8.toString()
}.let {
tasks.compileKotlin.dependsOn(it)
tasks.named("javaSourcesJar").dependsOn(it)
tasks["javaSourcesJar"].dependsOn(it)
}