From f395c9204212f252c2bb15aac762ec581a464322 Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Wed, 3 Apr 2024 13:56:34 +0200 Subject: [PATCH 1/5] Removing androidx libs version constraints --- android-sdk/build.gradle | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle index 980a6e8f..16638418 100644 --- a/android-sdk/build.gradle +++ b/android-sdk/build.gradle @@ -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") - } - } - } } \ No newline at end of file From 57f5c30e7e6f38137e4350438917c7d1a7aa058a Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:26:05 +0200 Subject: [PATCH 2/5] Updating tests --- android-test/app/build.gradle | 16 +++++++++++++++- .../plugin/testutils/BaseFunctionalTest.java | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/android-test/app/build.gradle b/android-test/app/build.gradle index 6235701c..d75a3d8f 100644 --- a/android-test/app/build.gradle +++ b/android-test/app/build.gradle @@ -66,7 +66,7 @@ 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' @@ -74,4 +74,18 @@ dependencies { 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") + } + } + } } \ No newline at end of file diff --git a/android-test/plugin-test/src/test/java/co/elastic/apm/android/plugin/testutils/BaseFunctionalTest.java b/android-test/plugin-test/src/test/java/co/elastic/apm/android/plugin/testutils/BaseFunctionalTest.java index 889d2b6b..d157450e 100644 --- a/android-test/plugin-test/src/test/java/co/elastic/apm/android/plugin/testutils/BaseFunctionalTest.java +++ b/android-test/plugin-test/src/test/java/co/elastic/apm/android/plugin/testutils/BaseFunctionalTest.java @@ -134,7 +134,7 @@ private void ensureExistingParentDir(File file) { } protected int getAndroidCompileSdk() { - return 33; + return 34; } protected String getAndroidAppId() { From 9da7acfe1bbfcd159240243ec36aebe828d9aa6d Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:35:47 +0200 Subject: [PATCH 3/5] Updating sample app compileSdk version --- sample-app/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample-app/app/build.gradle b/sample-app/app/build.gradle index 36c6b5ce..4a58bc1d 100644 --- a/sample-app/app/build.gradle +++ b/sample-app/app/build.gradle @@ -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" From fa57df3c9e01f12489373fcf7be71e6e1b56f30b Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:41:24 +0200 Subject: [PATCH 4/5] Updating notice files --- NOTICE | 2 +- android-sdk/metadata/notice.properties | 2 +- android-sdk/src/main/resources/META-INF/NOTICE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index b2ad1a5a..30e23e8f 100644 --- a/NOTICE +++ b/NOTICE @@ -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 diff --git a/android-sdk/metadata/notice.properties b/android-sdk/metadata/notice.properties index dcdfbcf8..9d03c8a0 100644 --- a/android-sdk/metadata/notice.properties +++ b/android-sdk/metadata/notice.properties @@ -1 +1 @@ -dependencies.hash=F58F6A39BDAD2A7E96BD4C0924CF4A0C \ No newline at end of file +dependencies.hash=77B4570CA3D2C0BA9C3541561D0679C0 \ No newline at end of file diff --git a/android-sdk/src/main/resources/META-INF/NOTICE b/android-sdk/src/main/resources/META-INF/NOTICE index da7fd8f2..c52ac542 100644 --- a/android-sdk/src/main/resources/META-INF/NOTICE +++ b/android-sdk/src/main/resources/META-INF/NOTICE @@ -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) From 87bc99c68bfbff2fa117f836d9d0b25f94098ac8 Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:47:29 +0200 Subject: [PATCH 5/5] Updated the changelog --- CHANGELOG.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index eeab6d4f..46a6576b 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -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]]