Enable Gradle's type-safe project accessors (square#7069)

desiderantes · Feb 8, 2022 · f5758b7 · f5758b7
1 parent fca8ebb
commit f5758b7
Show file tree

Hide file tree

Showing 24 changed files with 90 additions and 90 deletions.
diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts
@@ -48,23 +48,23 @@ android {
 dependencies {
   implementation(Dependencies.kotlinReflect)
   implementation(Dependencies.playServicesSafetynet)
-  implementation(project(":okhttp"))
+  implementation(projects.okhttp)
 
-  androidTestImplementation(project(":okhttp-testing-support")) {
+  androidTestImplementation(projects.okhttpTestingSupport) {
     exclude("org.openjsse", "openjsse")
     exclude("org.conscrypt", "conscrypt-openjdk-uber")
     exclude("software.amazon.cryptools", "AmazonCorrettoCryptoProvider")
   }
   androidTestImplementation(Dependencies.bouncycastle)
   androidTestImplementation(Dependencies.bouncycastletls)
   androidTestImplementation(Dependencies.conscryptAndroid)
-  androidTestImplementation(project(":mockwebserver3-junit5"))
-  androidTestImplementation(project(":okhttp-brotli"))
-  androidTestImplementation(project(":okhttp-dnsoverhttps"))
-  androidTestImplementation(project(":logging-interceptor"))
-  androidTestImplementation(project(":okhttp-sse"))
-  androidTestImplementation(project(":okhttp-testing-support"))
-  androidTestImplementation(project(":okhttp-tls"))
+  androidTestImplementation(projects.mockwebserver3Junit5)
+  androidTestImplementation(projects.okhttpBrotli)
+  androidTestImplementation(projects.okhttpDnsoverhttps)
+  androidTestImplementation(projects.loggingInterceptor)
+  androidTestImplementation(projects.okhttpSse)
+  androidTestImplementation(projects.okhttpTestingSupport)
+  androidTestImplementation(projects.okhttpTls)
   androidTestImplementation(Dependencies.androidxExtJunit)
   androidTestImplementation(Dependencies.androidxEspressoCore)
   androidTestImplementation(Dependencies.httpclient5)

diff --git a/mockwebserver-deprecated/build.gradle.kts b/mockwebserver-deprecated/build.gradle.kts
@@ -17,12 +17,12 @@ tasks.jar {
 }
 
 dependencies {
-  api(project(":okhttp"))
-  api(project(":mockwebserver3"))
+  api(projects.okhttp)
+  api(projects.mockwebserver3)
   api(Dependencies.junit)
 
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":okhttp-tls"))
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.okhttpTls)
   testImplementation(Dependencies.assertj)
 }
 

diff --git a/mockwebserver-junit4/build.gradle.kts b/mockwebserver-junit4/build.gradle.kts
@@ -14,7 +14,7 @@ tasks.jar {
 }
 
 dependencies {
-  api(project(":mockwebserver3"))
+  api(projects.mockwebserver3)
   api(Dependencies.junit)
 
   testImplementation(Dependencies.assertj)

diff --git a/mockwebserver-junit5/build.gradle.kts b/mockwebserver-junit5/build.gradle.kts
@@ -20,7 +20,7 @@ tasks {
 }
 
 dependencies {
-  api(project(":mockwebserver3"))
+  api(projects.mockwebserver3)
   api(Dependencies.junit5Api)
   compileOnly(Dependencies.animalSniffer)
 

diff --git a/mockwebserver/build.gradle.kts b/mockwebserver/build.gradle.kts
@@ -14,11 +14,11 @@ tasks.jar {
 }
 
 dependencies {
-  api(project(":okhttp"))
+  api(projects.okhttp)
 
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":okhttp-tls"))
-  testRuntimeOnly(project(":mockwebserver3-junit5"))
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.okhttpTls)
+  testRuntimeOnly(projects.mockwebserver3Junit5)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.assertj)
 }

diff --git a/native-image-tests/build.gradle.kts b/native-image-tests/build.gradle.kts
@@ -11,19 +11,19 @@ dependencies {
   implementation(Dependencies.junitPlatformConsole)
   implementation(Dependencies.okioFakeFileSystem)
 
-  implementation(project(":okhttp"))
-  implementation(project(":okhttp-brotli"))
-  implementation(project(":okhttp-dnsoverhttps"))
-  implementation(project(":logging-interceptor"))
-  implementation(project(":okhttp-sse"))
-  implementation(project(":okhttp-testing-support"))
-  implementation(project(":okhttp-tls"))
+  implementation(projects.okhttp)
+  implementation(projects.okhttpBrotli)
+  implementation(projects.okhttpDnsoverhttps)
+  implementation(projects.loggingInterceptor)
+  implementation(projects.okhttpSse)
+  implementation(projects.okhttpTestingSupport)
+  implementation(projects.okhttpTls)
   implementation(Dependencies.assertj)
-  implementation(project(":mockwebserver3"))
-  implementation(project(":mockwebserver"))
-  implementation(project(":okhttp-urlconnection"))
-  implementation(project(":mockwebserver3-junit4"))
-  implementation(project(":mockwebserver3-junit5"))
+  implementation(projects.mockwebserver3)
+  implementation(projects.mockwebserver)
+  implementation(projects.okhttpUrlconnection)
+  implementation(projects.mockwebserver3Junit4)
+  implementation(projects.mockwebserver3Junit5)
   implementation(Dependencies.bndResolve)
   implementation(Dependencies.junit5Api)
   implementation(Dependencies.junit5JupiterParams)

diff --git a/okcurl/build.gradle.kts b/okcurl/build.gradle.kts
@@ -27,14 +27,14 @@ sourceSets {
 }
 
 dependencies {
-  api(project(":okhttp"))
-  api(project(":logging-interceptor"))
+  api(projects.okhttp)
+  api(projects.loggingInterceptor)
   implementation(Dependencies.picocli)
   implementation(Dependencies.guava)
 
   kapt(Dependencies.picocliCompiler)
 
-  testImplementation(project(":okhttp-testing-support"))
+  testImplementation(projects.okhttpTestingSupport)
   testImplementation(Dependencies.junit5Api)
   testImplementation(Dependencies.assertj)
 }

diff --git a/okhttp-brotli/build.gradle.kts b/okhttp-brotli/build.gradle.kts
@@ -14,11 +14,11 @@ project.applyOsgi(
 )
 
 dependencies {
-  api(project(":okhttp"))
+  api(projects.okhttp)
   api(Dependencies.brotli)
   compileOnly(Dependencies.jsr305)
 
-  testImplementation(project(":okhttp-testing-support"))
+  testImplementation(projects.okhttpTestingSupport)
   testImplementation(Dependencies.conscrypt)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.assertj)

diff --git a/okhttp-dnsoverhttps/build.gradle.kts b/okhttp-dnsoverhttps/build.gradle.kts
@@ -14,12 +14,12 @@ project.applyOsgi(
 )
 
 dependencies {
-  api(project(":okhttp"))
+  api(projects.okhttp)
   compileOnly(Dependencies.jsr305)
 
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":mockwebserver"))
-  testImplementation(project(":mockwebserver3-junit5"))
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.mockwebserver)
+  testImplementation(projects.mockwebserver3Junit5)
   testImplementation(Dependencies.okioFakeFileSystem)
   testImplementation(Dependencies.conscrypt)
   testImplementation(Dependencies.junit)

diff --git a/okhttp-hpacktests/build.gradle.kts b/okhttp-hpacktests/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 dependencies {
   testImplementation(Dependencies.okio)
   testImplementation(Dependencies.moshi)
-  testImplementation(project(":okhttp"))
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":mockwebserver"))
+  testImplementation(projects.okhttp)
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.mockwebserver)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.assertj)
 }
diff --git a/okhttp-logging-interceptor/build.gradle.kts b/okhttp-logging-interceptor/build.gradle.kts
@@ -17,15 +17,15 @@ project.applyOsgi(
 )
 
 dependencies {
-  api(project(":okhttp"))
+  api(projects.okhttp)
   compileOnly(Dependencies.jsr305)
 
   testCompileOnly(Dependencies.jsr305)
   testImplementation(Dependencies.junit)
-  testImplementation(project(":mockwebserver3"))
-  testImplementation(project(":mockwebserver3-junit5"))
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":okhttp-tls"))
+  testImplementation(projects.mockwebserver3)
+  testImplementation(projects.mockwebserver3Junit5)
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.okhttpTls)
   testImplementation(Dependencies.assertj)
 }
 

diff --git a/okhttp-sse/build.gradle.kts b/okhttp-sse/build.gradle.kts
@@ -17,12 +17,12 @@ project.applyOsgi(
 )
 
 dependencies {
-  api(project(":okhttp"))
+  api(projects.okhttp)
   compileOnly(Dependencies.jsr305)
 
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":mockwebserver3"))
-  testImplementation(project(":mockwebserver3-junit5"))
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.mockwebserver3)
+  testImplementation(projects.mockwebserver3Junit5)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.assertj)
   testCompileOnly(Dependencies.jsr305)

diff --git a/okhttp-testing-support/build.gradle.kts b/okhttp-testing-support/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 }
 
 dependencies {
-  api(project(":okhttp"))
-  api(project(":okhttp-tls"))
+  api(projects.okhttp)
+  api(projects.okhttpTls)
   api(Dependencies.assertj)
   api(Dependencies.bouncycastle)
   implementation(Dependencies.bouncycastlepkix)

diff --git a/okhttp-tls/build.gradle.kts b/okhttp-tls/build.gradle.kts
@@ -19,12 +19,12 @@ project.applyOsgi(
 
 dependencies {
   api(Dependencies.okio)
-  implementation(project(":okhttp"))
+  implementation(projects.okhttp)
   compileOnly(Dependencies.jsr305)
   compileOnly(Dependencies.animalSniffer)
 
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":mockwebserver3-junit5"))
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.mockwebserver3Junit5)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.assertj)
 }

diff --git a/okhttp-urlconnection/build.gradle.kts b/okhttp-urlconnection/build.gradle.kts
@@ -10,23 +10,21 @@ plugins {
   id("me.champeau.gradle.japicmp")
 }
 
-val mainProj: Project by lazy { project(":okhttp") }
-
 project.applyOsgi(
-  "Fragment-Host: com.squareup.okhttp3; bundle-version=\"\${range;[==,+);\${version_cleanup;${mainProj.version}}}\"",
+  "Fragment-Host: com.squareup.okhttp3; bundle-version=\"\${range;[==,+);\${version_cleanup;${projects.okhttp.version}}}\"",
   "Automatic-Module-Name: okhttp3.urlconnection",
   "Bundle-SymbolicName: com.squareup.okhttp3.urlconnection",
   "-removeheaders: Private-Package"
 )
 
 dependencies {
-  api(mainProj)
+  api(projects.okhttp)
   compileOnly(Dependencies.jsr305)
   compileOnly(Dependencies.animalSniffer)
 
-  testImplementation(project(":okhttp-testing-support"))
-  testImplementation(project(":okhttp-tls"))
-  testImplementation(project(":mockwebserver"))
+  testImplementation(projects.okhttpTestingSupport)
+  testImplementation(projects.okhttpTls)
+  testImplementation(projects.mockwebserver)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.assertj)
 }

diff --git a/okhttp/build.gradle.kts b/okhttp/build.gradle.kts
@@ -82,17 +82,17 @@ kotlin {
     getByName("jvmTest") {
       dependencies {
         dependsOn(commonTest)
-        implementation(project(":okhttp-testing-support"))
-        implementation(project(":okhttp-tls"))
-        implementation(project(":okhttp-urlconnection"))
-        implementation(project(":mockwebserver3"))
-        implementation(project(":mockwebserver3-junit4"))
-        implementation(project(":mockwebserver3-junit5"))
-        implementation(project(":mockwebserver"))
-        implementation(project(":logging-interceptor"))
-        implementation(project(":okhttp-brotli"))
-        implementation(project(":okhttp-dnsoverhttps"))
-        implementation(project(":okhttp-sse"))
+        implementation(projects.okhttpTestingSupport)
+        implementation(projects.okhttpTls)
+        implementation(projects.okhttpUrlconnection)
+        implementation(projects.mockwebserver3)
+        implementation(projects.mockwebserver3Junit4)
+        implementation(projects.mockwebserver3Junit5)
+        implementation(projects.mockwebserver)
+        implementation(projects.loggingInterceptor)
+        implementation(projects.okhttpBrotli)
+        implementation(projects.okhttpDnsoverhttps)
+        implementation(projects.okhttpSse)
         implementation(Dependencies.okioFakeFileSystem)
         implementation(Dependencies.conscrypt)
         implementation(Dependencies.junit)

diff --git a/samples/compare/build.gradle.kts b/samples/compare/build.gradle.kts
@@ -3,11 +3,11 @@ plugins {
 }
 
 dependencies {
-  testImplementation(project(":okhttp"))
-  testImplementation(project(":mockwebserver3"))
-  testRuntimeOnly(project(":mockwebserver3-junit5"))
-  testImplementation(project(":okhttp-tls"))
-  testImplementation(project(":okhttp-testing-support"))
+  testImplementation(projects.okhttp)
+  testImplementation(projects.mockwebserver3)
+  testRuntimeOnly(projects.mockwebserver3Junit5)
+  testImplementation(projects.okhttpTls)
+  testImplementation(projects.okhttpTestingSupport)
   testImplementation(Dependencies.httpclient5)
   testImplementation(Dependencies.jettyClient)
   testImplementation(Dependencies.junit)

diff --git a/samples/crawler/build.gradle.kts b/samples/crawler/build.gradle.kts
@@ -8,7 +8,7 @@ application {
 }
 
 dependencies {
-  implementation(project(":okhttp"))
+  implementation(projects.okhttp)
   implementation(Dependencies.jsoup)
 }
 

diff --git a/samples/guide/build.gradle.kts b/samples/guide/build.gradle.kts
@@ -4,10 +4,10 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":okhttp"))
-  implementation(project(":mockwebserver"))
-  implementation(project(":okhttp-testing-support"))
-  implementation(project(":okhttp-tls"))
+  implementation(projects.okhttp)
+  implementation(projects.mockwebserver)
+  implementation(projects.okhttpTestingSupport)
+  implementation(projects.okhttpTls)
   implementation(Dependencies.animalSniffer)
   implementation(Dependencies.moshi)
   kapt(Dependencies.moshiCompiler)

diff --git a/samples/simple-client/build.gradle.kts b/samples/simple-client/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":okhttp"))
+  implementation(projects.okhttp)
   implementation(Dependencies.moshi)
 }
diff --git a/samples/slack/build.gradle.kts b/samples/slack/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":mockwebserver"))
+  implementation(projects.mockwebserver)
   implementation(Dependencies.moshi)
 }
diff --git a/samples/static-server/build.gradle.kts b/samples/static-server/build.gradle.kts
@@ -14,7 +14,7 @@ tasks.jar {
 }
 
 dependencies {
-  implementation(project(":mockwebserver"))
+  implementation(projects.mockwebserver)
 }
 
 tasks.shadowJar {

diff --git a/samples/unixdomainsockets/build.gradle.kts b/samples/unixdomainsockets/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":okhttp"))
-  implementation(project(":mockwebserver"))
+  implementation(projects.okhttp)
+  implementation(projects.mockwebserver)
   implementation(Dependencies.jnrUnixsocket)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -40,3 +40,5 @@ include(":samples:simple-client")
 include(":samples:slack")
 include(":samples:static-server")
 include(":samples:unixdomainsockets")
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")