[Code health] Upgrade ktfmt-gradle and apply latest ktfmt AS plugin t…

…o reduce formatting deltas between the two (#2456)

* Upgrade ktfmt Gradle plugin

* Format with ktfmt-gradle 0.18.0

* Format with AS ktfmt 1.1.0.49

* Format with ktfmt-gradle 0.18.0

* Format with AS ktfmt 1.1.0.49

* Format with ktfmt-gradle 0.18.0

* Format with AS ktfmt 1.1.0.49

* Format with ktfmt-gradle 0.18.0

---------

Co-authored-by: Shobhit Agarwal <ashobhit@google.com>

build.gradle

@@ -59,7 +59,7 @@ buildscript {
 plugins {
     id "org.jetbrains.kotlin.android" version "$kotlinVersion" apply false
     id "org.jetbrains.kotlin.plugin.serialization" version "$kotlinVersion"
-    id "com.ncorti.ktfmt.gradle" version "0.17.0"
+    id "com.ncorti.ktfmt.gradle" version "0.18.0"
     id "com.google.dagger.hilt.android" version "$hiltVersion" apply false
     id "io.gitlab.arturbosch.detekt" version "1.23.5"
 }

e2eTest/src/main/java/com/google/android/ground/e2etest/AutomatorRunner.kt

@@ -34,17 +34,14 @@ interface AutomatorRunner {
 
   fun stringResource(
     @StringRes resId: Int,
-    context: Context = InstrumentationRegistry.getInstrumentation().targetContext
+    context: Context = InstrumentationRegistry.getInstrumentation().targetContext,
   ): String = context.getString(resId)
 
   fun byText(@StringRes resId: Int): BySelector = By.text(stringResource(resId))
 
   fun <T : Any> byClass(kclass: KClass<T>): BySelector = By.clazz(kclass.java.name)
 
-  fun waitClickGone(
-    selector: BySelector,
-    timeout: Long = SHORT_TIMEOUT,
-  ): Boolean {
+  fun waitClickGone(selector: BySelector, timeout: Long = SHORT_TIMEOUT): Boolean {
     device.wait(Until.hasObject(selector), timeout)
     device.findObject(selector)?.click()
     return device.wait(Until.gone(selector), timeout)

ground/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt

@@ -41,7 +41,7 @@ class SetPreferencesRule : TestWatcher() {
     super.starting(description)
     EntryPointAccessors.fromApplication(
         getApplicationContext(),
-        SetPreferencesRuleEntryPoint::class.java
+        SetPreferencesRuleEntryPoint::class.java,
       )
       .preferenceStorage()
       .apply {

ground/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt

@@ -31,7 +31,7 @@ import javax.inject.Singleton
 @Module
 @TestInstallIn(
   components = [SingletonComponent::class],
-  replaces = [RemotePersistenceModule::class]
+  replaces = [RemotePersistenceModule::class],
 )
 abstract class TestRemoteStorageModule {
   @Binds

ground/src/main/java/com/google/android/ground/MainViewModel.kt

@@ -83,7 +83,7 @@ constructor(
           else -> null
         }
       },
-      { onUserSignInError(it) }
+      { onUserSignInError(it) },
     )
   }
 

ground/src/main/java/com/google/android/ground/domain/usecases/submission/SubmitDataUseCase.kt

@@ -33,7 +33,7 @@ class SubmitDataUseCase
 constructor(
   private val locationOfInterestRepository: LocationOfInterestRepository,
   private val submissionRepository: SubmissionRepository,
-  private val userRepository: UserRepository
+  private val userRepository: UserRepository,
 ) {
 
   /**

ground/src/main/java/com/google/android/ground/domain/usecases/survey/ActivateSurveyUseCase.kt

@@ -23,7 +23,7 @@ class ActivateSurveyUseCase
 @Inject
 constructor(
   private val surveyRepository: SurveyRepository,
-  private val makeSurveyAvailableOffline: MakeSurveyAvailableOfflineUseCase
+  private val makeSurveyAvailableOffline: MakeSurveyAvailableOfflineUseCase,
 ) {
   /**
    * Sets the survey with the specified ID as the currently active. First attempts to load the

ground/src/main/java/com/google/android/ground/domain/usecases/survey/MakeSurveyAvailableOfflineUseCase.kt

@@ -24,7 +24,7 @@ class MakeSurveyAvailableOfflineUseCase
 @Inject
 constructor(
   private val surveyRepository: SurveyRepository,
-  private val syncSurvey: SyncSurveyUseCase
+  private val syncSurvey: SyncSurveyUseCase,
 ) {
   /**
    * Makes the survey with the specified ID and related LOIs available offline. Subscribes to

ground/src/main/java/com/google/android/ground/domain/usecases/survey/ReactivateLastSurveyUseCase.kt

@@ -23,7 +23,7 @@ class ReactivateLastSurveyUseCase
 @Inject
 constructor(
   private val surveyRepository: SurveyRepository,
-  private val activateSurvey: ActivateSurveyUseCase
+  private val activateSurvey: ActivateSurveyUseCase,
 ) {
   suspend operator fun invoke() {
     // Do nothing if never activated.

ground/src/main/java/com/google/android/ground/domain/usecases/survey/SyncSurveyUseCase.kt

@@ -25,7 +25,7 @@ class SyncSurveyUseCase
 @Inject
 constructor(
   private val surveyRepository: SurveyRepository,
-  private val loiRepository: LocationOfInterestRepository
+  private val loiRepository: LocationOfInterestRepository,
 ) {
   /**
    * Downloads the survey with the specified ID and related LOIs from remote and inserts and/or

ground/src/main/java/com/google/android/ground/model/AuditInfo.kt

@@ -30,5 +30,5 @@ import java.util.Date
 data class AuditInfo(
   val user: User,
   val clientTimestamp: Date = Date(),
-  val serverTimestamp: Date? = null
+  val serverTimestamp: Date? = null,
 )

ground/src/main/java/com/google/android/ground/model/Survey.kt

@@ -26,7 +26,7 @@ data class Survey(
   val jobMap: Map<String, Job>,
   // TODO(#1730): Remove tileSources from survey.
   val tileSources: List<TileSource> = listOf(),
-  val acl: Map<String, String> = mapOf()
+  val acl: Map<String, String> = mapOf(),
 ) {
   val jobs: Collection<Job>
     get() = jobMap.values

ground/src/main/java/com/google/android/ground/model/SurveyListItem.kt

@@ -20,7 +20,7 @@ data class SurveyListItem(
   val id: String,
   val title: String,
   val description: String,
-  val availableOffline: Boolean
+  val availableOffline: Boolean,
 )
 
 fun Survey.toListItem(availableOffline: Boolean): SurveyListItem =

ground/src/main/java/com/google/android/ground/model/User.kt

@@ -22,5 +22,5 @@ constructor(
   val email: String,
   val displayName: String,
   val photoUrl: String? = null,
-  val isAnonymous: Boolean = false
+  val isAnonymous: Boolean = false,
 )

ground/src/main/java/com/google/android/ground/model/imagery/OfflineArea.kt

@@ -25,7 +25,7 @@ data class OfflineArea(
   val bounds: Bounds,
   val name: String,
   /** The range of zoom levels downloaded. */
-  val zoomRange: IntRange
+  val zoomRange: IntRange,
 ) {
   val tiles
     get() = zoomRange.flatMap { TileCoordinates.withinBounds(bounds, it) }
@@ -34,6 +34,6 @@ data class OfflineArea(
     PENDING,
     IN_PROGRESS,
     DOWNLOADED,
-    FAILED
+    FAILED,
   }
 }

ground/src/main/java/com/google/android/ground/model/job/Job.kt

@@ -24,13 +24,13 @@ data class Job(
   val style: Style? = null,
   val name: String? = null,
   val tasks: Map<String, Task> = mapOf(),
-  val strategy: DataCollectionStrategy = DataCollectionStrategy.UNKNOWN
+  val strategy: DataCollectionStrategy = DataCollectionStrategy.UNKNOWN,
 ) {
   enum class DataCollectionStrategy {
     PREDEFINED,
     AD_HOC,
     MIXED,
-    UNKNOWN
+    UNKNOWN,
   }
 
   class TaskNotFoundException(taskId: String) : Throwable(message = "unknown task $taskId")

ground/src/main/java/com/google/android/ground/model/mutation/Mutation.kt

@@ -43,7 +43,7 @@ sealed class Mutation {
     DELETE,
 
     /** Indicates database skew or an implementation bug. */
-    UNKNOWN
+    UNKNOWN,
   }
 
   /** Status of mutation being applied to remote data store. */
@@ -73,7 +73,7 @@ sealed class Mutation {
     COMPLETED,
 
     /** Failed indicates all retries have failed. */
-    FAILED
+    FAILED,
   }
 
   override fun toString(): String = "$syncStatus $type $clientTimestamp"

ground/src/main/java/com/google/android/ground/model/mutation/SubmissionMutation.kt

@@ -31,7 +31,7 @@ data class SubmissionMutation(
   override val lastError: String = "",
   val job: Job,
   val submissionId: String = "",
-  val deltas: List<ValueDelta> = listOf()
+  val deltas: List<ValueDelta> = listOf(),
 ) : Mutation() {
 
   override fun toString(): String = super.toString() + "deltas= $deltas"

ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt

@@ -23,7 +23,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 class MultipleChoiceTaskData(
   private val multipleChoice: MultipleChoice?,
-  val selectedOptionIds: List<String>
+  val selectedOptionIds: List<String>,
 ) : TaskData {
 
   // TODO: Make these inner classes non-static and access Task directly.

ground/src/main/java/com/google/android/ground/model/submission/Submission.kt

@@ -35,5 +35,5 @@ constructor(
   val job: Job,
   val created: AuditInfo,
   val lastModified: AuditInfo,
-  val data: SubmissionData = SubmissionData()
+  val data: SubmissionData = SubmissionData(),
 )

ground/src/main/java/com/google/android/ground/model/task/Condition.kt

@@ -20,6 +20,7 @@ import com.google.android.ground.model.submission.TaskData
 
 /** The task ID. */
 typealias TaskId = String
+
 /** The selected values keyed by task ID. */
 typealias TaskSelections = Map<String, TaskData>
 

ground/src/main/java/com/google/android/ground/model/task/MultipleChoice.kt

@@ -30,7 +30,7 @@ constructor(
 ) {
   enum class Cardinality {
     SELECT_ONE,
-    SELECT_MULTIPLE
+    SELECT_MULTIPLE,
   }
 
   fun getOptionById(id: String): Option? = options.firstOrNull { it.id == id }

ground/src/main/java/com/google/android/ground/model/task/Task.kt

@@ -49,6 +49,6 @@ constructor(
     TIME,
     DROP_PIN,
     DRAW_AREA,
-    CAPTURE_LOCATION
+    CAPTURE_LOCATION,
   }
 }

ground/src/main/java/com/google/android/ground/persistence/local/room/LocalDatabase.kt

@@ -91,7 +91,7 @@ import com.google.android.ground.persistence.local.room.fields.TileSetEntityStat
       ExpressionEntity::class,
     ],
   version = Config.DB_VERSION,
-  exportSchema = false
+  exportSchema = false,
 )
 @TypeConverters(
   TaskEntityType::class,

ground/src/main/java/com/google/android/ground/persistence/local/room/converter/SubmissionDeltasConverter.kt

@@ -43,7 +43,7 @@ object SubmissionDeltasConverter {
               delta.taskId,
               JSONObject()
                 .put(KEY_TASK_TYPE, delta.taskType.name)
-                .put(KEY_NEW_VALUE, ValueJsonConverter.toJsonObject(delta.newTaskData))
+                .put(KEY_NEW_VALUE, ValueJsonConverter.toJsonObject(delta.newTaskData)),
             )
           } catch (e: JSONException) {
             Timber.e(e, "Error building JSON")
@@ -70,7 +70,7 @@ object SubmissionDeltasConverter {
             ValueDelta(
               taskId,
               toEnum(Task.Type::class.java, jsonDelta.getString(KEY_TASK_TYPE)),
-              ValueJsonConverter.toResponse(task, jsonDelta[KEY_NEW_VALUE])
+              ValueJsonConverter.toResponse(task, jsonDelta[KEY_NEW_VALUE]),
             )
           )
         } catch (e: LocalDataConsistencyException) {

ground/src/main/java/com/google/android/ground/persistence/local/room/dao/LocationOfInterestMutationDao.kt

@@ -37,6 +37,6 @@ interface LocationOfInterestMutationDao : BaseDao<LocationOfInterestMutationEnti
   )
   suspend fun getMutations(
     locationOfInterestId: String,
-    vararg allowedStates: MutationEntitySyncStatus
+    vararg allowedStates: MutationEntitySyncStatus,
   ): List<LocationOfInterestMutationEntity>?
 }

ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionDao.kt

@@ -38,6 +38,6 @@ interface SubmissionDao : BaseDao<SubmissionEntity> {
   suspend fun findByLocationOfInterestId(
     locationOfInterestId: String,
     jobId: String,
-    state: EntityState
+    state: EntityState,
   ): List<SubmissionEntity>?
 }

ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionMutationDao.kt

@@ -34,7 +34,7 @@ interface SubmissionMutationDao : BaseDao<SubmissionMutationEntity> {
   )
   suspend fun findByLocationOfInterestId(
     locationOfInterestId: String,
-    vararg allowedStates: MutationEntitySyncStatus
+    vararg allowedStates: MutationEntitySyncStatus,
   ): List<SubmissionMutationEntity>
 
   @Query(
@@ -45,7 +45,7 @@ interface SubmissionMutationDao : BaseDao<SubmissionMutationEntity> {
   suspend fun getSubmissionMutationCount(
     loiId: String,
     mutationType: MutationEntityType,
-    vararg allowedStates: MutationEntitySyncStatus
+    vararg allowedStates: MutationEntitySyncStatus,
   ): Int
 
   @Query(
@@ -54,7 +54,7 @@ interface SubmissionMutationDao : BaseDao<SubmissionMutationEntity> {
   )
   suspend fun findBySubmissionId(
     submissionId: String,
-    vararg allowedStates: MutationEntitySyncStatus
+    vararg allowedStates: MutationEntitySyncStatus,
   ): List<SubmissionMutationEntity>?
 
   @Query(
@@ -63,6 +63,6 @@ interface SubmissionMutationDao : BaseDao<SubmissionMutationEntity> {
   )
   fun findByLoiIdFlow(
     locationOfInterestId: String,
-    vararg allowedStates: MutationEntitySyncStatus
+    vararg allowedStates: MutationEntitySyncStatus,
   ): Flow<List<SubmissionMutationEntity>>
 }

ground/src/main/java/com/google/android/ground/persistence/local/room/entity/AuditInfoEntity.kt

@@ -33,5 +33,5 @@ data class AuditInfoEntity(
    * Returns the time at which the server received the requested change according to the server's
    * internal clock, or null if the updated server time was not yet received.
    */
-  val serverTimestamp: Long? = null
+  val serverTimestamp: Long? = null,
 )

ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ConditionEntity.kt

@@ -30,10 +30,10 @@ import com.google.android.ground.persistence.local.room.fields.MatchEntityType
         entity = TaskEntity::class,
         parentColumns = ["id"],
         childColumns = ["parent_task_id"],
-        onDelete = ForeignKey.CASCADE
+        onDelete = ForeignKey.CASCADE,
       )
     ],
-  indices = [Index("parent_task_id")]
+  indices = [Index("parent_task_id")],
 )
 data class ConditionEntity(
   @ColumnInfo(name = "parent_task_id") @PrimaryKey val parentTaskId: String,

ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ExpressionEntity.kt

@@ -30,10 +30,10 @@ import com.google.android.ground.persistence.local.room.fields.ExpressionEntityT
         entity = ConditionEntity::class,
         parentColumns = ["parent_task_id"],
         childColumns = ["parent_task_id"],
-        onDelete = ForeignKey.CASCADE
+        onDelete = ForeignKey.CASCADE,
       )
     ],
-  indices = [Index("parent_task_id")]
+  indices = [Index("parent_task_id")],
 )
 data class ExpressionEntity(
   @ColumnInfo(name = "parent_task_id") @PrimaryKey val parentTaskId: String,

ground/src/main/java/com/google/android/ground/persistence/local/room/entity/JobEntity.kt

@@ -25,15 +25,15 @@ import androidx.room.*
         entity = SurveyEntity::class,
         parentColumns = ["id"],
         childColumns = ["survey_id"],
-        onDelete = ForeignKey.CASCADE
+        onDelete = ForeignKey.CASCADE,
       )
     ],
-  indices = [Index("survey_id")]
+  indices = [Index("survey_id")],
 )
 data class JobEntity(
   @PrimaryKey @ColumnInfo(name = "id") val id: String,
   @ColumnInfo(name = "name") val name: String?,
   @ColumnInfo(name = "survey_id") val surveyId: String?,
   @ColumnInfo(name = "strategy") val strategy: String,
-  @Embedded(prefix = "style_") val style: StyleEntity?
+  @Embedded(prefix = "style_") val style: StyleEntity?,
 )

ground/src/main/java/com/google/android/ground/persistence/local/room/entity/MultipleChoiceEntity.kt

@@ -26,13 +26,13 @@ import com.google.android.ground.persistence.local.room.fields.MultipleChoiceEnt
         entity = TaskEntity::class,
         parentColumns = ["id"],
         childColumns = ["task_id"],
-        onDelete = ForeignKey.CASCADE
+        onDelete = ForeignKey.CASCADE,
       )
     ],
-  indices = [Index("task_id")]
+  indices = [Index("task_id")],
 )
 data class MultipleChoiceEntity(
   @ColumnInfo(name = "task_id") @PrimaryKey val taskId: String,
   @ColumnInfo(name = "type") val type: MultipleChoiceEntityType,
-  @ColumnInfo(name = "has_other_option") val hasOtherOption: Boolean
+  @ColumnInfo(name = "has_other_option") val hasOtherOption: Boolean,
 )

ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OfflineAreaEntity.kt

@@ -32,5 +32,5 @@ data class OfflineAreaEntity(
   @ColumnInfo(name = "east") val east: Double,
   @ColumnInfo(name = "west") val west: Double,
   @ColumnInfo(name = "min_zoom") val minZoom: Int,
-  @ColumnInfo(name = "max_zoom") val maxZoom: Int
+  @ColumnInfo(name = "max_zoom") val maxZoom: Int,
 )