-
Notifications
You must be signed in to change notification settings - Fork 4
chore: simplify maui project by removing dependency repetitions #451
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.
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
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
3098277
renaming to ObservabilityService to match Swift
abelonogov-ld ecb214e
Remove instrumentation manager
abelonogov-ld b34ffb8
Refactor opentelemetry testing
abelonogov-ld 4264286
revert incubator
abelonogov-ld 2941a91
address feedback
abelonogov-ld b77c4ca
minus 3 dependency
abelonogov-ld bbc5f43
Merge branch 'main' into andrey/open-telemetry-testing
abelonogov-ld bf0a4c1
simplify maui projects to do not have repetitions
abelonogov-ld 54fb3b3
Merge branch 'main' into andrey/open-telemetry-testing
abelonogov-ld f1e1ff3
refactor: update OpenTelemetry JAR handling in project files
abelonogov-ld 53b04cb
Merge branch 'andrey/open-telemetry-testing' into andrey/simpligy-mau…
abelonogov-ld fb0458e
doesn't account version
abelonogov-ld 5e74560
Merge branch 'main' into andrey/simpligy-maui-projects
abelonogov-ld File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
sdk/@launchdarkly/mobile-dotnet/observability/Directory.Build.props
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
sdk/@launchdarkly/mobile-dotnet/observability/NativeAndroidDeps.props
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| <Project> | ||
| <!-- | ||
| Single source of truth for native Android artifacts (AARs / JARs) that | ||
| must travel with the observability SDK. Both LDObservability.csproj | ||
| (local dev builds) and LDObservability.Fat.csproj (NuGet packaging) | ||
| import this file and transform the items into the appropriate MSBuild | ||
| item types. | ||
|
|
||
| Callers may override _LDNativeDepsDir / _LDNativeAarDir before this | ||
| import to point at a different output location. | ||
|
|
||
| Items are split into _LDNativeAAR and _LDNativeJAR because MSBuild | ||
| does not allow %(Extension) metadata filtering in Include conditions. | ||
| --> | ||
| <PropertyGroup> | ||
| <_LDNativeDepsDir Condition="'$(_LDNativeDepsDir)' == ''">$(MSBuildThisFileDirectory)..\android\native\LDObserve\bin\Release\net9.0-android\outputs\deps\</_LDNativeDepsDir> | ||
| <_LDNativeAarDir Condition="'$(_LDNativeAarDir)' == ''">$(MSBuildThisFileDirectory)..\android\native\LDObserve\bin\Release\net9.0-android\outputs\aar\</_LDNativeAarDir> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- OTel Android AARs --> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)android-agent-*.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)android-instrumentation-*.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)common-0*.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)common-api-*.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)core-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)crash-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)anr-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)activity-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)fragment-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)network-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)services-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)session-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)slowrendering-*-alpha.aar" /> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)startup-*-alpha.aar" /> | ||
|
|
||
| <!-- LD native SDK AAR --> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)launchdarkly-android-client-sdk-*.aar" /> | ||
|
|
||
| <!-- Observability Android library AAR --> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)lib-release.aar" /> | ||
|
|
||
| <!-- Third-party AARs --> | ||
| <_LDNativeAAR Include="$(_LDNativeDepsDir)timber-*.aar" /> | ||
|
|
||
| <!-- Bridge module AAR --> | ||
| <_LDNativeAAR Include="$(_LDNativeAarDir)LDObserve-release.aar" /> | ||
|
|
||
| <!-- JARs: exclude all opentelemetry-sdk-extension-autoconfigure-*.jar, then add *-spi-* back (main autoconfigure | ||
| must not ship; SPI must). autoconfigure-1* only matched OTel 1.x filenames and failed silently on 2.x. --> | ||
| <_LDNativeJAR Include="$(_LDNativeDepsDir)opentelemetry-*.jar" | ||
| Exclude="$(_LDNativeDepsDir)opentelemetry-sdk-extension-incubator-*.jar;$(_LDNativeDepsDir)opentelemetry-sdk-extension-autoconfigure-*.jar;$(_LDNativeDepsDir)opentelemetry-sdk-testing-*.jar" /> | ||
| <_LDNativeJAR Include="$(_LDNativeDepsDir)opentelemetry-sdk-extension-autoconfigure-spi-*.jar" /> | ||
| <_LDNativeJAR Include="$(_LDNativeDepsDir)jackson-*.jar" /> | ||
| <_LDNativeJAR Include="$(_LDNativeDepsDir)launchdarkly-*.jar" /> | ||
| <_LDNativeJAR Include="$(_LDNativeDepsDir)okhttp-*.jar" /> | ||
| <_LDNativeJAR Include="$(_LDNativeDepsDir)okio-*.jar" /> | ||
| </ItemGroup> | ||
| </Project> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.