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.

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 dependency androidx.compose:compose-bom to v2024.09.02 (v1.7.x) #962

Merged
merged 37 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fba958c
post release updates (#902)
breedx-splk Aug 12, 2024
a18cc6a
Update contributor-assistant/github-action action to v2.5.1 (#906)
renovate[bot] Aug 16, 2024
38183d6
Update dependency gradle to v8.10 (#904)
renovate[bot] Aug 16, 2024
a0ff2fb
Update junit5 monorepo to v5.11.0 (#905)
renovate[bot] Aug 16, 2024
e3cc7a8
Update dependency androidx.compose:compose-bom to v2024.08.00 (#908)
renovate[bot] Aug 21, 2024
0c90675
Update dependency com.uber.nullaway:nullaway to v0.11.2 (#907)
renovate[bot] Aug 21, 2024
47ede92
Update gradle/actions action to v4.0.1 (#912)
renovate[bot] Aug 26, 2024
e5604c0
Update dependency com.android.tools:desugar_jdk_libs to v2.1.0 (#911)
renovate[bot] Aug 26, 2024
ce41bf8
Update mockito monorepo to v5.13.0 (#913)
renovate[bot] Aug 27, 2024
d08f7f8
Update dependency com.google.errorprone:error_prone_core to v2.31.0 (…
renovate[bot] Aug 29, 2024
2c7163b
Update kotlin to v2.0.20 (#895)
renovate[bot] Aug 29, 2024
58630e0
Update dependency com.android.tools.build:gradle to v8.6.0 (#916)
renovate[bot] Aug 29, 2024
ff0a737
Update dependency com.android.tools:desugar_jdk_libs to v2.1.1 (#914)
renovate[bot] Aug 29, 2024
7f9fe86
update renovate for 1.7.x branch (#903)
breedx-splk Sep 4, 2024
9de353a
Update dependency androidx.activity:activity-compose to v1.9.2 (#929)
renovate[bot] Sep 5, 2024
037e1e2
Update dependency com.android.tools:desugar_jdk_libs to v2.1.2 (#923)
renovate[bot] Sep 5, 2024
c6bf19a
Update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.5 …
renovate[bot] Sep 5, 2024
967cd12
Update dependency androidx.compose:compose-bom to v2024.09.00 (#931)
renovate[bot] Sep 5, 2024
8920cb9
Update upstream otel instrumentation (#919)
renovate[bot] Sep 5, 2024
4a7c05e
Update actions/setup-java action to v4.3.0 (#943)
renovate[bot] Sep 9, 2024
f3ab3de
Update dependency gradle to v8.10.1 (#941)
renovate[bot] Sep 9, 2024
c963213
don't allow renovate to do a major upgrade in the 1.x branch (#945)
breedx-splk Sep 10, 2024
9203a62
Update dependency androidx.compose:compose-bom to v2024.09.01 (#947)
renovate[bot] Sep 10, 2024
fd93fa7
Update opentelemetry-java monorepo (#939)
renovate[bot] Sep 10, 2024
bec6105
Update dependency io.zipkin.reporter2:zipkin-sender-okhttp3 to v3.4.1…
renovate[bot] Sep 11, 2024
0797ab9
Update gradle/actions action to v4.1.0 (#953)
renovate[bot] Sep 13, 2024
78d3a15
Update dependency com.google.errorprone:error_prone_core to v2.32.0 (…
renovate[bot] Sep 16, 2024
689e45d
Update dependency com.uber.nullaway:nullaway to v0.11.3 (#955)
renovate[bot] Sep 17, 2024
e21e902
Fix maven central link (#963)
breedx-splk Sep 19, 2024
16771b1
Update dependency com.android.tools.build:gradle to v8.6.1 (#957)
renovate[bot] Sep 19, 2024
fe4ec5f
Update dependency androidx.compose:compose-bom to v2024.09.02
renovate[bot] Sep 19, 2024
1ed7487
Update dependency androidx.compose:compose-bom to v2024.09.02 (#959)
renovate[bot] Sep 19, 2024
b7126ce
Update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.6 …
renovate[bot] Sep 19, 2024
2c86de4
Update dependency androidx.webkit:webkit to v1.12.0 (#961)
renovate[bot] Sep 19, 2024
3501a85
Update dependency androidx.compose:compose-bom to v2024.09.02
renovate[bot] Sep 19, 2024
e25d3f0
Merge remote-tracking branch 'upstream/renovate/v1.7.x-compose.bom' i…
breedx-splk Sep 19, 2024
7942bf6
merge main
breedx-splk Sep 19, 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
10 changes: 10 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"extends": [
"config:base"
],
"baseBranches": ["main", "v1.7.x"],
"packageRules": [
{
"matchPackageNames": [
Expand All @@ -17,6 +18,15 @@
// stable version of opentelemetry-instrumentation-bom-alpha so this logic doesn't apply
"ignoreUnstable": false
},
{
// Don't bump to 2.x in the 1.x line
"matchUpdateTypes": ["major"],
"matchPackagePatterns": [
"^io.opentelemetry.instrumentation"
],
"matchBaseBranches": ["v1.7.x"],
"enabled": false
},
{
// navigation-fragment 2.7.0 and above require android api 34+, which we are not ready for
// yet due to android gradle plugin only supporting min 33.
Expand Down
3 changes: 2 additions & 1 deletion .lycheeignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
https://rum-ingest/
https://appassets.androidplatform.net/assets/index.html
https://appassets.androidplatform.net/assets/first.html
https://appassets.androidplatform.net/assets/second.html
https://appassets.androidplatform.net/assets/second.html
https://mvnrepository.com/artifact/com.splunk/splunk-otel-android/latest
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### Unreleased

### Version 1.7.0 - 2024-08-12

This is a regular maintenance release.

This version depends on these upstream versions:

* opentelemetry-android v0.4.0
* opentelemetry-instrumentation-api v1.33.5
* opentelemetry-sdk v1.41.0

Enhancements:

* Disable console exporter from upstream (#894)

### Version 1.6.0 - 2024-07-10

This is a regular maintenance release.
Expand Down
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,12 @@
</strong>
</p>

<p align="center">
<img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.4">
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.32.1-blueviolet?style=for-the-badge">
</a>
<a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.4.0">
<img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.4.0-blueviolet?style=for-the-badge">
</a>
<a href="https://github.com/signalfx/splunk-otel-android/releases">
<img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/signalfx/splunk-otel-android?include_prereleases&style=for-the-badge">
</a>
<a href="https://maven-badges.herokuapp.com/maven-central/com.splunk/splunk-otel-android">
<img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.splunk/splunk-otel-android?style=for-the-badge">
</a>
<a href="https://github.com/signalfx/splunk-otel-android/actions/workflows/main.yaml">
<img alt="Build Status" src="https://img.shields.io/github/actions/workflow/status/signalfx/splunk-otel-android/main.yaml?branch=main&style=for-the-badge">
</a>
</p>
![Stable][stable-image]
[![OpenTelemetry Instrumentation for Java Version][otel-image]][otel-link]
[![OpenTelemetry Instrumentation for Android Version][android-image]][android-link]
[![Splunk GDI specification][gdi-image]][gdi-link]
[![Maven Central][maven-image]][maven-link]
[![Build Status][build-image]][build-link]

---

Expand Down Expand Up @@ -69,3 +57,15 @@ in the official documentation.

The Splunk Android RUM Instrumentation is licensed under the terms of the Apache Software License
version 2.0. See [the license file](./LICENSE) for more details.

[stable-image]: https://img.shields.io/badge/status-stable-informational?style=for-the-badge
[otel-image]: https://img.shields.io/badge/otel-1.33.5-blueviolet?style=for-the-badge
[otel-link]: https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.5
[android-image]: https://img.shields.io/github/v/release/signalfx/splunk-otel-android?include_prereleases&style=for-the-badge
[android-link]: https://github.com/signalfx/splunk-otel-android/releases
[gdi-image]: https://img.shields.io/badge/GDI-1.4.0-blueviolet?style=for-the-badge
[gdi-link]: https://github.com/signalfx/gdi-specification/releases/tag/v1.4.0
[maven-image]: https://img.shields.io/maven-central/v/com.splunk/splunk-otel-android?style=for-the-badge
[maven-link]: https://mvnrepository.com/artifact/com.splunk/splunk-otel-android/latest
[build-image]: https://img.shields.io/github/actions/workflow/status/signalfx/splunk-otel-android/main.yaml?branch=main&style=for-the-badge
[build-link]: https://github.com/signalfx/splunk-otel-android/actions/workflows/main.yaml
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true

# generate the BuildConfig class that contains the app version
version=1.7.0
version=1.8.0
group=com.splunk
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ mockito = "5.13.0"
junit = "5.11.0"
spotless = "6.25.0"
kotlin = "2.0.20"
lifecycle-runtime-ktx = "2.8.5"
lifecycle-runtime-ktx = "2.8.6"
activity-compose = "1.9.2"
compose-bom = "2024.09.01"
compose-bom = "2024.09.02"
navigationCompose = "2.7.7"

[libraries]
Expand All @@ -35,7 +35,7 @@ androidx-core = "androidx.core:core:1.13.1"
androidx-navigation-fragment = "androidx.navigation:navigation-fragment:2.7.7"
androidx-navigation-ui = "androidx.navigation:navigation-ui:2.7.7"
androidx-work = "androidx.work:work-runtime:2.9.1"
androidx-webkit = "androidx.webkit:webkit:1.11.0"
androidx-webkit = "androidx.webkit:webkit:1.12.0"

# Volley
android-volley = "com.android.volley:volley:1.2.1"
Expand Down
Loading