Fix build

google · Feb 25, 2024 · 6119042 · 6119042
1 parent e32c402
commit 6119042
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -58,12 +58,15 @@ configure<JSONSchemaCodegen> {
     inputFile(file("$base/point-object.json"))
     inputFile(file("$base/polygon-object.json"))
     inputFile(file("$base/multi-polygon-object.json"))
-    inputFile(file("$base/linear-ring-object.json"))
+    inputFile(file("$base/linear-ring-array-wrapper.json"))
     inputFile(file("$base/coordinates-object.json"))
 
     inputFile(file("$base/submission-document.json"))
     inputFile(file("$base/audit-info-object.json"))
   }
+    // TODO:
+  //        codeGenerator.addCustomClassByURI(URI("http://pwall.net/test#/properties/price"),
+  // "com.example.Money")
   outputDir.set(file("build/generated-sources/kotlin"))
   packageName.set("com.google.ground.shared.schema")
 }
diff --git a/shared/json-schema-codegen/config.json b/shared/json-schema-codegen/config.json
@@ -1,8 +1,11 @@
 {
+  "classNames": {
+    "urn:jsonschema:PolygonObject:coordinates": "PolygonCoordinates"
+  },
   "customClasses": {
     "extension": {
       "x-kt-type": {
-        "SubmissionData": "com.google.ground.shared.schema.SubmissionData",
+        "SubmissionDataObject": "com.google.ground.shared.schema.SubmissionDataObject",
         "GeoPoint": "com.google.firebase.firestore.GeoPoint"
       }
     }

diff --git a/shared/src/main/kotlin/com/google/ground/shared/schema/SubmissionDataObject.kt b/shared/src/main/kotlin/com/google/ground/shared/schema/SubmissionDataObject.kt
@@ -17,4 +17,4 @@
 package com.google.ground.shared.schema
 
 // TODO(#2256): Update schema so that values can be strongly typed.
-typealias SubmissionData = Map<String, Any>
+typealias SubmissionDataObject = Map<String, Any>