Update dependency androidx.compose:compose-bom to v2024.09.02 (v1.7.x) (

#962) * post release updates (#902) * Update contributor-assistant/github-action action to v2.5.1 (#906) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency gradle to v8.10 (#904) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update junit5 monorepo to v5.11.0 (#905) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency androidx.compose:compose-bom to v2024.08.00 (#908) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.uber.nullaway:nullaway to v0.11.2 (#907) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update gradle/actions action to v4.0.1 (#912) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.android.tools:desugar_jdk_libs to v2.1.0 (#911) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update mockito monorepo to v5.13.0 (#913) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.google.errorprone:error_prone_core to v2.31.0 (#915) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update kotlin to v2.0.20 (#895) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.android.tools.build:gradle to v8.6.0 (#916) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.android.tools:desugar_jdk_libs to v2.1.1 (#914) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * update renovate for 1.7.x branch (#903) * Update dependency androidx.activity:activity-compose to v1.9.2 (#929) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.android.tools:desugar_jdk_libs to v2.1.2 (#923) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.5 (#930) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency androidx.compose:compose-bom to v2024.09.00 (#931) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update upstream otel instrumentation (#919) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update actions/setup-java action to v4.3.0 (#943) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency gradle to v8.10.1 (#941) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * don't allow renovate to do a major upgrade in the 1.x branch (#945) * Update dependency androidx.compose:compose-bom to v2024.09.01 (#947) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update opentelemetry-java monorepo (#939) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency io.zipkin.reporter2:zipkin-sender-okhttp3 to v3.4.1 (#949) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update gradle/actions action to v4.1.0 (#953) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.google.errorprone:error_prone_core to v2.32.0 (#951) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.uber.nullaway:nullaway to v0.11.3 (#955) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix maven central link (#963) * fix maven central link * switch to other form in hopes of fixing the weird link checker problem. * try again * try again * try again * markdown is hard * fix typo * re-center * undo re-center * ignore mvnrepository which is returning 403 today * Update dependency com.android.tools.build:gradle to v8.6.1 (#957) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency androidx.compose:compose-bom to v2024.09.02 * Update dependency androidx.compose:compose-bom to v2024.09.02 (#959) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.6 (#960) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency androidx.webkit:webkit to v1.12.0 (#961) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency androidx.compose:compose-bom to v2024.09.02 --------- Co-authored-by: jason plumb <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <[email protected]>
signalfx · Sep 19, 2024 · f122b76 · f122b76
1 parent 3f0a7a8
commit f122b76
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 23 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -3,6 +3,7 @@
   "extends": [
     "config:base"
   ],
+  "baseBranches": ["main", "v1.7.x"],
   "packageRules": [
     {
       "matchPackageNames": [
@@ -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.

diff --git a/.lycheeignore b/.lycheeignore
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.

diff --git a/README.md b/README.md
@@ -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]
 
 ---
 
@@ -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
diff --git a/gradle.properties b/gradle.properties
@@ -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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -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]
@@ -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"