Merge pull request #1506 from dimagi/masterToFormplayer2.60

Master to formplayer (2.61)

Author: dannyroberts

.github/dependabot.yml

@@ -6,3 +6,12 @@ updates:
       interval: daily
     labels:
       - dependencies
+
+  # Copy of above config for formplayer
+  - package-ecosystem: gradle
+    directory: "/"
+    target-branch: "formplayer"
+    schedule:
+      interval: daily
+    labels:
+      - dependencies

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       JAVA_VERSION: '17'
-      JOB_GRADLE_VERSION: 7.3
+      JOB_GRADLE_VERSION: 8.1
       FORMPLAYER_GRADLE_VERSION: 8.1
       FORMPLAYER_JAVA_VERSION: '17'
     steps:

build.gradle

@@ -14,6 +14,7 @@ plugins {
 
 // Needed even though it looks unused
 sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 configurations {
     ccapi.extendsFrom(ccapiImplementation)
@@ -74,7 +75,7 @@ dependencies {
     implementation 'commons-cli:commons-cli:1.3.1'
     implementation 'joda-time:joda-time:2.12.1'
     implementation 'com.carrotsearch:hppc:0.9.1'
-    api 'com.squareup.retrofit2:retrofit:2.3.0'
+    api 'com.squareup.retrofit2:retrofit:2.9.0'
     api 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
@@ -88,7 +89,7 @@ dependencies {
     cliImplementation 'commons-cli:commons-cli:1.3.1'
     cliImplementation 'joda-time:joda-time:2.9.4'
     cliImplementation 'io.reactivex.rxjava2:rxjava:2.1.1'
-    cliImplementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    cliImplementation 'com.squareup.retrofit2:retrofit:2.9.0'
     cliImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
     cliImplementation 'com.google.guava:guava:31.1-jre'
     cliImplementation 'com.datadoghq:dd-trace-api:1.10.0'
@@ -101,7 +102,7 @@ dependencies {
     testImplementation 'org.json:json:20250517'
     testImplementation 'org.xerial:sqlite-jdbc:3.40.0.0'
     testImplementation 'joda-time:joda-time:2.9.4'
-    testImplementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    testImplementation 'com.squareup.retrofit2:retrofit:2.9.0'
     testImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
     testImplementation 'com.google.guava:guava:31.1-jre'
 
@@ -112,7 +113,7 @@ dependencies {
     ccapiImplementation 'joda-time:joda-time:2.9.4'
     ccapiImplementation 'com.carrotsearch:hppc:0.9.1'
     ccapiImplementation 'io.reactivex.rxjava2:rxjava:2.1.1'
-    ccapiImplementation "com.squareup.retrofit2:retrofit:2.3.0"
+    ccapiImplementation "com.squareup.retrofit2:retrofit:2.9.0"
     ccapiImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
     ccapiImplementation 'com.google.guava:guava:31.1-jre'
     ccapiImplementation 'io.opentracing:opentracing-api:0.33.0'
@@ -126,7 +127,7 @@ dependencies {
     translateImplementation 'joda-time:joda-time:2.9.4'
     translateImplementation 'org.json:json:20250517'
     translateImplementation 'io.reactivex.rxjava2:rxjava:2.1.1'
-    translateImplementation "com.squareup.retrofit2:retrofit:2.3.0"
+    translateImplementation "com.squareup.retrofit2:retrofit:2.9.0"
     translateImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
     translateImplementation 'com.google.guava:guava:31.1-jre'
 

src/cli/java/org/commcare/util/cli/CliMain.java

@@ -61,7 +61,13 @@ public static void main(String[] args) {
             return;
         }
 
-        cliCommand.handle();
+        try {
+            cliCommand.handle();
+        } catch (Exception e) {
+            System.err.println("\nCommand failed with error:");
+            e.printStackTrace();
+            System.exit(-1);
+        }
     }
 
     private static CliCommand getCliCommand(String commandName) throws CliCommandNotFound {

src/cli/java/org/commcare/util/screen/EntityScreen.java

@@ -188,6 +188,7 @@ public boolean initReferences(SessionWrapper session) throws CommCareSessionExce
                 }
             }
         }
+
         initialized = true;
         return true;
     }

src/cli/java/org/commcare/util/screen/EntityScreenHelper.java

@@ -1,11 +1,9 @@
 package org.commcare.util.screen;
 
-import org.commcare.cases.entity.AsyncEntity;
 import org.commcare.cases.entity.AsyncNodeEntityFactory;
 import org.commcare.cases.entity.Entity;
 import org.commcare.cases.entity.EntitySortNotificationInterface;
 import org.commcare.cases.entity.EntitySorter;
-import org.commcare.cases.entity.EntityStorageCache;
 import org.commcare.cases.entity.EntityStringFilterer;
 import org.commcare.cases.entity.NodeEntityFactory;
 import org.commcare.suite.model.Detail;
@@ -16,7 +14,6 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
@@ -38,7 +35,7 @@ public static List<Entity<TreeReference>> initEntities(EvaluationContext context
             EntityScreenContext entityScreenContext, TreeReference[] entitiesRefs) {
         NodeEntityFactory nodeEntityFactory;
         if (detail.isLazyLoading()) {
-            nodeEntityFactory = new AsyncNodeEntityFactory(detail, context, null);
+            nodeEntityFactory = new AsyncNodeEntityFactory(detail, context, null, false);
         } else {
             nodeEntityFactory = new NodeEntityFactory(detail, context);
         }