Skip to content

Type-safe project accessors in Gradle config. #1644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maciejwalkowiak merged 1 commit into from
Aug 13, 2021
Merged

Type-safe project accessors in Gradle config. #1644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sentry-android-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ tasks.withType<JavaCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)

// lifecycle processor, session tracking
implementation(Config.Libs.lifecycleProcess)
Expand All @@ -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)
}
2 changes: 1 addition & 1 deletion sentry-android-fragment/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ kotlin {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)

implementation(Config.Libs.fragment)

Expand Down
4 changes: 2 additions & 2 deletions sentry-android-ndk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion sentry-android-okhttp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ kotlin {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)

implementation(Config.Libs.okhttpBom)
implementation(Config.Libs.okhttp)
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-timber/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)

api(Config.Libs.timber)

Expand Down
4 changes: 2 additions & 2 deletions sentry-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ android {
}

dependencies {
api(project(":sentry-android-core"))
api(project(":sentry-android-ndk"))
api(projects.sentryAndroidCore)
api(projects.sentryAndroidNdk)
}
4 changes: 2 additions & 2 deletions sentry-apache-http-client-5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)
api(Config.Libs.apacheHttpClient)

compileOnly(Config.CompileOnly.nopen)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-jul/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)
implementation(Config.Libs.slf4jApi)

compileOnly(Config.CompileOnly.nopen)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-kotlin-extensions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)
implementation(Config.Libs.coroutinesCore)

compileOnly(Config.CompileOnly.nopen)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-log4j2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)
implementation(Config.Libs.log4j2Api)
implementation(Config.Libs.log4j2Core)

Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-logback/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)
implementation(Config.Libs.logbackClassic)

compileOnly(Config.CompileOnly.nopen)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-openfeign/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)
implementation(Config.Libs.feignCore)

compileOnly(Config.CompileOnly.nopen)
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions sentry-samples/sentry-samples-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
// }
Expand Down
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-console/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ configure<JavaPluginConvention> {
}

dependencies {
implementation(project(":sentry"))
implementation(projects.sentry)
}
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-jul/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ configure<JavaPluginConvention> {
}

dependencies {
implementation(project(":sentry-jul"))
implementation(projects.sentryJul)
implementation(Config.Libs.logbackClassic)
}
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-log4j2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ configure<JavaPluginConvention> {
}

dependencies {
implementation(project(":sentry-log4j2"))
implementation(projects.sentryLog4j2)
implementation(Config.Libs.log4j2Api)
}
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-logback/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ configure<JavaPluginConvention> {
}

dependencies {
implementation(project(":sentry-logback"))
implementation(projects.sentryLogback)
implementation(Config.Libs.logbackClassic)
}
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-openfeign/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-servlet/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {
}

dependencies {
implementation(project(":sentry-servlet"))
implementation(projects.sentryServlet)
implementation("javax.servlet:javax.servlet-api:4.0.1")
}

Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-servlet/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(project(":sentry"))
api(projects.sentry)
implementation(Config.Libs.servletApi)

compileOnly(Config.CompileOnly.nopen)
Expand All @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions sentry-spring-boot-starter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sentry-test-support/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion sentry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
2 changes: 2 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

rootProject.name = "sentry-root"
rootProject.buildFileName = "build.gradle.kts"

Expand Down