From ebda935200b5a963a3386cea85da28df200c7969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= Date: Wed, 5 Jul 2023 09:21:19 -0700 Subject: [PATCH 1/2] Set JR version to 4.2.0 --- buildSrc/src/main/java/dependencies/Dependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/dependencies/Dependencies.kt b/buildSrc/src/main/java/dependencies/Dependencies.kt index 680b88b2a29..282a4819c68 100644 --- a/buildSrc/src/main/java/dependencies/Dependencies.kt +++ b/buildSrc/src/main/java/dependencies/Dependencies.kt @@ -43,7 +43,7 @@ object Dependencies { const val rarepebble_colorpicker = "com.github.martin-stone:hsv-alpha-color-picker-android:3.0.1" const val commons_io = "commons-io:commons-io:2.5" // Commons 2.6+ introduce java.nio usage that we can't access until our minSdkVersion >= 26 (https://developer.android.com/reference/java/io/File#toPath()) const val opencsv = "com.opencsv:opencsv:5.7.1" - const val javarosa = "org.getodk:javarosa:4.2.0-SNAPSHOT" + const val javarosa = "org.getodk:javarosa:4.2.0" const val javarosa_local = "org.getodk:javarosa:local" const val karumi_dexter = "com.karumi:dexter:6.2.3" const val zxing_android_embedded = "com.journeyapps:zxing-android-embedded:4.3.0" From d528a1f8ee066b24931c0491b18bc7c9fda2e067 Mon Sep 17 00:00:00 2001 From: Callum Stott Date: Wed, 5 Jul 2023 19:03:09 +0100 Subject: [PATCH 2/2] Include Dependencies and Versions in cache key --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2694bd8a01..d63253d629c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: - checkout - run: name: Generate combined build.gradle file for cache key - command: cat build.gradle */build.gradle .circleci/gradle.properties .circleci/config.yml > deps.txt + command: cat build.gradle */build.gradle .circleci/gradle.properties .circleci/config.yml buildSrc/src/main/java/dependencies/Dependencies.kt buildSrc/src/main/java/dependencies/Versions.kt > deps.txt - restore_cache: keys: - compile-deps-{{ checksum "deps.txt" }}