diff --git a/CHANGELOG.md b/CHANGELOG.md index a5fbe0f3e77..68f2c68095b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # vNext * Fix: Fix setting in-app-includes from external properties (#1291) - +* Fix: Fix JUL integration SDK name (#1293) # 4.2.0 diff --git a/sentry-jul/api/sentry-jul.api b/sentry-jul/api/sentry-jul.api index fdbdeebf807..7d6b45ea19a 100644 --- a/sentry-jul/api/sentry-jul.api +++ b/sentry-jul/api/sentry-jul.api @@ -1,3 +1,8 @@ +public final class io/sentry/jul/BuildConfig { + public static final field SENTRY_JUL_SDK_NAME Ljava/lang/String; + public static final field VERSION_NAME Ljava/lang/String; +} + public final class io/sentry/jul/SentryHandler : java/util/logging/Handler { public static final field THREAD_ID Ljava/lang/String; public fun ()V @@ -13,8 +18,3 @@ public final class io/sentry/jul/SentryHandler : java/util/logging/Handler { public fun setPrintfStyle (Z)V } -public final class io/sentry/logback/BuildConfig { - public static final field SENTRY_JUL_SDK_NAME Ljava/lang/String; - public static final field VERSION_NAME Ljava/lang/String; -} - diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index 76c5b9f98b6..910a143474f 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -70,8 +70,8 @@ tasks { buildConfig { useJavaOutput() - packageName("io.sentry.logback") - buildConfigField("String", "SENTRY_JUL_SDK_NAME", "\"${Config.Sentry.SENTRY_LOGBACK_SDK_NAME}\"") + packageName("io.sentry.jul") + buildConfigField("String", "SENTRY_JUL_SDK_NAME", "\"${Config.Sentry.SENTRY_JUL_SDK_NAME}\"") buildConfigField("String", "VERSION_NAME", "\"${project.version}\"") } diff --git a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java index 4073a351713..7761a41ea03 100644 --- a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java +++ b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java @@ -5,7 +5,6 @@ import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.logback.BuildConfig; import io.sentry.protocol.Message; import io.sentry.protocol.SdkVersion; import io.sentry.util.CollectionUtils; diff --git a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt index 16f294b723e..622c409d5d5 100644 --- a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt +++ b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt @@ -6,7 +6,6 @@ import com.nhaarman.mockitokotlin2.verify import io.sentry.Sentry import io.sentry.SentryLevel import io.sentry.SentryOptions -import io.sentry.logback.BuildConfig import io.sentry.test.checkEvent import io.sentry.transport.ITransport import java.time.Instant