Skip to content

Remove vendored dsl-json #2253

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
lemnik merged 6 commits into from
Sep 15, 2025
Merged

Remove vendored dsl-json #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f8ce68
feat(json): reduce bundle size by removing dsljson
lemnik Aug 7, 2025
cef598d
chore(json): updated lint baselines
lemnik Aug 13, 2025
640b126
test(json): add a new stress test to Event parsing & output using met…
lemnik Aug 14, 2025
f9b5afd
fix(json): rebuilt the JsonCollectionParser.parseNumber function
lemnik Aug 14, 2025
d1a1b92
test(json): fixed the EventSerializationTest to pass by reordering th…
lemnik Aug 14, 2025
834e695
chore(cleanup): removed unused imports and fixed formatting
lemnik Aug 14, 2025
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
10 changes: 0 additions & 10 deletions bugsnag-android-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import kotlinx.validation.ApiValidationExtension
import org.jetbrains.dokka.gradle.DokkaTask

plugins {
Expand Down Expand Up @@ -64,13 +63,8 @@ android {
}

sourceSets {
named("main") {
java.srcDirs("dsl-json/library/src/main/java")
}

named("test") {
java.srcDirs(
"dsl-json/library/src/test/java",
"src/sharedTest/java"
)
}
Expand Down Expand Up @@ -104,10 +98,6 @@ tasks.getByName<DokkaTask>("dokkaHtml") {
}
}

plugins.withId("org.jetbrains.kotlinx.binary-compatibility-validator") {
project.extensions.getByType(ApiValidationExtension::class.java).ignoredPackages.add("com.bugsnag.android.repackaged.dslplatform.json")
}

apply(from = rootProject.file("gradle/detekt.gradle"))
apply(from = rootProject.file("gradle/license-check.gradle"))
apply(from = rootProject.file("gradle/release.gradle"))
Expand Down
26 changes: 26 additions & 0 deletions bugsnag-android-core/detekt-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
<CurrentIssues>
<ID>CyclomaticComplexMethod:AppDataCollector.kt$AppDataCollector$@SuppressLint("SwitchIntDef") @Suppress("DEPRECATION") private fun getProcessImportance(): String?</ID>
<ID>CyclomaticComplexMethod:ConfigInternal.kt$ConfigInternal$fun getConfigDifferences(): Map&lt;String, Any></ID>
<ID>CyclomaticComplexMethod:JsonCollectionParser.kt$JsonCollectionParser$private fun parseNumber(): Number</ID>
<ID>CyclomaticComplexMethod:JsonCollectionParser.kt$JsonCollectionParser$private fun readUtf8Char(): Int</ID>
<ID>ImplicitDefaultLocale:Deliverable.kt$Deliverable$String.format("%02x", byte)</ID>
<ID>LongMethod:EventSerializationTest.kt$EventSerializationTest.Companion$@JvmStatic @Parameters fun testCases(): Collection&lt;Pair&lt;Event, String>></ID>
<ID>LongMethod:EventSerializationTest.kt$private fun createMetadataStressTest(event: Event)</ID>
<ID>LongParameterList:App.kt$App$( /** * The architecture of the running application binary */ var binaryArch: String?, /** * The package name of the application */ var id: String?, /** * The release stage set in [Configuration.releaseStage] */ var releaseStage: String?, /** * The version of the application set in [Configuration.version] */ var version: String?, /** The revision ID from the manifest (React Native apps only) */ var codeBundleId: String?, /** * The unique identifier for the build of the application set in [Configuration.buildUuid] */ buildUuid: Provider&lt;String?>?, /** * The application type set in [Configuration#version] */ var type: String?, /** * The version code of the application set in [Configuration.versionCode] */ var versionCode: Number? )</ID>
<ID>LongParameterList:AppDataCollector.kt$AppDataCollector$( appContext: Context, private val packageManager: PackageManager?, private val config: ImmutableConfig, private val sessionTracker: Provider&lt;SessionTracker>, private val activityManager: ActivityManager?, private val launchCrashTracker: LaunchCrashTracker, private val memoryTrimState: MemoryTrimState )</ID>
<ID>LongParameterList:AppWithState.kt$AppWithState$( binaryArch: String?, id: String?, releaseStage: String?, version: String?, codeBundleId: String?, buildUuid: Provider&lt;String?>?, type: String?, versionCode: Number?, /** * The number of milliseconds the application was running before the event occurred */ var duration: Number?, /** * The number of milliseconds the application was running in the foreground before the * event occurred */ var durationInForeground: Number?, /** * Whether the application was in the foreground when the event occurred */ var inForeground: Boolean?, /** * Whether the application was launching when the event occurred */ var isLaunching: Boolean? )</ID>
Expand All @@ -22,13 +25,34 @@
<ID>LongParameterList:NativeStackframe.kt$NativeStackframe$( /** * The name of the method that was being executed */ var method: String?, /** * The location of the source file */ var file: String?, /** * The line number within the source file this stackframe refers to */ var lineNumber: Number?, /** * The address of the instruction where the event occurred. */ var frameAddress: Long?, /** * The address of the function where the event occurred. */ var symbolAddress: Long?, /** * The address of the library where the event occurred. */ var loadAddress: Long?, /** * Whether this frame identifies the program counter */ var isPC: Boolean?, /** * The type of the error */ var type: ErrorType? = null, /** * Identifies the exact build this frame originates from. */ var codeIdentifier: String? = null, )</ID>
<ID>LongParameterList:StateEvent.kt$StateEvent.Install$( @JvmField val apiKey: String, @JvmField val autoDetectNdkCrashes: Boolean, @JvmField val appVersion: String?, @JvmField val buildUuid: String?, @JvmField val releaseStage: String?, @JvmField val lastRunInfoPath: String, @JvmField val consecutiveLaunchCrashes: Int, @JvmField val sendThreads: ThreadSendPolicy, @JvmField val maxBreadcrumbs: Int )</ID>
<ID>LongParameterList:ThreadState.kt$ThreadState$( allThreads: List&lt;JavaThread>, currentThread: JavaThread, exc: Throwable?, isUnhandled: Boolean, maxThreadCount: Int, threadCollectionTimeLimitMillis: Long, projectPackages: Collection&lt;String>, logger: Logger )</ID>
<ID>LoopWithTooManyJumpStatements:JsonCollectionParser.kt$JsonCollectionParser$while</ID>
<ID>MagicNumber:BugsnagEventMapper.kt$BugsnagEventMapper$16</ID>
<ID>MagicNumber:BugsnagEventMapper.kt$BugsnagEventMapper$32</ID>
<ID>MagicNumber:BugsnagEventMapper.kt$BugsnagEventMapper$56</ID>
<ID>MagicNumber:DeliveryStatus.kt$DeliveryStatus.Companion$299</ID>
<ID>MagicNumber:DeliveryStatus.kt$DeliveryStatus.Companion$429</ID>
<ID>MagicNumber:DeliveryStatus.kt$DeliveryStatus.Companion$499</ID>
<ID>MagicNumber:EventStore.kt$EventStore$60</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0x07</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0x10000</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0x10FFFF</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0x3F</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0x3FF</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0x80</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0x800</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xC0</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xD800</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xDC00</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xDFFF</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xE0</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xF0</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xF8</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$0xFFFF</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$10</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$16</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$3</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$4</ID>
<ID>MagicNumber:JsonCollectionParser.kt$JsonCollectionParser$6</ID>
<ID>MagicNumber:JsonHelper.kt$JsonHelper$0xff</ID>
<ID>MagicNumber:JsonHelper.kt$JsonHelper$1000</ID>
<ID>MagicNumber:JsonHelper.kt$JsonHelper$16</ID>
Expand Down Expand Up @@ -64,6 +88,8 @@
<ID>SwallowedException:PluginClient.kt$PluginClient$exc: ClassNotFoundException</ID>
<ID>SwallowedException:RootDetector.kt$RootDetector$ex: IllegalThreadStateException</ID>
<ID>SwallowedException:SharedPrefMigrator.kt$SharedPrefMigrator$e: RuntimeException</ID>
<ID>ThrowsCount:JsonCollectionParser.kt$JsonCollectionParser$private fun parseNumber(): Number</ID>
<ID>ThrowsCount:JsonCollectionParser.kt$JsonCollectionParser$private fun readUtf8Char(): Int</ID>
<ID>ThrowsCount:JsonHelper.kt$JsonHelper$fun jsonToLong(value: Any?): Long?</ID>
<ID>TooManyFunctions:ConfigInternal.kt$ConfigInternal : CallbackAwareMetadataAwareUserAwareFeatureFlagAware</ID>
<ID>TooManyFunctions:DeviceDataCollector.kt$DeviceDataCollector</ID>
Expand Down
1 change: 0 additions & 1 deletion bugsnag-android-core/dsl-json
Open in desktop
Submodule dsl-json deleted from 0375bd
Loading
Loading