Remove compilesdk validation (#292)

* Removing androidx libs version constraints * Updating tests * Updating sample app compileSdk version * Updating notice files * Updated the changelog
elastic · Apr 3, 2024 · 05abcf8 · 05abcf8
1 parent 561606a
commit 05abcf8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git 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]]

diff --git 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/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")
-            }
-        }
-    }
 }
diff --git a/android-sdk/metadata/notice.properties b/android-sdk/metadata/notice.properties
@@ -1 +1 @@
-dependencies.hash=F58F6A39BDAD2A7E96BD4C0924CF4A0C
+dependencies.hash=77B4570CA3D2C0BA9C3541561D0679C0
diff --git 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)

diff --git a/android-test/app/build.gradle b/android-test/app/build.gradle
@@ -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")
+            }
+        }
+    }
 }
diff --git a/...plugin-test/src/test/java/co/elastic/apm/android/plugin/testutils/BaseFunctionalTest.java b/...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() {

diff --git 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"