Move SSD group label fallback to typed Kotlin
ober
8e420a99e14f3d1509c22eaf8ad806c5ce5342a1
--- a/.build.yml +++ b/.build.yml @@ -5,7 +5,7 @@ packages: - make=4.4.1-r4 sources: # Build dependency: full immutable commit, mirrored in dependencies.lock.json. - - "https://git.sr.ht/~lisp/jerboa#a62bac2471f691b7087ea3594db3d375b2097cfd" + - "https://git.sr.ht/~lisp/jerboa#26f85c6a2a826a4fb68ff8956362f2f2cf6b57ce" # The second source is the build subject selected by the SourceHut submitter. - https://git.sr.ht/~lisp/jerboa-android tasks: @@ -14,6 +14,6 @@ tasks: test "$(apk info -v chez-scheme)" = chez-scheme-10.3.0-r2 test "$(apk info -v git)" = git-2.54.0-r0 test "$(apk info -v make)" = make-4.4.1-r4 - test "$(git -C ../jerboa rev-parse HEAD)" = a62bac2471f691b7087ea3594db3d375b2097cfd - test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = a1e7cd426ed7957d29801409eb5e56207ea5e1a3 + test "$(git -C ../jerboa rev-parse HEAD)" = 26f85c6a2a826a4fb68ff8956362f2f2cf6b57ce + test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 9d27be793f81e8bd5b3724c9790eee7fb68a42b8 JERBOA="chez --libdirs .:../jerboa/lib --script" make test --- a/dependencies.lock.json +++ b/dependencies.lock.json @@ -11,8 +11,8 @@ "generator_runtime": { "name": "jerboa", "repository": "https://git.sr.ht/~lisp/jerboa", - "commit": "a62bac2471f691b7087ea3594db3d375b2097cfd", - "tree": "a1e7cd426ed7957d29801409eb5e56207ea5e1a3" + "commit": "26f85c6a2a826a4fb68ff8956362f2f2cf6b57ce", + "tree": "9d27be793f81e8bd5b3724c9790eee7fb68a42b8" }, "assurance_tools": { "osv_scanner": { --- a/scripts/verify-supply-chain.sh +++ b/scripts/verify-supply-chain.sh @@ -3,8 +3,8 @@ set -eu repo=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd -P) lock="$repo/dependencies.lock.json" -jerboa_commit=a62bac2471f691b7087ea3594db3d375b2097cfd # gitsafe:ignore -jerboa_tree=a1e7cd426ed7957d29801409eb5e56207ea5e1a3 # gitsafe:ignore +jerboa_commit=26f85c6a2a826a4fb68ff8956362f2f2cf6b57ce # gitsafe:ignore +jerboa_tree=9d27be793f81e8bd5b3724c9790eee7fb68a42b8 # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -5048,8 +5048,8 @@ " reviewView.invalidate()" " saveSessionAsync(" " session," - " \"Approved ${group.label.ifBlank { group.id }}; saving...\"," - " \"Approved and saved ${group.label.ifBlank { group.id }}\"" + " \"Approved ${groupDisplayLabel(group)}; saving...\"," + " \"Approved and saved ${groupDisplayLabel(group)}\"" " )" " }" "" @@ -5338,7 +5338,7 @@ " inputType = InputType.TYPE_CLASS_NUMBER" " setText(if (detectedIds.isNotEmpty()) detectedIds.size.toString() else \"1\")" " }" - " val title = \"Append to ${group.label.ifBlank { group.id }}\"" + " val title = \"Append to ${groupDisplayLabel(group)}\"" " val dialog = AlertDialog.Builder(this)" " .setTitle(title)" " .setMessage(if (detectedIds.isNotEmpty()) \"${detectedIds.size} detected boxes\" else \"No detected boxes; enter manual count\")" @@ -5422,8 +5422,8 @@ " reviewView.invalidate()" " saveSessionAsync(" " session," - " \"Approved ${group.label.ifBlank { group.id }} (${ids.size} boxes); saving...\"," - " \"Approved and saved ${group.label.ifBlank { group.id }} (${ids.size} boxes)\"" + " \"Approved ${groupDisplayLabel(group)} (${ids.size} boxes); saving...\"," + " \"Approved and saved ${groupDisplayLabel(group)} (${ids.size} boxes)\"" " )" " }" "" @@ -5447,8 +5447,8 @@ " reviewView.invalidate()" " saveSessionAsync(" " session," - " \"Appended $added boxes to ${group.label.ifBlank { group.id }}; saving...\"," - " \"Appended and saved ${group.label.ifBlank { group.id }} (${group.count} boxes)\"" + " \"Appended $added boxes to ${groupDisplayLabel(group)}; saving...\"," + " \"Appended and saved ${groupDisplayLabel(group)} (${group.count} boxes)\"" " )" " }" "" @@ -5509,8 +5509,8 @@ " reviewView.invalidate()" " saveSessionAsync(" " session," - " \"Saved ${group.label.ifBlank { group.id }}; syncing...\"," - " \"Saved ${group.label.ifBlank { group.id }}\"" + " \"Saved ${groupDisplayLabel(group)}; syncing...\"," + " \"Saved ${groupDisplayLabel(group)}\"" " )" " }" " dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener {" @@ -5546,8 +5546,8 @@ " reviewView.invalidate()" " saveSessionAsync(" " session," - " \"Deleted ${group.label.ifBlank { group.id }}; saving...\"," - " \"Deleted and saved ${group.label.ifBlank { group.id }}\"" + " \"Deleted ${groupDisplayLabel(group)}; saving...\"," + " \"Deleted and saved ${groupDisplayLabel(group)}\"" " )" " }" "" @@ -6714,7 +6714,7 @@ " val selected = group.id == selectedGroupId" " val label = when {" " group.label.isNotBlank() -> group.label" - " selected -> group.label.ifBlank { group.id }" + " selected -> groupDisplayLabel(group)" " else -> \"\"" " }" " if (label.isBlank()) continue"