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

Remove compilesdk validation #292

Merged
merged 5 commits into from
Apr 3, 2024
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
4 changes: 2 additions & 2 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ ${next_release_notes}
==== ${version} - ${release_date}

[float]
===== Features
===== Bug fixes

* New feature: {pull}000[#000]
* Removing strict version constraint that prevented enforcing compileSdk > 33: {pull}292[#292]
////

[[release-notes-0.15.0]]
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Copyright 2018-2022 Elasticsearch B.V.

This product includes software licensed under the 'Apache License Version 2.0' license from the following sources:

- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.1)
- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.2)
- Android Support Library Annotations (https://developer.android.com/jetpack/androidx/releases/annotation#1.4.0)
- Byte Buddy (without dependencies)
- Byte Buddy Gradle plugin
Expand Down
14 changes: 0 additions & 14 deletions android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,4 @@ dependencies {
compileOnly 'co.elastic.apm.compile:processor'
testImplementation libs.bundles.mocking
testImplementation libs.junit

// To avoid enforcing compileSdk > 33:
constraints {
add("implementation", "androidx.navigation:navigation-fragment") {
version {
strictly("2.6.0")
}
}
add("implementation", "androidx.core:core") {
version {
strictly("1.10.1")
}
}
}
}
2 changes: 1 addition & 1 deletion android-sdk/metadata/notice.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dependencies.hash=F58F6A39BDAD2A7E96BD4C0924CF4A0C
dependencies.hash=77B4570CA3D2C0BA9C3541561D0679C0
2 changes: 1 addition & 1 deletion android-sdk/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Copyright 2018-2022 Elasticsearch B.V.

This product includes software licensed under the 'Apache License Version 2.0' license from the following sources:

- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.1)
- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.2)
- com.github.instacart.truetime-android:library:3.5
- okhttp (https://square.github.io/okhttp/)
- OpenTelemetry Android (https://github.com/open-telemetry/opentelemetry-android)
Expand Down
16 changes: 15 additions & 1 deletion android-test/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,26 @@ dependencies {
testImplementation "io.opentelemetry:opentelemetry-exporter-otlp:1.28.0"
testImplementation "org.mockito:mockito-core:$mockito_version"
testImplementation "org.mockito:mockito-inline:$mockito_version"
testImplementation 'org.robolectric:robolectric:4.11.1'
testImplementation 'org.robolectric:robolectric:4.12.1'
testImplementation "com.squareup.okhttp3:mockwebserver:$mockwebserver_version"
androidTestImplementation "androidx.test:core:1.5.0"
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockwebserver_version"

// To avoid enforcing compileSdk > 33:
constraints {
add("implementation", "androidx.navigation:navigation-fragment") {
version {
strictly("2.6.0")
}
}
add("implementation", "androidx.core:core") {
version {
strictly("1.10.1")
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private void ensureExistingParentDir(File file) {
}

protected int getAndroidCompileSdk() {
return 33;
return 34;
}

protected String getAndroidAppId() {
Expand Down
4 changes: 2 additions & 2 deletions sample-app/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {

android {
namespace 'co.elastic.apm.android.sample'
compileSdk 33
compileSdk 34

defaultConfig {
applicationId "co.elastic.apm.android.sample"
minSdk 26
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"

Expand Down
Loading