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

Merge v1.7.x #1093

Merged
merged 84 commits into from
Dec 2, 2024
Merged

Merge v1.7.x #1093

merged 84 commits into from
Dec 2, 2024

Conversation

breedx-splk
Copy link
Contributor

This branch was originally intended to be the long-term release branch for the 1.7.x patch series, while 2.x would migrate to main. For now, however, we will continue cutting minor releases from the main branch.

This PR merges the (somewhat longer lived) v1.7.x branch into main so that we can release v.1.8.0 from main.

renovate bot and others added 30 commits September 4, 2024 14:14
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…928)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…933)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…#950)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…952)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
#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]>
…#967)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot and others added 21 commits November 6, 2024 13:22
* Update dependency androidx.work:work-runtime to v2.10.0

* update compileSdk

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jason Plumb <[email protected]>
* Update dependency androidx.core:core to v1.15.0

* update compileSdk

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jason Plumb <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…1072)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* fix: multiple server-tracing headers aren't handled

* PR feedback

(cherry picked from commit 4b3501d)

Co-authored-by: Jakub Malinowski <[email protected]>
* updated names

* using service. prefix

(cherry picked from commit f0b9a7e)

Co-authored-by: tonzhan2 <[email protected]>
* fix warnings in test code

* make test framework/platform dependency explicit for future gradle compatibility https://docs.gradle.org/8.10.2/userguide/upgrading_version_8.html#test_framework_implementation_dependencies

(cherry picked from commit 1c0ceb8)
…er to v1.11.3 (#1092)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@breedx-splk breedx-splk requested review from a team as code owners December 2, 2024 23:34
@breedx-splk breedx-splk merged commit 77fe529 into main Dec 2, 2024
4 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Dec 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants