Revert to ubuntu and enable config cache

.github/workflows/build.yml

@@ -12,7 +12,7 @@ concurrency:
 jobs:
   build:
     name: Build Job ubuntu-latest - Java 17
-    runs-on: macos-15
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Repo

.github/workflows/codeql-analysis.yml

@@ -16,7 +16,7 @@ concurrency:
 jobs:
   analyze:
     name: Analyze
-    runs-on: macos-15
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false

.github/workflows/integration-tests-benchmarks.yml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   test:
     name: Benchmarks
-    runs-on: macos-15
+    runs-on: ubuntu-latest
 
     # we copy the secret to the env variable in order to access it in the workflow
     env:
@@ -67,7 +67,7 @@ jobs:
           config-file: .sauce/sentry-uitest-android-benchmark-lite.yml
 
   app-metrics:
-    runs-on: macos-15
+    runs-on: ubuntu-latest
 
     # we copy the secret to the env variable in order to access it in the workflow
     env:

.github/workflows/integration-tests-ui-critical.yml

@@ -20,7 +20,7 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: macos-15
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -49,7 +49,7 @@ jobs:
   run-maestro-tests:
     name: Run Tests for API Level ${{ matrix.api-level }}
     needs: build
-    runs-on: macos-15
+    runs-on: ubuntu-latest
     strategy:
       # we want that the matrix keeps running, default is to cancel them if it fails.
       fail-fast: false

.github/workflows/integration-tests-ui.yml

@@ -12,7 +12,7 @@ concurrency:
 jobs:
   test:
     name: Ui tests
-    runs-on: macos-15
+    runs-on: ubuntu-latest
 
     # we copy the secret to the env variable in order to access it in the workflow
     env:

.github/workflows/release-build.yml

@@ -11,7 +11,7 @@ concurrency:
 jobs:
   release:
     name: Build release artifacts
-    runs-on: macos-15
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Repo

Makefile

@@ -8,7 +8,7 @@ publish: clean dryRelease
 
 # deep clean
 clean:
-	./gradlew clean
+	./gradlew clean --no-configuration-cache
 	rm -rf distributions
 
 # build and run tests
@@ -20,7 +20,7 @@ javadocs:
 
 # do a dry release (like a local deploy)
 dryRelease:
-	./gradlew aggregateJavadocs distZip --no-build-cache
+	./gradlew aggregateJavadocs distZip --no-build-cache --no-configuration-cache
 
 # check for dependencies update
 update:

build.gradle.kts

@@ -250,48 +250,46 @@ spotless {
     }
 }
 
-gradle.projectsEvaluated {
-    tasks.create("aggregateJavadocs", Javadoc::class.java) {
-        setDestinationDir(project.layout.buildDirectory.file("docs/javadoc").get().asFile)
-        title = "${project.name} $version API"
-        val opts = options as StandardJavadocDocletOptions
-        opts.quiet()
-        opts.encoding = "UTF-8"
-        opts.memberLevel = JavadocMemberLevel.PROTECTED
-        opts.stylesheetFile(file("$projectDir/docs/stylesheet.css"))
-        opts.links = listOf(
-            "https://docs.oracle.com/javase/8/docs/api/",
-            "https://docs.spring.io/spring-framework/docs/current/javadoc-api/",
-            "https://docs.spring.io/spring-boot/docs/current/api/"
-        )
-        subprojects
-            .filter { !it.name.contains("sample") && !it.name.contains("integration-tests") }
-            .forEach { proj ->
-                proj.tasks.withType<Javadoc>().forEach { javadocTask ->
-                    source += javadocTask.source
-                    classpath += javadocTask.classpath
-                    excludes += javadocTask.excludes
-                    includes += javadocTask.includes
-                }
+tasks.register("aggregateJavadocs", Javadoc::class.java) {
+    setDestinationDir(project.layout.buildDirectory.file("docs/javadoc").get().asFile)
+    title = "${project.name} $version API"
+    val opts = options as StandardJavadocDocletOptions
+    opts.quiet()
+    opts.encoding = "UTF-8"
+    opts.memberLevel = JavadocMemberLevel.PROTECTED
+    opts.stylesheetFile(file("$projectDir/docs/stylesheet.css"))
+    opts.links = listOf(
+        "https://docs.oracle.com/javase/8/docs/api/",
+        "https://docs.spring.io/spring-framework/docs/current/javadoc-api/",
+        "https://docs.spring.io/spring-boot/docs/current/api/"
+    )
+    subprojects
+        .filter { !it.name.contains("sample") && !it.name.contains("integration-tests") }
+        .forEach { proj ->
+            proj.tasks.withType<Javadoc>().forEach { javadocTask ->
+                source += javadocTask.source
+                classpath += javadocTask.classpath
+                excludes += javadocTask.excludes
+                includes += javadocTask.includes
             }
-    }
+        }
+}
 
-    tasks.create("buildForCodeQL") {
-        subprojects
-            .filter {
-                !it.displayName.contains("sample") &&
-                    !it.displayName.contains("integration-tests") &&
-                    !it.displayName.contains("bom") &&
-                    it.name != "sentry-opentelemetry"
-            }
-            .forEach { proj ->
-                if (proj.plugins.hasPlugin("com.android.library")) {
-                    this.dependsOn(proj.tasks.findByName("compileReleaseUnitTestSources"))
-                } else {
-                    this.dependsOn(proj.tasks.findByName("testClasses"))
-                }
+tasks.register("buildForCodeQL") {
+    subprojects
+        .filter {
+            !it.displayName.contains("sample") &&
+                !it.displayName.contains("integration-tests") &&
+                !it.displayName.contains("bom") &&
+                it.name != "sentry-opentelemetry"
+        }
+        .forEach { proj ->
+            if (proj.plugins.hasPlugin("com.android.library")) {
+                this.dependsOn(proj.tasks.findByName("compileReleaseUnitTestSources"))
+            } else {
+                this.dependsOn(proj.tasks.findByName("testClasses"))
             }
-    }
+        }
 }
 
 // Workaround for https://youtrack.jetbrains.com/issue/IDEA-316081/Gradle-8-toolchain-error-Toolchain-from-executable-property-does-not-match-toolchain-from-javaLauncher-property-when-different

gradle.properties

@@ -2,6 +2,8 @@
 org.gradle.jvmargs=-Xmx12g -XX:MaxMetaspaceSize=4g -XX:+CrashOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
 org.gradle.caching=true
 org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.configuration-cache=true
 
 # Daemons workers
 org.gradle.workers.max=2