Skip to content

Commit 6947be1

Browse files
authored
1 parent 060b4a2 commit 6947be1

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

build.gradle.kts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ allprojects {
5757
google()
5858
}
5959

60-
tasks.create("downloadDependencies") {
60+
tasks.register("downloadDependencies") {
6161
description = "Download all dependencies to the Gradle cache"
6262
doLast {
6363
for (configuration in configurations) {
@@ -96,6 +96,15 @@ subprojects {
9696
apply(plugin = "biz.aQute.bnd.builder")
9797
apply(plugin = "io.github.usefulness.maven-sympathy")
9898

99+
// Skip samples parent
100+
if (project.buildFile.exists()) {
101+
apply(plugin = "com.android.lint")
102+
103+
dependencies {
104+
"lintChecks"(rootProject.libs.androidx.lint.gradle)
105+
}
106+
}
107+
99108
tasks.withType<JavaCompile> {
100109
options.encoding = Charsets.UTF_8.toString()
101110
}
@@ -266,7 +275,6 @@ subprojects {
266275
}
267276

268277
plugins.withId("com.vanniktech.maven.publish.base") {
269-
val publishingExtension = extensions.getByType(PublishingExtension::class.java)
270278
configure<MavenPublishBaseExtension> {
271279
publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)
272280
signAllPublications()

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ de-mannodermaus-junit5 = "1.6.0"
88
graalvm = "24.1.1"
99
kotlinx-serialization = "1.7.3"
1010
ksp = "2.1.0-1.0.29"
11+
lintGradle = "1.0.0-alpha03"
1112
mockserverClient = "5.15.0"
1213
org-bouncycastle = "1.76"
1314
org-conscrypt = "2.5.2"
@@ -23,6 +24,7 @@ androidx-activity = "androidx.activity:activity-ktx:1.9.3"
2324
androidx-annotation = "androidx.annotation:annotation:1.9.1"
2425
androidx-espresso-core = "androidx.test.espresso:espresso-core:3.6.1"
2526
androidx-junit = "androidx.test.ext:junit:1.2.1"
27+
androidx-lint-gradle = { module = "androidx.lint:lint-gradle", version.ref = "lintGradle" }
2628
androidx-test-runner = "androidx.test:runner:1.6.2"
2729
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.24"
2830
aqute-resolve = { module = "biz.aQute.bnd:biz.aQute.resolve", version.ref = "biz-aQute-bnd" }

okcurl/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.vanniktech.maven.publish.JavadocJar
22
import com.vanniktech.maven.publish.KotlinJvm
33
import org.graalvm.buildtools.gradle.dsl.GraalVMExtension
4+
import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension
45

56
plugins {
67
kotlin("jvm")
@@ -39,7 +40,7 @@ dependencies {
3940
testImplementation(kotlin("test"))
4041
}
4142

42-
animalsniffer {
43+
configure<AnimalSnifferExtension> {
4344
isIgnoreFailures = true
4445
}
4546

okhttp/build.gradle.kts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import com.vanniktech.maven.publish.JavadocJar
22
import com.vanniktech.maven.publish.KotlinJvm
3-
import java.io.DataInputStream
4-
import java.io.FileInputStream
53
import java.util.Base64
6-
import java.util.zip.GZIPInputStream
74

85
plugins {
96
kotlin("jvm")
@@ -18,8 +15,10 @@ fun ByteArray.toByteStringExpression(): String {
1815
}
1916

2017
val copyKotlinTemplates = tasks.register<Copy>("copyKotlinTemplates") {
18+
val kotlinTemplatesOutput = layout.buildDirectory.dir("generated/sources/kotlinTemplates")
19+
2120
from("src/main/kotlinTemplates")
22-
into(layout.buildDirectory.dir("generated/sources/kotlinTemplates"))
21+
into(kotlinTemplatesOutput)
2322

2423
// Tag as an input to regenerate after an update
2524
inputs.file("src/test/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz")
@@ -43,18 +42,20 @@ val generateIdnaMappingTableConfiguration: Configuration by configurations.creat
4342
dependencies {
4443
generateIdnaMappingTableConfiguration(projects.okhttpIdnaMappingTable)
4544
}
46-
val generateIdnaMappingTable by tasks.creating(JavaExec::class.java) {
47-
outputs.dir(layout.buildDirectory.dir("generated/sources/idnaMappingTable"))
45+
val generateIdnaMappingTable = tasks.register<JavaExec>("generateIdnaMappingTable") {
46+
val idnaOutput = layout.buildDirectory.dir("generated/sources/idnaMappingTable")
47+
48+
outputs.dir(idnaOutput)
4849
mainClass.set("okhttp3.internal.idn.GenerateIdnaMappingTableCode")
49-
args(layout.buildDirectory.dir("generated/sources/idnaMappingTable").get())
50+
args(idnaOutput.get())
5051
classpath = generateIdnaMappingTableConfiguration
5152
}
5253

5354
kotlin {
5455
sourceSets {
5556
getByName("main") {
56-
kotlin.srcDir(copyKotlinTemplates.get().outputs)
57-
kotlin.srcDir(generateIdnaMappingTable.outputs)
57+
kotlin.srcDir(copyKotlinTemplates.map { it.outputs })
58+
kotlin.srcDir(generateIdnaMappingTable.map { it.outputs })
5859
}
5960
}
6061
}
@@ -107,11 +108,13 @@ normalization {
107108
// Expose OSGi jars to the test environment.
108109
val osgiTestDeploy: Configuration by configurations.creating
109110

110-
val copyOsgiTestDeployment by tasks.creating(Copy::class.java) {
111+
val test by tasks.existing(Test::class)
112+
val copyOsgiTestDeployment = tasks.register<Copy>("copyOsgiTestDeployment") {
111113
from(osgiTestDeploy)
112114
into(layout.buildDirectory.dir("resources/test/okhttp3/osgi/deployments"))
113115
}
114-
tasks.getByName("test") {
116+
117+
test.configure {
115118
dependsOn(copyOsgiTestDeployment)
116119
}
117120

0 commit comments

Comments
 (0)