Upgrade gradle version (#300)

* Upgrading to gradle 8.4

* Bumping up gradle env

* Using MaxMetaspaceSize

* Enabling desugaring

* Using new env var mocking lib

* Adding buildconfg fields for tests

* Updating tests

* Using Java 17

Author: LikeTheSalad

.java-version

@@ -1 +1 @@
-11
+17

android-test/app/build.gradle

@@ -35,6 +35,9 @@ android {
 
         testInstrumentationRunner "co.elastic.apm.android.test.base.TestRunner"
     }
+    buildFeatures {
+        buildConfig = true
+    }
 
     buildTypes {
         release {
@@ -45,6 +48,7 @@ android {
     compileOptions {
         sourceCompatibility jvmCompatibility
         targetCompatibility jvmCompatibility
+        coreLibraryDesugaringEnabled true
     }
     kotlinOptions {
         jvmTarget = jvmCompatibility.toString()
@@ -63,6 +67,7 @@ dependencies {
     implementation "androidx.test.espresso:espresso-idling-resource:$espresso_version"
     implementation project(':android-test-common')
     implementation "androidx.fragment:fragment-testing:1.6.1"
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
     testImplementation "io.opentelemetry:opentelemetry-exporter-otlp:1.28.0"
     testImplementation "org.mockito:mockito-core:$mockito_version"
     testImplementation "org.mockito:mockito-inline:$mockito_version"
@@ -74,18 +79,4 @@ 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")
-            }
-        }
-    }
 }

android-test/app/src/test/java/co/elastic/apm/android/test/attributes/logs/ResourcesTest.java

@@ -71,7 +71,7 @@ public void whenALogIsCreated_osDescriptionIsSet() {
         LogRecordData log = captureLog();
 
         Logs.verifyRecord(log)
-                .hasResource("os.description", "Android 13, API level 33, BUILD unknown");
+                .hasResource("os.description", "Android 14, API level 34, BUILD unknown");
     }
 
     @Test
@@ -87,7 +87,7 @@ public void whenALogIsCreated_osVersionSet() {
         LogRecordData log = captureLog();
 
         Logs.verifyRecord(log)
-                .hasResource("os.version", "13");
+                .hasResource("os.version", "14");
     }
 
     @Test

android-test/app/src/test/java/co/elastic/apm/android/test/attributes/metrics/ResourcesTest.java

@@ -71,7 +71,7 @@ public void whenAMetricIsCreated_osDescriptionIsSet() {
         MetricData metric = captureMetric();
 
         Metrics.verify(metric)
-                .hasResource("os.description", "Android 13, API level 33, BUILD unknown");
+                .hasResource("os.description", "Android 14, API level 34, BUILD unknown");
     }
 
     @Test
@@ -87,7 +87,7 @@ public void whenAMetricIsCreated_osVersionSet() {
         MetricData metric = captureMetric();
 
         Metrics.verify(metric)
-                .hasResource("os.version", "13");
+                .hasResource("os.version", "14");
     }
 
     @Test

android-test/app/src/test/java/co/elastic/apm/android/test/attributes/traces/ResourcesTest.java

@@ -73,7 +73,7 @@ public void whenASpanIsCreated_osDescriptionIsSet() {
         SpanData customSpan = captureSpan();
 
         Spans.verify(customSpan)
-                .hasResource("os.description", "Android 13, API level 33, BUILD unknown");
+                .hasResource("os.description", "Android 14, API level 34, BUILD unknown");
     }
 
     @Test
@@ -89,7 +89,7 @@ public void whenASpanIsCreated_osVersionSet() {
         SpanData customSpan = captureSpan();
 
         Spans.verify(customSpan)
-                .hasResource("os.version", "13");
+                .hasResource("os.version", "14");
     }
 
     @Test

android-test/build.gradle

@@ -5,13 +5,13 @@ propertiesFile.withInputStream {
 }
 
 ext {
-    jvmCompatibility = JavaVersion.VERSION_11
+    jvmCompatibility = JavaVersion.VERSION_17
     junit_version = '4.13.2'
     espresso_version = '3.5.1'
     mockito_version = '4.9.0'
-    agp_version = '7.4.0'
+    agp_version = '8.3.0'
     mockwebserver_version = '4.10.0'
-    androidCompileSdk = 33
+    androidCompileSdk = 34
     androidMinSdk = 26
     agent_version = agentProperties["version"]
 }

android-test/gradle.properties

@@ -1,5 +1,5 @@
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useAndroidX=true

android-test/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android-test/plugin-test/build.gradle

@@ -11,5 +11,5 @@ dependencies {
     implementation "co.elastic.apm:android-plugin:$agent_version"
     testImplementation "co.elastic.apm:android-common:$agent_version"
     testImplementation "junit:junit:$junit_version"
-    testImplementation "com.github.stefanbirkner:system-rules:1.19.0"
+    testImplementation "uk.org.webcompere:system-stubs-junit4:2.1.6"
 }

android-test/plugin-test/src/test/java/co/elastic/apm/android/plugin/CompilationConfigTest.java

@@ -24,18 +24,18 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
 import java.util.Properties;
 
 import co.elastic.apm.android.common.ApmInfo;
+import uk.org.webcompere.systemstubs.rules.EnvironmentVariablesRule;
 
 public class CompilationConfigTest extends BaseAssetsVerificationTest {
 
     @Rule
-    public EnvironmentVariables environmentVariables = new EnvironmentVariables();
+    public EnvironmentVariablesRule environmentVariables = new EnvironmentVariablesRule();
 
     @Rule
     public TemporaryFolder projectTemporaryFolder = new TemporaryFolder();