Dependency updates for v2026.4

.circleci/config.yml

@@ -7,19 +7,19 @@ references:
   android_config_small: &android_config_small
     working_directory: ~/work
     docker:
-      - image: cimg/android:2026.02
+      - image: cimg/android:2026.07
     resource_class: small
 
   android_config: &android_config
     working_directory: ~/work
     docker:
-      - image: cimg/android:2026.02
+      - image: cimg/android:2026.07
     resource_class: large
 
   android_config_large: &android_config_large
     working_directory: ~/work
     docker:
-      - image: cimg/android:2026.02
+      - image: cimg/android:2026.07
     resource_class: xlarge
 
   gcloud_config: &gcloud_config

.editorconfig

@@ -28,5 +28,7 @@ ktlint_standard_binary-expression-wrapping = disabled
 ktlint_standard_condition-wrapping = disabled
 ktlint_standard_function-literal = disabled
 ktlint_standard_backing-property-naming = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
+ktlint_standard_when-entry-bracing = disabled
 ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_standard_no-unused-imports=enabled

.gitignore

@@ -54,3 +54,6 @@ robolectric-deps/
 
 .local-m2
 apks
+
+# Empty side effect of writing dependency locks
+settings-gradle.lockfile

analytics/build.gradle.kts

@@ -29,7 +29,6 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlinStdlib)
     implementation(libs.androidxCoreKtx)
     implementation(libs.firebaseCrashlytics)
     implementation(libs.firebaseAnalytics)

androidshared/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.kotlinKsp)
     alias(libs.plugins.composeCompiler)
 }
 
@@ -45,7 +44,6 @@ dependencies {
     implementation(project(":strings"))
     implementation(project(":shared"))
     implementation(project(":async"))
-    implementation(libs.kotlinStdlib)
     implementation(libs.androidxCoreKtx)
     implementation(libs.androidxLifecycleLivedataKtx)
     implementation(libs.androidMaterial)

androidshared/src/main/java/org/odk/collect/androidshared/system/BundleExt.kt

@@ -6,4 +6,4 @@ import androidx.core.os.BundleCompat
 
 inline fun <reified T : Parcelable> Bundle.getParcelableCompat(name: String): T? {
     return BundleCompat.getParcelable(this, name, T::class.java)
-}
+}

androidshared/src/main/java/org/odk/collect/androidshared/system/TamperDetector.kt

@@ -29,4 +29,4 @@ object TamperDetector {
             return false
         }
     }
-}
+}

androidshared/src/main/java/org/odk/collect/androidshared/ui/EdgeToEdge.kt

@@ -60,7 +60,7 @@ object EdgeToEdge {
                     0
                 }
 
-                view.translationY  = -maxOf(windowInsets.keyboardSafeOffset(), anchorOffset).toFloat()
+                view.translationY = -maxOf(windowInsets.keyboardSafeOffset(), anchorOffset).toFloat()
             }
             windowInsets
         }

androidshared/src/main/java/org/odk/collect/androidshared/ui/compose/Margins.kt

@@ -18,4 +18,4 @@ fun marginSmall(): Dp {
 @Composable
 fun marginExtraSmall(): Dp {
     return dimensionResource(id = dimen.margin_extra_small)
-}
+}

androidtest/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
     implementation(libs.androidxTestEspressoIntents)
     implementation(libs.timber)
     implementation(libs.kotlinxCoroutinesTest)
-    var composeBom = platform(libs.androidxComposeBom)
+    val composeBom = platform(libs.androidxComposeBom)
     implementation(composeBom)
     implementation(libs.androidXComposeUiTestJunit4)
 

async/build.gradle.kts

@@ -32,8 +32,6 @@ android {
 dependencies {
     coreLibraryDesugaring(libs.desugar)
 
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    implementation(libs.kotlinStdlib)
     implementation(libs.androidxCoreKtx)
     implementation(libs.kotlinxCoroutinesAndroid)
     implementation(libs.androidxWorkRuntime)

async/src/main/java/org/odk/collect/async/SchedulerBuilder.kt

@@ -92,7 +92,6 @@ object SchedulerBuilder {
             override fun <T> flowOnBackground(flow: Flow<T>): Flow<T> {
                 return taskRunner.flowOnBackground(flow)
             }
-
         }
     }
 }

async/src/test/resources/robolectric.properties

@@ -0,0 +1 @@
+sdk=33

audio-clips/build.gradle.kts

@@ -30,11 +30,9 @@ android {
 dependencies {
     coreLibraryDesugaring(libs.desugar)
 
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(project(":androidshared"))
     implementation(project(":async"))
     implementation(libs.androidxActivity)
-    implementation(libs.kotlinStdlib)
     implementation(libs.androidxCoreKtx)
     implementation(libs.androidxLifecycleViewmodelKtx)
     implementation(libs.androidxLifecycleLivedataKtx)

audio-recorder/build.gradle.kts

@@ -35,12 +35,10 @@ android {
 dependencies {
     coreLibraryDesugaring(libs.desugar)
 
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(project(":icons"))
     implementation(project(":strings"))
     implementation(project(":async"))
     implementation(project(":androidshared"))
-    implementation(libs.kotlinStdlib)
     implementation(libs.androidxCoreKtx)
     implementation(libs.androidxAppcompat)
     implementation(libs.androidxLifecycleLivedataKtx)

audio-recorder/src/main/java/org/odk/collect/audiorecorder/DaggerSetup.kt

@@ -6,11 +6,8 @@ import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.Dispatchers
 import org.odk.collect.androidshared.utils.UniqueIdGenerator
-import org.odk.collect.async.coroutines.CoroutineTaskRunner
 import org.odk.collect.async.Scheduler
-import org.odk.collect.async.SchedulerBuilder
 import org.odk.collect.audiorecorder.mediarecorder.AACRecordingResource
 import org.odk.collect.audiorecorder.mediarecorder.AMRRecordingResource
 import org.odk.collect.audiorecorder.recorder.Output

build.gradle.kts

@@ -0,0 +1,120 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+apply(from = "secrets.gradle")
+
+@Suppress("UNCHECKED_CAST")
+fun getSecrets(): java.util.Properties =
+    (extra["getSecrets"] as groovy.lang.Closure<*>).call() as java.util.Properties
+
+buildscript {
+    repositories {
+        google()
+
+        mavenCentral()
+        maven {
+            url = uri("https://plugins.gradle.org/m2/")
+        }
+    }
+
+    dependencies {
+        classpath(libs.gradle)
+        classpath(libs.googleServices)
+        classpath(libs.firebaseCrashlyticsGradle)
+        classpath(libs.kotlinGradlePlugin)
+        classpath(libs.ktlintGradle)
+        classpath(libs.gradleVersionsPlugin)
+        classpath(libs.navigationSafeArgsGradlePlugin)
+        classpath(libs.ossLicensesPlugin)
+    }
+}
+
+allprojects {
+    repositories {
+        maven {
+            url = uri("$rootDir/.local-m2/")
+            metadataSources {
+                mavenPom()
+                artifact() // Supports artifact only dependencies like those from medicmobile repo
+            }
+        }
+
+        // Needs to go first to get specialty libraries https://stackoverflow.com/a/48438866/137744
+        google()
+
+        mavenLocal() // Only used for javarosa_local dependency
+        mavenCentral()
+
+        maven { url = uri("https://central.sonatype.com/repository/maven-snapshots") }
+        maven { url = uri("https://jitpack.io") }
+        maven {
+            url = uri("https://staging.dev.medicmobile.org/_couch/maven-repo")
+            metadataSources { artifact() }
+        }
+
+        maven {
+            url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+            authentication {
+                create<BasicAuthentication>("basic")
+            }
+            credentials {
+                username = "mapbox"
+                password = getSecrets().getProperty("MAPBOX_DOWNLOADS_TOKEN", "")
+            }
+        }
+    }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            freeCompilerArgs.set(listOf("-Xjvm-default=all"))
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+}
+
+apply(from = "config/dependency_updates.gradle")
+
+tasks.register<GradleBuild>("checkCode") {
+    tasks = listOf("pmd", "ktlintCheck", "checkstyle", "lintDebug")
+}
+
+// Create local Maven repo from cached Gradle dependencies
+tasks.register<Sync>("cacheToMavenLocal") {
+    from(File(gradle.gradleUserHomeDir, "caches/modules-2/files-2.1"))
+    into("$rootDir/.local-m2")
+
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
+    // Convert from Gradle cache to Maven format
+    eachFile {
+        val parts = path.split("/")
+        path = parts[0].replace(".", "/") +
+            "/" + parts[1] +
+            "/" + parts[2] +
+            "/" + parts[4]
+    }
+
+    includeEmptyDirs = false
+}
+
+tasks.register<Exec>("testLab") {
+    dependsOn("collect_app:assembleDebug", "collect_app:assembleDebugAndroidTest")
+
+    executable = "gcloud"
+    args = listOf(
+        "beta", "firebase", "test", "android", "run",
+        "--type", "instrumentation",
+        "--num-uniform-shards=25",
+        "--app", "collect_app/build/outputs/apk/debug/ODK-Collect-debug.apk",
+        "--test", "collect_app/build/outputs/apk/androidTest/debug/ODK-Collect-debug-androidTest.apk",
+        "--device", "model=MediumPhone.arm,version=34,locale=en,orientation=portrait",
+        "--timeout", "15m",
+        "--directories-to-pull", "/sdcard",
+        "--test-targets", "notPackage org.odk.collect.android.regression",
+        "--test-targets", "notPackage org.odk.collect.android.benchmark"
+    )
+}
+
+tasks.register("releaseCheck") {
+    dependsOn("testLab", "collect_app:assembleOdkCollectRelease")
+}