Skip to content

Commit

Permalink
Change Spring Boot, Apollo, Apollo 3, JUL, Logback, Log4j2, OpenFeign…
Browse files Browse the repository at this point in the history
…, GraphQL and Kotlin coroutines core dependencies to compileOnly (#2837)
  • Loading branch information
adinauer committed Jul 13, 2023
1 parent adf8fe3 commit f18a438
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 12 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Change Spring Boot, Apollo, Apollo 3, JUL, Logback, Log4j2, OpenFeign, GraphQL and Kotlin coroutines core dependencies to compileOnly ([#2837](https://github.com/getsentry/sentry-java/pull/2837))

## 6.25.1

### Fixes
Expand Down
3 changes: 2 additions & 1 deletion sentry-apollo-3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
api(projects.sentry)
api(projects.sentryKotlinExtensions)

implementation(Config.Libs.apolloKotlin)
compileOnly(Config.Libs.apolloKotlin)

compileOnly(Config.CompileOnly.nopen)
errorprone(Config.CompileOnly.nopenChecker)
Expand All @@ -40,6 +40,7 @@ dependencies {
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.TestLibs.mockitoInline)
testImplementation(Config.TestLibs.mockWebserver)
testImplementation(Config.Libs.apolloKotlin)
}

configure<SourceSetContainer> {
Expand Down
3 changes: 2 additions & 1 deletion sentry-apollo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
api(projects.sentry)
api(projects.sentryKotlinExtensions)

implementation(Config.Libs.apolloAndroid)
compileOnly(Config.Libs.apolloAndroid)

compileOnly(Config.CompileOnly.nopen)
errorprone(Config.CompileOnly.nopenChecker)
Expand All @@ -41,6 +41,7 @@ dependencies {
testImplementation(Config.TestLibs.mockitoInline)
testImplementation(Config.TestLibs.mockWebserver)
testImplementation(Config.Libs.apolloCoroutines)
testImplementation(Config.Libs.apolloAndroid)
}

configure<SourceSetContainer> {
Expand Down
3 changes: 2 additions & 1 deletion sentry-graphql/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tasks.withType<KotlinCompile>().configureEach {

dependencies {
api(projects.sentry)
implementation(Config.Libs.graphQlJava)
compileOnly(Config.Libs.graphQlJava)

compileOnly(Config.CompileOnly.nopen)
errorprone(Config.CompileOnly.nopenChecker)
Expand All @@ -38,6 +38,7 @@ dependencies {
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.TestLibs.mockWebserver)
testImplementation(Config.Libs.okhttp)
testImplementation(Config.Libs.graphQlJava)
}

configure<SourceSetContainer> {
Expand Down
3 changes: 2 additions & 1 deletion sentry-jul/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile>().configureEach {

dependencies {
api(projects.sentry)
implementation(Config.Libs.slf4jApi)
compileOnly(Config.Libs.slf4jApi)

compileOnly(Config.CompileOnly.nopen)
errorprone(Config.CompileOnly.nopenChecker)
Expand All @@ -35,6 +35,7 @@ dependencies {
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.Libs.logbackClassic)
testImplementation(Config.Libs.slf4jApi)
}

configure<SourceSetContainer> {
Expand Down
3 changes: 2 additions & 1 deletion sentry-kotlin-extensions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tasks.withType<KotlinCompile>().configureEach {

dependencies {
api(projects.sentry)
implementation(Config.Libs.coroutinesCore)
compileOnly(Config.Libs.coroutinesCore)

compileOnly(Config.CompileOnly.nopen)
errorprone(Config.CompileOnly.nopenChecker)
Expand All @@ -34,6 +34,7 @@ dependencies {
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.Libs.coroutinesCore)
}

configure<SourceSetContainer> {
Expand Down
6 changes: 4 additions & 2 deletions sentry-log4j2/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ tasks.withType<KotlinCompile>().configureEach {

dependencies {
api(projects.sentry)
implementation(Config.Libs.log4j2Api)
implementation(Config.Libs.log4j2Core)
compileOnly(Config.Libs.log4j2Api)
compileOnly(Config.Libs.log4j2Core)
annotationProcessor(Config.Libs.log4j2Core)

compileOnly(Config.CompileOnly.nopen)
Expand All @@ -36,6 +36,8 @@ dependencies {
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.Libs.log4j2Api)
testImplementation(Config.Libs.log4j2Core)
}

configure<SourceSetContainer> {
Expand Down
3 changes: 2 additions & 1 deletion sentry-logback/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile>().configureEach {

dependencies {
api(projects.sentry)
implementation(Config.Libs.logbackClassic)
compileOnly(Config.Libs.logbackClassic)

compileOnly(Config.CompileOnly.nopen)
errorprone(Config.CompileOnly.nopenChecker)
Expand All @@ -34,6 +34,7 @@ dependencies {
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.Libs.logbackClassic)
}

configure<SourceSetContainer> {
Expand Down
3 changes: 2 additions & 1 deletion sentry-openfeign/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile>().configureEach {

dependencies {
api(projects.sentry)
implementation(Config.Libs.feignCore)
compileOnly(Config.Libs.feignCore)

compileOnly(Config.CompileOnly.nopen)
errorprone(Config.CompileOnly.nopenChecker)
Expand All @@ -36,6 +36,7 @@ dependencies {
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.TestLibs.awaitility)
testImplementation(Config.TestLibs.mockWebserver)
testImplementation(Config.Libs.feignCore)
}

configure<SourceSetContainer> {
Expand Down
6 changes: 4 additions & 2 deletions sentry-spring-boot-starter-jakarta/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ dependencies {
api(projects.sentrySpringJakarta)
compileOnly(projects.sentryLogback)
compileOnly(projects.sentryApacheHttpClient5)
implementation(Config.Libs.springBoot3Starter)
implementation(platform(SpringBootPlugin.BOM_COORDINATES))
compileOnly(Config.Libs.springBoot3Starter)
compileOnly(platform(SpringBootPlugin.BOM_COORDINATES))
compileOnly(Config.Libs.springWeb)
compileOnly(Config.Libs.springWebflux)
compileOnly(Config.Libs.servletApiJakarta)
Expand Down Expand Up @@ -58,6 +58,8 @@ dependencies {
testImplementation(Config.TestLibs.mockWebserver)

testImplementation(Config.Libs.okhttp)
testImplementation(Config.Libs.springBoot3Starter)
testImplementation(platform(SpringBootPlugin.BOM_COORDINATES))
testImplementation(Config.Libs.springBoot3StarterTest)
testImplementation(Config.Libs.springBoot3StarterWeb)
testImplementation(Config.Libs.springBoot3StarterWebflux)
Expand Down
3 changes: 2 additions & 1 deletion sentry-spring-boot-starter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
api(projects.sentrySpring)
compileOnly(projects.sentryLogback)
compileOnly(projects.sentryApacheHttpClient5)
implementation(Config.Libs.springBootStarter)
compileOnly(Config.Libs.springBootStarter)
compileOnly(platform(SpringBootPlugin.BOM_COORDINATES))
compileOnly(Config.Libs.springWeb)
compileOnly(Config.Libs.springWebflux)
Expand Down Expand Up @@ -56,6 +56,7 @@ dependencies {
testImplementation(Config.TestLibs.mockitoKotlin)
testImplementation(Config.TestLibs.mockWebserver)
testImplementation(Config.Libs.okhttp)
testImplementation(Config.Libs.springBootStarter)
testImplementation(Config.Libs.springBootStarterTest)
testImplementation(Config.Libs.springBootStarterWeb)
testImplementation(Config.Libs.springBootStarterWebflux)
Expand Down

0 comments on commit f18a438

Please sign in to comment.