Simplify kts (square#6926)

* Simplify kts * Use extensions * Use extensions * Simplify kts
seljabali · Nov 26, 2021 · d0759a7 · d0759a7
1 parent 3417fd0
commit d0759a7
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 116 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,7 @@ buildscript {
 
 allprojects {
   group = "com.squareup.okhttp3"
-  project.ext["artifactId"] = Projects.publishedArtifactId(project.name)
+  project.ext["artifactId"] = project.name.publishedArtifactId()
   version = "5.0.0-SNAPSHOT"
 
   repositories {
@@ -38,7 +38,7 @@ allprojects {
     maven(url = "https://dl.bintray.com/kotlin/dokka")
   }
 
-  val downloadDependencies by tasks.creating {
+  tasks.create("downloadDependencies") {
     description = "Download all dependencies to the Gradle cache"
     doLast {
       for (configuration in configurations) {
@@ -73,7 +73,7 @@ subprojects {
   apply(plugin = "biz.aQute.bnd.builder")
 
   tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
+    options.encoding = Charsets.UTF_8.toString()
   }
 
   configure<JavaPluginExtension> {
@@ -98,14 +98,14 @@ subprojects {
     configure<CheckstyleExtension> {
       config = resources.text.fromArchiveEntry(checkstyleConfig, "google_checks.xml")
       toolVersion = Versions.checkStyle
-      sourceSets = listOf(project.sourceSets.getByName("main"))
+      sourceSets = listOf(project.sourceSets["main"])
     }
   }
 
   // Animal Sniffer confirms we generally don't use APIs not on Java 8.
   configure<AnimalSnifferExtension> {
     annotation = "okhttp3.internal.SuppressSignatureCheck"
-    sourceSets = listOf(project.sourceSets.getByName("main"))
+    sourceSets = listOf(project.sourceSets["main"])
   }
   val signature by configurations.getting
   dependencies {
@@ -115,7 +115,7 @@ subprojects {
 
   tasks.withType<KotlinCompile> {
     kotlinOptions {
-      jvmTarget = "1.8"
+      jvmTarget = JavaVersion.VERSION_1_8.toString()
       freeCompilerArgs = listOf(
         "-Xjvm-default=compatibility",
         "-Xopt-in=kotlin.RequiresOptIn"
@@ -153,7 +153,7 @@ subprojects {
 
   if (platform == "jdk8alpn") {
     // Add alpn-boot on Java 8 so we can use HTTP/2 without a stable API.
-    val alpnBootVersion = Alpn.alpnBootVersion()
+    val alpnBootVersion = alpnBootVersion()
     if (alpnBootVersion != null) {
       val alpnBootJar = configurations.detachedConfiguration(
         dependencies.create("org.mortbay.jetty.alpn:alpn-boot:$alpnBootVersion")
@@ -223,14 +223,14 @@ subprojects {
     }
 
     publications {
-      val maven by creating(MavenPublication::class) {
+      create<MavenPublication>("maven") {
         groupId = project.group.toString()
         artifactId = project.ext["artifactId"].toString()
         version = project.version.toString()
         if (bom) {
-          from(components.getByName("javaPlatform"))
+          from(components["javaPlatform"])
         } else {
-          from(components.getByName("java"))
+          from(components["java"])
         }
         pom {
           name.set(project.name)
@@ -239,7 +239,7 @@ subprojects {
           licenses {
             license {
               name.set("The Apache Software License, Version 2.0")
-              url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+              url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
             }
           }
           developers {
@@ -270,7 +270,7 @@ subprojects {
 
   val publishing = extensions.getByType<PublishingExtension>()
   configure<SigningExtension> {
-    sign(publishing.publications.getByName("maven"))
+    sign(publishing.publications["maven"])
   }
 }
 

diff --git a/buildSrc/src/main/kotlin/alpn.kt b/buildSrc/src/main/kotlin/alpn.kt
@@ -14,42 +14,39 @@
  * limitations under the License.
  */
 
-object Alpn {
-  // https://www.eclipse.org/jetty/documentation/current/alpn-chapter.html#alpn-versions
-  fun alpnBootVersionForPatchVersion(patchVersion: Int): String? {
-    return when (patchVersion) {
-      in 0..24 -> "8.1.0.v20141016"
-      in 25..30 -> "8.1.2.v20141202"
-      in 31..50 -> "8.1.3.v20150130"
-      in 51..59 -> "8.1.4.v20150727"
-      in 60..64 -> "8.1.5.v20150921"
-      in 65..70 -> "8.1.6.v20151105"
-      in 71..77 -> "8.1.7.v20160121"
-      in 78..101 -> "8.1.8.v20160420"
-      in 102..111 -> "8.1.9.v20160720"
-      in 112..120 -> "8.1.10.v20161026"
-      in 121..160 -> "8.1.11.v20170118"
-      in 161..181 -> "8.1.12.v20180117"
-      in 191..242 -> "8.1.13.v20181017"
-      else -> null
-    }
+// https://www.eclipse.org/jetty/documentation/current/alpn-chapter.html#alpn-versions
+private fun alpnBootVersionForPatchVersion(patchVersion: Int): String? {
+  return when (patchVersion) {
+    in 0..24 -> "8.1.0.v20141016"
+    in 25..30 -> "8.1.2.v20141202"
+    in 31..50 -> "8.1.3.v20150130"
+    in 51..59 -> "8.1.4.v20150727"
+    in 60..64 -> "8.1.5.v20150921"
+    in 65..70 -> "8.1.6.v20151105"
+    in 71..77 -> "8.1.7.v20160121"
+    in 78..101 -> "8.1.8.v20160420"
+    in 102..111 -> "8.1.9.v20160720"
+    in 112..120 -> "8.1.10.v20161026"
+    in 121..160 -> "8.1.11.v20170118"
+    in 161..181 -> "8.1.12.v20180117"
+    in 191..242 -> "8.1.13.v20181017"
+    else -> null
   }
+}
 
-  /**
-   * Returns the alpn-boot version specific to this OpenJDK 8 JVM, or null if this is not a Java 8 VM.
-   * https://github.com/xjdr/xio/blob/master/alpn-boot.gradle
-   */
-  @JvmStatic
-  fun alpnBootVersion(): String? {
-    val version = System.getProperty("alpn.boot.version")
+/**
+ * Returns the alpn-boot version specific to this OpenJDK 8 JVM, or null if this is not a Java 8 VM.
+ * https://github.com/xjdr/xio/blob/master/alpn-boot.gradle
+ */
+fun alpnBootVersion(): String? {
+  val version = System.getProperty("alpn.boot.version")
 
-    if (version != null) {
-      return version
-    }
+  if (version != null) {
+    return version
+  }
 
-    val javaVersion = System.getProperty("java.version")
-    val match = "1\\.8\\.0_(\\d+)(-.*)?".toRegex().find(javaVersion) ?: return null
+  val javaVersion = System.getProperty("java.version")
+  val match = "1\\.8\\.0_(\\d+)(-.*)?".toRegex().find(javaVersion) ?: return null
 
-    return alpnBootVersionForPatchVersion(match.groupValues.first().toInt())
-  }
+  return alpnBootVersionForPatchVersion(match.groupValues.first().toInt())
 }
diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt
@@ -24,60 +24,51 @@ import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.withConvention
 
-object Projects {
-  /** Returns the artifact ID for the project, or null if it is not published. */
-  @JvmStatic
-  fun publishedArtifactId(projectName: String): String? {
-    return when (projectName) {
-      "okhttp-logging-interceptor" -> "logging-interceptor"
-      "mockwebserver" -> "mockwebserver3"
-      "mockwebserver-junit4" -> "mockwebserver3-junit4"
-      "mockwebserver-junit5" -> "mockwebserver3-junit5"
-      "mockwebserver-deprecated" -> "mockwebserver"
-      "okcurl",
-      "okhttp",
-      "okhttp-bom",
-      "okhttp-brotli",
-      "okhttp-dnsoverhttps",
-      "okhttp-sse",
-      "okhttp-tls",
-      "okhttp-urlconnection" -> projectName
-      else -> null
-    }
+fun String.publishedArtifactId(): String? {
+  return when (this) {
+    "okhttp-logging-interceptor" -> "logging-interceptor"
+    "mockwebserver" -> "mockwebserver3"
+    "mockwebserver-junit4" -> "mockwebserver3-junit4"
+    "mockwebserver-junit5" -> "mockwebserver3-junit5"
+    "mockwebserver-deprecated" -> "mockwebserver"
+    "okcurl",
+    "okhttp",
+    "okhttp-bom",
+    "okhttp-brotli",
+    "okhttp-dnsoverhttps",
+    "okhttp-sse",
+    "okhttp-tls",
+    "okhttp-urlconnection" -> this
+    else -> null
   }
+}
 
-  @JvmStatic
-  fun applyOsgi(project: Project, vararg bndProperties: String) {
-    project.run {
-      apply(plugin = "biz.aQute.bnd.builder")
-      sourceSets.create("osgi")
-      tasks["jar"].withConvention(BundleTaskConvention::class) {
-        setClasspath(sourceSets["osgi"].compileClasspath + project.sourceSets["main"].compileClasspath)
-        bnd(*bndProperties)
-      }
-      dependencies.add("osgiApi", Dependencies.kotlinStdlibOsgi)
-    }
+fun Project.applyOsgi(vararg bndProperties: String) {
+  apply(plugin = "biz.aQute.bnd.builder")
+  sourceSets.create("osgi")
+  tasks["jar"].withConvention(BundleTaskConvention::class) {
+    setClasspath(sourceSets["osgi"].compileClasspath + project.sourceSets["main"].compileClasspath)
+    bnd(*bndProperties)
   }
+  dependencies.add("osgiApi", Dependencies.kotlinStdlibOsgi)
+}
 
-  /**
-   * Returns a .jar file for the golden version of this project.
-   * https://github.com/Visistema/Groovy1/blob/ba5eb9b2f19ca0cc8927359ce414c4e1974b7016/gradle/binarycompatibility.gradle#L48
-   */
-  @JvmStatic
-  @JvmOverloads
-  fun baselineJar(project: Project, version: String = "3.14.1"): File? {
-    val group = project.group
-    val artifactId = project.extra["artifactId"]
-    return try {
-      val jarFile = "$artifactId-${version}.jar"
-      project.group = "virtual_group_for_japicmp"
-      val dependency = project.dependencies.create("$group:$artifactId:$version@jar")
-      project.configurations.detachedConfiguration(dependency).files.find { (it.name == jarFile) }
-    } catch (e: Exception) {
-      null
-    } finally {
-      project.group = group
-    }
+/**
+ * Returns a .jar file for the golden version of this project.
+ * https://github.com/Visistema/Groovy1/blob/ba5eb9b2f19ca0cc8927359ce414c4e1974b7016/gradle/binarycompatibility.gradle#L48
+ */
+fun Project.baselineJar(version: String = "3.14.1"): File? {
+  val originalGroup = group
+  val artifactId = extra["artifactId"]
+  return try {
+    val jarFile = "$artifactId-${version}.jar"
+    group = "virtual_group_for_japicmp"
+    val dependency = dependencies.create("$originalGroup:$artifactId:$version@jar")
+    configurations.detachedConfiguration(dependency).files.find { (it.name == jarFile) }
+  } catch (e: Exception) {
+    null
+  } finally {
+    group = originalGroup
   }
 }
 

diff --git a/mockwebserver-deprecated/build.gradle.kts b/mockwebserver-deprecated/build.gradle.kts
@@ -32,7 +32,7 @@ afterEvaluate {
 
 tasks.register<JapicmpTask>("japicmp") {
   dependsOn("jar")
-  oldClasspath = files(Projects.baselineJar(project))
+  oldClasspath = files(project.baselineJar())
   newClasspath = files(tasks.jar.get().archiveFile)
   isOnlyBinaryIncompatibleModified = true
   isFailOnModification = true

diff --git a/okhttp-bom/build.gradle.kts b/okhttp-bom/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 dependencies {
   constraints {
     project.rootProject.subprojects.forEach { subproject ->
-      val artifactId = Projects.publishedArtifactId(subproject.name)
+      val artifactId = subproject.name.publishedArtifactId()
       if (artifactId != null && artifactId != "okhttp-bom") {
         api(subproject)
       }

diff --git a/okhttp-brotli/build.gradle.kts b/okhttp-brotli/build.gradle.kts
@@ -3,8 +3,7 @@ plugins {
   id("org.jetbrains.dokka")
 }
 
-Projects.applyOsgi(
-  project,
+project.applyOsgi(
   "Export-Package: okhttp3.brotli",
   "Automatic-Module-Name: okhttp3.brotli",
   "Bundle-SymbolicName: com.squareup.okhttp3.brotli"

diff --git a/okhttp-dnsoverhttps/build.gradle.kts b/okhttp-dnsoverhttps/build.gradle.kts
@@ -3,8 +3,7 @@ plugins {
   id("org.jetbrains.dokka")
 }
 
-Projects.applyOsgi(
-  project,
+project.applyOsgi(
   "Export-Package: okhttp3.dnsoverhttps",
   "Automatic-Module-Name: okhttp3.dnsoverhttps",
   "Bundle-SymbolicName: com.squareup.okhttp3.dnsoverhttps"

diff --git a/okhttp-logging-interceptor/build.gradle.kts b/okhttp-logging-interceptor/build.gradle.kts
@@ -7,8 +7,7 @@ plugins {
   id("me.champeau.gradle.japicmp")
 }
 
-Projects.applyOsgi(
-  project,
+project.applyOsgi(
   "Export-Package: okhttp3.logging",
   "Automatic-Module-Name: okhttp3.logging",
   "Bundle-SymbolicName: com.squareup.okhttp3.logging"
@@ -36,7 +35,7 @@ afterEvaluate {
 
 tasks.register<JapicmpTask>("japicmp") {
   dependsOn("jar")
-  oldClasspath = files(Projects.baselineJar(project))
+  oldClasspath = files(project.baselineJar())
   newClasspath = files(tasks.jar.get().archiveFile)
   isOnlyBinaryIncompatibleModified = true
   isFailOnModification = true

diff --git a/okhttp-sse/build.gradle.kts b/okhttp-sse/build.gradle.kts
@@ -7,8 +7,7 @@ plugins {
   id("me.champeau.gradle.japicmp")
 }
 
-Projects.applyOsgi(
-  project,
+project.applyOsgi(
   "Export-Package: okhttp3.sse",
   "Automatic-Module-Name: okhttp3.sse",
   "Bundle-SymbolicName: com.squareup.okhttp3.sse"
@@ -35,7 +34,7 @@ afterEvaluate {
 
 tasks.register<JapicmpTask>("japicmp") {
   dependsOn("jar")
-  oldClasspath = files(Projects.baselineJar(project))
+  oldClasspath = files(project.baselineJar())
   newClasspath = files(tasks.jar.get().archiveFile)
   isOnlyBinaryIncompatibleModified = true
   isFailOnModification = true

diff --git a/okhttp-tls/build.gradle.kts b/okhttp-tls/build.gradle.kts
@@ -8,8 +8,7 @@ plugins {
   id("me.champeau.gradle.japicmp")
 }
 
-Projects.applyOsgi(
-  project,
+project.applyOsgi(
   "Export-Package: okhttp3.tls",
   "Automatic-Module-Name: okhttp3.tls",
   "Bundle-SymbolicName: com.squareup.okhttp3.tls"
@@ -41,7 +40,7 @@ animalsniffer {
 
 tasks.register<JapicmpTask>("japicmp") {
   dependsOn("jar")
-  oldClasspath = files(Projects.baselineJar(project))
+  oldClasspath = files(project.baselineJar())
   newClasspath = files(tasks.jar.get().archiveFile)
   isOnlyBinaryIncompatibleModified = true
   isFailOnModification = true

diff --git a/okhttp-urlconnection/build.gradle.kts b/okhttp-urlconnection/build.gradle.kts
@@ -9,8 +9,7 @@ plugins {
 
 val mainProj: Project by lazy { project(":okhttp") }
 
-Projects.applyOsgi(
-  project,
+project.applyOsgi(
   "Fragment-Host: com.squareup.okhttp3; bundle-version=\"\${range;[==,+);\${version_cleanup;${mainProj.version}}}\"",
   "Automatic-Module-Name: okhttp3.urlconnection",
   "Bundle-SymbolicName: com.squareup.okhttp3.urlconnection",
@@ -38,7 +37,7 @@ afterEvaluate {
 
 tasks.register<JapicmpTask>("japicmp") {
   dependsOn("jar")
-  oldClasspath = files(Projects.baselineJar(project))
+  oldClasspath = files(project.baselineJar())
   newClasspath = files(tasks.jar.get().archiveFile)
   isOnlyBinaryIncompatibleModified = true
   isFailOnModification = true