Use typed Kotlin list literals for SSD activity data
ober
c87754802c2ba21a1e348f4369c22e0ab95d2baa
--- 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#dc45028545d8c7ec19f2a0a3356dc947c3c7da9b" + - "https://git.sr.ht/~lisp/jerboa#549bed276332a66bed4f912bcce12be451a2e38b" # 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)" = dc45028545d8c7ec19f2a0a3356dc947c3c7da9b - test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 38e402be45c993c87d761756c35f58eb9dfee7cf + test "$(git -C ../jerboa rev-parse HEAD)" = 549bed276332a66bed4f912bcce12be451a2e38b + test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 9211c375e2589633d52787b40a2ac42cb758e4ec 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": "dc45028545d8c7ec19f2a0a3356dc947c3c7da9b", - "tree": "38e402be45c993c87d761756c35f58eb9dfee7cf" + "commit": "549bed276332a66bed4f912bcce12be451a2e38b", + "tree": "9211c375e2589633d52787b40a2ac42cb758e4ec" }, "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=dc45028545d8c7ec19f2a0a3356dc947c3c7da9b # gitsafe:ignore -jerboa_tree=38e402be45c993c87d761756c35f58eb9dfee7cf # gitsafe:ignore +jerboa_commit=549bed276332a66bed4f912bcce12be451a2e38b # gitsafe:ignore +jerboa_tree=9211c375e2589633d52787b40a2ac42cb758e4ec # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -9822,25 +9822,6 @@ " internal var reopenSsdBrowserOnResume: Boolean = false" " @Volatile internal var loadGeneration: Int = 0" " private val boxTypeDisplays: List<String> by lazy { boxTypeDisplays(boxTypesLoadAndroid(this)) }" - " private val firingArcDisplays = listOf(" - " \"FA\"," - " \"FH\"," - " \"FX\"," - " \"RX\"," - " \"LS\"," - " \"RS\"," - " \"L\"," - " \"R\"," - " \"LF\"," - " \"RF\"," - " \"LR\"," - " \"RR\"," - " \"A\"," - " \"LA\"," - " \"RA\"," - " \"360\"" - " )" - "" " override fun onCreate(savedInstanceState: Bundle?) {" " super.onCreate(savedInstanceState)" " installClientCrashLogger()" @@ -10986,7 +10967,8 @@ CLIENT_LOG_CONNECT_TIMEOUT_MS CLIENT_LOG_READ_TIMEOUT_MS CLIENT_LOG_CRASH_TIMEOUT_MS - CLIENT_LOG_STACK_CHARS) + CLIENT_LOG_STACK_CHARS + firingArcDisplays) (type Int32) (val DPI : Int32 (int32 144) (modifiers internal const)) @@ -11045,7 +11027,26 @@ (val CLIENT_LOG_CRASH_TIMEOUT_MS : Int32 (int32 1500) (modifiers internal const)) (val CLIENT_LOG_STACK_CHARS : Int32 (int32 12000) - (modifiers internal const)))) + (modifiers internal const)) + (val firingArcDisplays : (List String) + (list-of String + "FA" + "FH" + "FX" + "RX" + "LS" + "RS" + "L" + "R" + "LF" + "RF" + "LR" + "RR" + "A" + "LA" + "RA" + "360") + (modifiers internal)))) (typed-kotlin-file "com/sfb/ssdreview/AndroidBitmap.kt" (kotlin-imports (android graphics Bitmap)) (typed-library (com sfb ssdreview)