Skip to content
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

Update DatadogObjc dependency to v2.16.0 #77

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Update DatadogObjc dependency to v2.16.0 #77

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
853ba70
Update DatadogObjc dependency to v2.13.0
twyatt Jul 2, 2024
2deb5c8
Bump iOS deployment target to 12
twyatt Jul 3, 2024
c19f852
Workaround for ".. is going to be declared twice" build failures
twyatt Jul 3, 2024
91cf118
Merge branch 'main' into twyatt/datadog-objc
twyatt Jul 8, 2024
1d79d96
Merge branch 'main' into twyatt/datadog-objc
twyatt Aug 16, 2024
b2b5f19
Merge branch 'main' into twyatt/datadog-objc
twyatt Aug 20, 2024
afdc8f1
Merge branch 'main' into twyatt/datadog-objc
twyatt Aug 24, 2024
9c265ff
Bump Datadog iOS dependency to v2.16.0
twyatt Aug 24, 2024
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
Prev Previous commit
Next Next commit
Workaround for ".. is going to be declared twice" build failures
  • Loading branch information
@twyatt
twyatt committed Jul 6, 2024
commit c19f852f37d4ad9dac0c37035e477178b5995288
11 changes: 11 additions & 0 deletions bundled/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ kotlin {
}
}

// Workaround for build failure:
// IllegalArgumentException: '<classname>' is going to be declared twice
// https://youtrack.jetbrains.com/issue/KT-41709/Objective-C-Interop-CBLQueryMeta-is-going-to-be-declared-twice
targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget>().all {
compilations["main"].cinterops["DatadogObjc"].apply {
extraOpts("-compiler-option", "-Dchar16_t=char16_tUnavailable")
extraOpts("-compiler-option", "-Dchar16_tUnavailableVar=char16_tUnavailableVarUnavailable")
extraOpts("-compiler-option", "-DDDRUMErrorEventErrorMeta=DDRUMErrorEventErrorMetaUnavailable")
}
}

sourceSets {
all {
all {
Expand Down
Loading