Make bundled content import more robust

Author: frett

build-logic/src/main/kotlin/org/cru/godtools/gradle/bundledcontent/BundledContentConfiguration.kt

@@ -76,7 +76,8 @@ private fun LibraryVariant.registerDownloadBundledToolsJsonTask(
             // attributes
             "manifest", "onesky-project-id", "total-views",
             // relationships
-            "system", "translations", "latest-drafts-translations", "pages", "custom-manifests", "tips"
+            "system", "translations", "latest-drafts-translations", "pages", "custom-manifests", "tips",
+            "resource-scores"
         )
         removeAttributesFor["attachment"] = listOf("file", "is-zipped")
         removeAttributesFor["language"] = listOf("direction")

build-logic/src/main/kotlin/org/cru/godtools/gradle/bundledcontent/PruneJsonApiResponseTask.kt

@@ -63,7 +63,7 @@ abstract class PruneJsonApiResponseTask : DefaultTask() {
     private fun JSONArray.sortJsonApiObjects() {
         val sorted = filterIsInstance<JSONObject>()
             .onEach { if (sortRelationships) it.sortJsonApiRelationships() }
-            .sortedBy { it.optInt("id") }.sortedBy { it.getString("type") }
+            .sortedWith(compareBy({ it.optString("type") }, { it.optInt("id") }))
         clear()
         putAll(sorted)
     }

build-logic/src/main/kotlin/org/cru/godtools/gradle/bundledcontent/Utils.kt

@@ -8,7 +8,7 @@ internal fun File.loadJson() = inputStream().use { JSONObject(JSONTokener(it)) }
 internal fun JSONObject.writeJson(file: File) = file.writer().use { write(it) }
 
 internal fun JSONObject.optJSONArrayOrJSONObject(key: String) =
-    (optJSONArray(key)?.filterIsInstance<JSONObject>() ?: listOfNotNull(optJSONObject("data")))
+    (optJSONArray(key)?.filterIsInstance<JSONObject>() ?: listOfNotNull(optJSONObject(key)))
 internal val JSONObject.jsonApiType get() = optString("type", null)
 internal val JSONObject.jsonApiId get() = optString("id", null)?.toIntOrNull()
 internal val JSONObject.attributes get() = optJSONObject("attributes")