Type-safe project accessors in Gradle config. (getsentry#1644)

maciejwalkowiak · web-flow · commit a46833bcefa0 · 2021-08-13T11:23:22.000+02:00
Fixes getsentry#1452
diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts
@@ -74,7 +74,7 @@ tasks.withType<JavaCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
 
     // lifecycle processor, session tracking
     implementation(Config.Libs.lifecycleProcess)
@@ -99,5 +99,5 @@ dependencies {
     testImplementation(Config.TestLibs.mockitoKotlin)
     testImplementation(Config.TestLibs.mockitoInline)
     testImplementation(Config.TestLibs.awaitility)
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
 }
diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts
@@ -62,7 +62,7 @@ kotlin {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
 
     implementation(Config.Libs.fragment)
 
diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts
@@ -97,8 +97,8 @@ tasks.withType<Test> {
 }
 
 dependencies {
-    api(project(":sentry"))
-    api(project(":sentry-android-core"))
+    api(projects.sentry)
+    api(projects.sentryAndroidCore)
 
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
diff --git a/sentry-android-okhttp/build.gradle.kts b/sentry-android-okhttp/build.gradle.kts
@@ -63,7 +63,7 @@ kotlin {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
 
     implementation(Config.Libs.okhttpBom)
     implementation(Config.Libs.okhttp)
diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts
@@ -72,7 +72,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
 
     api(Config.Libs.timber)
 
diff --git a/sentry-android/build.gradle.kts b/sentry-android/build.gradle.kts
@@ -22,6 +22,6 @@ android {
 }
 
 dependencies {
-    api(project(":sentry-android-core"))
-    api(project(":sentry-android-ndk"))
+    api(projects.sentryAndroidCore)
+    api(projects.sentryAndroidNdk)
 }
diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts
@@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     api(Config.Libs.apacheHttpClient)
 
     compileOnly(Config.CompileOnly.nopen)
@@ -32,7 +32,7 @@ dependencies {
 
     // tests
     testImplementation(Config.Libs.apacheHttpClient)
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts
@@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     implementation(Config.Libs.slf4jApi)
 
     compileOnly(Config.CompileOnly.nopen)
@@ -31,7 +31,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts
@@ -22,7 +22,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     implementation(Config.Libs.coroutinesCore)
 
     compileOnly(Config.CompileOnly.nopen)
@@ -32,7 +32,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts
@@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     implementation(Config.Libs.log4j2Api)
     implementation(Config.Libs.log4j2Core)
 
@@ -32,7 +32,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts
@@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     implementation(Config.Libs.logbackClassic)
 
     compileOnly(Config.CompileOnly.nopen)
@@ -31,7 +31,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts
@@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     implementation(Config.Libs.feignCore)
 
     compileOnly(Config.CompileOnly.nopen)
@@ -31,7 +31,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts
@@ -90,13 +90,13 @@ dependencies {
 
     implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
 
-    implementation(project(":sentry-android"))
-    implementation(project(":sentry-android-okhttp"))
-    implementation(project(":sentry-android-fragment"))
+    implementation(projects.sentryAndroid)
+    implementation(projects.sentryAndroidOkhttp)
+    implementation(projects.sentryAndroidFragment)
     implementation(Config.Libs.fragment)
 
 //    how to exclude androidx if release health feature is disabled
-//    implementation(project(":sentry-android")) {
+//    implementation(projects.sentryAndroid) {
 //        exclude(group = "androidx.lifecycle", module = "lifecycle-process")
 //        exclude(group = "androidx.lifecycle", module = "lifecycle-common-java8")
 //    }
diff --git a/sentry-samples/sentry-samples-console/build.gradle.kts b/sentry-samples/sentry-samples-console/build.gradle.kts
@@ -14,5 +14,5 @@ configure<JavaPluginConvention> {
 }
 
 dependencies {
-    implementation(project(":sentry"))
+    implementation(projects.sentry)
 }
diff --git a/sentry-samples/sentry-samples-jul/build.gradle.kts b/sentry-samples/sentry-samples-jul/build.gradle.kts
@@ -17,6 +17,6 @@ configure<JavaPluginConvention> {
 }
 
 dependencies {
-    implementation(project(":sentry-jul"))
+    implementation(projects.sentryJul)
     implementation(Config.Libs.logbackClassic)
 }
diff --git a/sentry-samples/sentry-samples-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-log4j2/build.gradle.kts
@@ -14,6 +14,6 @@ configure<JavaPluginConvention> {
 }
 
 dependencies {
-    implementation(project(":sentry-log4j2"))
+    implementation(projects.sentryLog4j2)
     implementation(Config.Libs.log4j2Api)
 }
diff --git a/sentry-samples/sentry-samples-logback/build.gradle.kts b/sentry-samples/sentry-samples-logback/build.gradle.kts
@@ -14,6 +14,6 @@ configure<JavaPluginConvention> {
 }
 
 dependencies {
-    implementation(project(":sentry-logback"))
+    implementation(projects.sentryLogback)
     implementation(Config.Libs.logbackClassic)
 }
diff --git a/sentry-samples/sentry-samples-openfeign/build.gradle.kts b/sentry-samples/sentry-samples-openfeign/build.gradle.kts
@@ -14,8 +14,8 @@ configure<JavaPluginConvention> {
 }
 
 dependencies {
-    implementation(project(":sentry"))
-    implementation(project(":sentry-openfeign"))
+    implementation(projects.sentry)
+    implementation(projects.sentryOpenfeign)
     implementation(Config.Libs.feignCore)
     implementation(Config.Libs.feignGson)
 }
diff --git a/sentry-samples/sentry-samples-servlet/build.gradle.kts b/sentry-samples/sentry-samples-servlet/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":sentry-servlet"))
+    implementation(projects.sentryServlet)
     implementation("javax.servlet:javax.servlet-api:4.0.1")
 }
 
diff --git a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
@@ -20,8 +20,8 @@ dependencies {
     implementation(Config.Libs.springBootStarterWebflux)
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
-    implementation(project(":sentry-spring-boot-starter"))
-    implementation(project(":sentry-logback"))
+    implementation(projects.sentrySpringBootStarter)
+    implementation(projects.sentryLogback)
     testImplementation(Config.Libs.springBootStarterTest) {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
diff --git a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts
@@ -25,8 +25,8 @@ dependencies {
     implementation(Config.Libs.springBootStarter)
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
-    implementation(project(":sentry-spring-boot-starter"))
-    implementation(project(":sentry-logback"))
+    implementation(projects.sentrySpringBootStarter)
+    implementation(projects.sentryLogback)
     testImplementation(Config.Libs.springBootStarterTest) {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts
@@ -34,8 +34,8 @@ dependencies {
     implementation(Config.Libs.logbackClassic)
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
-    implementation(project(":sentry-spring"))
-    implementation(project(":sentry-logback"))
+    implementation(projects.sentrySpring)
+    implementation(projects.sentryLogback)
     testImplementation(Config.Libs.springBootStarterTest) {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts
@@ -31,7 +31,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     implementation(Config.Libs.servletApi)
 
     compileOnly(Config.CompileOnly.nopen)
@@ -42,7 +42,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts
@@ -33,10 +33,10 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
-    api(project(":sentry-spring"))
-    compileOnly(project(":sentry-logback"))
-    compileOnly(project(":sentry-apache-http-client-5"))
+    api(projects.sentry)
+    api(projects.sentrySpring)
+    compileOnly(projects.sentryLogback)
+    compileOnly(projects.sentryApacheHttpClient5)
     implementation(Config.Libs.springBootStarter)
     compileOnly(Config.Libs.springWeb)
     compileOnly(Config.Libs.springWebflux)
@@ -56,9 +56,9 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-logback"))
-    testImplementation(project(":sentry-apache-http-client-5"))
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryLogback)
+    testImplementation(projects.sentryApacheHttpClient5)
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts
@@ -32,7 +32,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     compileOnly(Config.Libs.springWeb)
     compileOnly(Config.Libs.springAop)
     compileOnly(Config.Libs.springSecurityWeb)
@@ -49,7 +49,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts
@@ -16,7 +16,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
 }
 
 dependencies {
-    api(project(":sentry"))
+    api(projects.sentry)
     // Envelopes require JSON. Until a parse is done without GSON, we'll depend on it explicitly here
     implementation(Config.Libs.gson)
 
diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
     testImplementation(Config.TestLibs.mockitoInline)
     testImplementation(Config.TestLibs.awaitility)
     testImplementation(Config.TestLibs.jsonUnit)
-    testImplementation(project(":sentry-test-support"))
+    testImplementation(projects.sentryTestSupport)
 }
 
 configure<SourceSetContainer> {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,3 +1,5 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 rootProject.name = "sentry-root"
 rootProject.buildFileName = "build.gradle.kts"
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ tasks.withType<JavaCompile>().configureEach {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`dependencies {`
`77`		`- api(project(":sentry"))`
	`77`	`+ api(projects.sentry)`
`78`	`78`
`79`	`79`	`// lifecycle processor, session tracking`
`80`	`80`	`implementation(Config.Libs.lifecycleProcess)`
`@@ -99,5 +99,5 @@ dependencies {`
`99`	`99`	`testImplementation(Config.TestLibs.mockitoKotlin)`
`100`	`100`	`testImplementation(Config.TestLibs.mockitoInline)`
`101`	`101`	`testImplementation(Config.TestLibs.awaitility)`
`102`		`- testImplementation(project(":sentry-test-support"))`
	`102`	`+ testImplementation(projects.sentryTestSupport)`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ kotlin {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`dependencies {`
`65`		`- api(project(":sentry"))`
	`65`	`+ api(projects.sentry)`
`66`	`66`
`67`	`67`	`implementation(Config.Libs.fragment)`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ tasks.withType<Test> {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`dependencies {`
`100`		`- api(project(":sentry"))`
`101`		`- api(project(":sentry-android-core"))`
	`100`	`+ api(projects.sentry)`
	`101`	`+ api(projects.sentryAndroidCore)`
`102`	`102`
`103`	`103`	`compileOnly(Config.CompileOnly.jetbrainsAnnotations)`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ kotlin {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`dependencies {`
`66`		`- api(project(":sentry"))`
	`66`	`+ api(projects.sentry)`
`67`	`67`
`68`	`68`	`implementation(Config.Libs.okhttpBom)`
`69`	`69`	`implementation(Config.Libs.okhttp)`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ tasks.withType<KotlinCompile>().configureEach {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`dependencies {`
`75`		`- api(project(":sentry"))`
	`75`	`+ api(projects.sentry)`
`76`	`76`
`77`	`77`	`api(Config.Libs.timber)`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`
`25`		`- api(project(":sentry-android-core"))`
`26`		`- api(project(":sentry-android-ndk"))`
	`25`	`+ api(projects.sentryAndroidCore)`
	`26`	`+ api(projects.sentryAndroidNdk)`
`27`	`27`	`}`