From 016941cda5d3b6a488369cd7eb873b7fa0fdc470 Mon Sep 17 00:00:00 2001
From: Jamie Lynch <fractalwrench@gmail.com>
Date: Wed, 16 Oct 2024 17:15:36 +0100
Subject: [PATCH] build: misc gradle script fixes

---
 embrace-android-sdk/build.gradle.kts | 6 +++---
 embrace-test-fakes/build.gradle.kts  | 2 +-
 gradle/libs.versions.toml            | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/embrace-android-sdk/build.gradle.kts b/embrace-android-sdk/build.gradle.kts
index a8c6db134d..408b04d073 100644
--- a/embrace-android-sdk/build.gradle.kts
+++ b/embrace-android-sdk/build.gradle.kts
@@ -30,8 +30,8 @@ android {
             path = file("CMakeLists.txt")
         }
     }
-    packagingOptions {
-        pickFirst("**/*.so")
+    packaging {
+        jniLibs.pickFirsts.add("**/*.so")
     }
     buildFeatures {
         buildConfig = true
@@ -39,7 +39,7 @@ android {
 }
 
 // include these projects in code coverage
-rootProject.childProjects.forEach { key, proj ->
+rootProject.childProjects.forEach { (_, proj) ->
     if (proj.plugins.hasPlugin("embrace-prod-defaults")) {
         dependencies.add("kover", proj)
     }
diff --git a/embrace-test-fakes/build.gradle.kts b/embrace-test-fakes/build.gradle.kts
index 38abc50b76..d86a464cab 100644
--- a/embrace-test-fakes/build.gradle.kts
+++ b/embrace-test-fakes/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     compileOnly(libs.opentelemetry.semconv.incubating)
 
     implementation(libs.junit)
-    implementation("org.robolectric:robolectric:${Versions.ROBOLECTRIC}")
+    implementation(libs.robolectric)
     implementation(libs.lifecycle.common.java8)
     implementation(libs.lifecycle.process)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a4d6d16ed..a2f47e779c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 
-detektGradlePlugin = "1.23.6"
+detektGradlePlugin = "1.23.7"
 junit = "4.13.2"
 kotlinExposed = "1.8.22"
 dokka = "1.9.20"
@@ -15,6 +15,7 @@ profileinstaller = "1.3.1"
 okhttp = "4.12.0"
 firebase = "23.1.0"
 compose = "1.0.5"
+robolectric = "4.12.1"
 
 [libraries]
 detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektGradlePlugin" }
@@ -43,5 +44,6 @@ okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhtt
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging", version.ref = "firebase" }
 compose = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
 
 [plugins]