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

Post 1.2.0 release changes #681

Merged
merged 4 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
### Unreleased

* tbd

## Version 1.2.0 - 2023-10-25

This is the first version of `splunk-otel-android` that is based on the upstream version of
`opentelemetry-android`. Please note that this requires an additional project dependency,
Expand Down
9 changes: 5 additions & 4 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ https://www.splunk.com/en_us/product-security/report.html).
This project relies on a variety of external dependencies.
These dependencies are monitored by
[Renovate](https://github.com/apps/renovate).
Renovate checks for Dependencies are [checked
daily](https://github.com/signalfx/splunk-otel-java/blob/main/.github/dependabot.yml)
and associated pull requests are opened automatically. Upgrading to the [latest
release](https://github.com/signalfx/splunk-otel-android/releases)
Renovate regularly checks for dependencies and updates
[the Dependency Dashboard](https://github.com/signalfx/splunk-otel-android/issues/667)
when newer versions are available. It also opens associated pull requests automatically.

Upgrading to the [latest release](https://github.com/signalfx/splunk-otel-android/releases)
is recommended to ensure you have the latest security updates. If a security
vulnerability is detected for a dependency of this project then either:

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ android.useAndroidX=true
# generate the BuildConfig class that contains the app version
android.defaults.buildfeatures.buildconfig=true

version=1.2.0
version=1.3.0
group=com.splunk
4 changes: 2 additions & 2 deletions sample-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ android {
}
}

val otelVersion = "1.31.0"
val otelVersion = "1.32.0-SNAPSHOT"
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

dependencies {
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion"))

implementation("io.opentelemetry.android:instrumentation:0.2.0-alpha")
implementation("io.opentelemetry.android:instrumentation:0.3.0-alpha-SNAPSHOT")
implementation("androidx.legacy:legacy-support-v4:1.0.0")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")

Expand Down
2 changes: 1 addition & 1 deletion splunk-otel-android-volley/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ android {
}
}

val otelVersion = "1.31.0"
val otelVersion = "1.32.0-SNAPSHOT"
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
val otelSemconvVersion = "1.21.0-alpha"

Expand Down
4 changes: 2 additions & 2 deletions splunk-otel-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ android {
}
}

val otelVersion = "1.31.0"
val otelVersion = "1.32.0-SNAPSHOT"
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
val otelSemconvVersion = "1.21.0-alpha"

dependencies {
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion"))
implementation("io.opentelemetry.android:instrumentation:0.2.0-alpha")
implementation("io.opentelemetry.android:instrumentation:0.3.0-alpha-SNAPSHOT")

implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.10"))
implementation("androidx.appcompat:appcompat:1.6.1")
Expand Down