chore(web): Merge branch 'maint/web/13399_tc-config_refactor' into maint/web/13399_tc-config_dev

Author: ermshiperete

.github/actions/build-binary-packages/action.yml

@@ -31,7 +31,7 @@ runs:
         path: artifacts/keyman-srcpkg
 
     - name: Build
-      uses: sillsdev/gha-ubuntu-packaging@b619077451b27c16dc6fd699bc1daf8d5ce07659 # v1.2
+      uses: sillsdev/gha-ubuntu-packaging@556b268762be9bea0f39861a7392587211ef6a58 # v2.0.1
       with:
         dist: "${{ inputs.dist }}"
         platform: "${{ inputs.arch }}"

.github/labeler.yml

@@ -11,43 +11,56 @@ docs: docs/**
 # Add labels based on changed files using actions/labeler
 #
 
-android/: android/**
+android/:
+  - android/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/android/**
 android/app/: android/KMAPro/**
 android/engine/: android/KMEA/**
 android/samples/: android/Samples/**
 
-common/: common/**
+common/:
+  - common/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/common/**
 common/web/: common/web/**
 
 core/:
   - core/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/core/**
 
 developer/:
   - developer/**
-
+  - resources/teamcity/includes/**
+  - resources/teamcity/developer/**
 developer/compilers/:
   - developer/src/kmc/**
   - developer/src/kmcmplib/**
   - developer/src/kmc-*/**
-
 developer/ide/:
   - developer/src/server/**
   - developer/src/tike/**
 
-ios/: ios/**
+ios/:
+  - ios/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/ios/**
 ios/app/: ios/keyman/**
 ios/engine/: ios/engine/**
 ios/samples/: ios/samples/**
 
-linux/: linux/**
+linux/:
+  - linux/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/linux/**
 linux/config/: linux/keyman-config/**
-linux/engine/:
-  - linux/ibus-keyman/**
-  - linux/legacy/ibus-kmfl/**
-  - linux/legacy/kmflcomp/**
-  - linux/legacy/libkmfl/**
+linux/engine/: linux/ibus-keyman/**
 
-mac/: mac/**
+mac/:
+  - mac/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/mac/**
 # mac/config/:
 # mac/engine/: mac/**
 
@@ -59,13 +72,19 @@ oem/fv/windows/: oem/firstvoices/windows/**
 
 resources/: resources/**
 
-web/: web/**
+web/:
+  - web/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/web/**
 # web/bookmarklet/
 web/engine/: web/source/**
 web/ui/: web/source/kmwui*
 web/samples/: web/samples/**
 web/predictive-text/: web/src/engine/predictive-text/**
 
-windows/: windows/**
+windows/:
+  - windows/**
+  - resources/teamcity/includes/**
+  - resources/teamcity/windows/**
 windows/config/: windows/src/desktop/**
 windows/engine/: windows/src/engine/**

HISTORY.md

@@ -1,5 +1,48 @@
 # Keyman Version History
 
+## 19.0.57 alpha 2025-06-03
+
+* fix(windows): change from error to breadcrumb and log (#14069)
+* maint(mac): make make-km-dmg.sh less quiet (#14105)
+
+## 19.0.56 alpha 2025-06-02
+
+* maint(ios): Use zip.inc.sh to prep release artifacts (#13919)
+* maint(linux): update to new version of gha-ubuntu-packaging (#14094)
+* chore(linux): add Python TC test runner (#14062)
+
+## 19.0.55 alpha 2025-05-31
+
+* maint(linux): `sudo` not required for removing temporary files (#14086)
+* maint(linux): update to new version of gha-ubuntu-packaging (#14089)
+
+## 19.0.54 alpha 2025-05-30
+
+* maint(linux): move TC build scripts to `resources/teamcity/linux` (#14061)
+
+## 19.0.53 alpha 2025-05-29
+
+* fix(developer): ensure that kmc doesn't skip validate phase of kmc-ldml (#14068)
+
+## 19.0.52 alpha 2025-05-28
+
+* feat(developer): line numbers for tran compiler (#14037)
+* feat(developer): add line numbers to disp compiler (#14048)
+* feat(developer): line numbers for layr compiler (#14050)
+* feat(developer): line numbers for LocaCompiler (#14054)
+* fix(common): properly use newly installed node version (#14057)
+* maint(common): update build coordinator and labels for `resources/teamcity` changes (#14047)
+
+## 19.0.51 alpha 2025-05-27
+
+* maint: add stable-19.0 triggers (#14043)
+* maint: add empty 'scripts' tag to package.json to silence warning (#14044)
+* fix(linux): fix version variable references in kmconfig (#14032)
+
+## 19.0.50 alpha 2025-05-26
+
+* chore(web): mark async methods in UI components (#14034)
+
 ## 19.0.49 alpha 2025-05-25
 
 * feat(developer): revamp line numbers per design doc (#14016)
@@ -302,6 +345,32 @@
 * refactor(windows): rename `TKeymanMutex.MutexOwned` to `TakeOwnership` and add `ReleaseOwnership` (#13168)
 * chore: increment to alpha 19.0 (#13187)
 
+## 18.0.238 stable 2025-06-04
+
+* fix(developer): ldml: make sure .run() calls compile() for validation (#14071)
+* maint(linux): fix typo of temporary dependency package (#14085)
+* maint(linux): update to new version of gha-ubuntu-packaging (#14096)
+* maint(mac): make make-km-dmg.sh less quiet (#14106)
+
+## 18.0.237 stable 2025-05-30
+
+* maint(android): Update FirstVoices launcher icon and red theme (#13917)
+* fix(web): empty layout fontSize property should default to 1em (#13960)
+* fix(linux): use correct header guard define in OrderedOutputDevice.h (#13963)
+* chore(linux): Update debian changelog (#13888)
+* fix(mac): handle PackageInfo section in kmp.inf file (#13957)
+* feat(android): log active keyboard, model IDs with reported errors (#14003)
+* chore(ios): FirstVoices certificate update (#14005)
+* feat(ios): log active keyboard, model IDs with reported errors (#14006)
+* fix(linux): configurable path in `.service` file when using basu (#13999)
+* maint(linux): add `--no-werror` option to not report warnings as errors (#14000)
+* fix(windows): use json file name against cache folder and ename Enter and Exit methods for TState Object (#14010)
+* chore(ios): update FirstVoices AppIcon (#14011)
+* maint: change builder_completion script to a .inc.sh (#14008)
+* fix(windows): only breadcrumb unexpected state on first run (#14026)
+* fix(windows): skip sending handle kmshell events to upgrade state machine for keyboard install modes (#14028)
+* fix(windows): fix sentry error message reporting (#14029)
+
 ## 18.0.236 stable 2025-05-12
 
 * chore(linux): Update debian changelog (#13737)

VERSION.md

@@ -1 +1 @@
-19.0.50
+19.0.58

android/.gitignore

@@ -57,6 +57,9 @@ KMAPro/**/assets/*.kmp
 # Play Store release notes (copied from whatsnew.md)
 KMAPro/kMAPro/src/main/play/release-notes/**/*.txt
 
+# Release artifacts
+upload/
+
 # Eclipse files
 .project
 .settings/

android/build.sh

@@ -15,6 +15,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/zip.inc.sh"
 
 ################################ Main script ################################
 
@@ -37,6 +38,7 @@ builder_describe \
   build \
   test \
   "publish                                  Publishes symbols to Sentry and the APKs to the Play Store." \
+  "archive                                  Copy release artifacts to upload/ and rsync to downloads.keyman" \
   "--ci+                                    Deprecated build option. Remove in 20.0" \
   --upload-sentry+ \
   ":engine=KMEA                             Keyman Engine for Android" \
@@ -70,4 +72,51 @@ function do_test_help() {
 
 builder_run_action        test:help    do_test_help
 
-builder_run_child_actions publish
+builder_run_child_actions publish
+
+# Copy release artifacts to upload/ and rsync to downloads.keyman.com
+if builder_start_action archive; then
+  UPLOAD_PATH="$KEYMAN_ROOT/android/upload/${KEYMAN_VERSION}"
+  KEYMAN_ENGINE_ANDROID_ZIP="keyman-engine-android-${KEYMAN_VERSION}.zip"
+  KEYMAN_APK="keyman-${KEYMAN_VERSION}.apk"
+  FIRSTVOICES_APK="firstvoices-${KEYMAN_VERSION}.apk"
+  ZIP_FILE="${UPLOAD_PATH}/${KEYMAN_ENGINE_ANDROID_ZIP}"
+  ZIP_FLAGS=("-q" "-r") # quiet, recursive
+
+  mkdir -p "${UPLOAD_PATH}"
+
+  # Create Keyman Engine for Android archive
+  builder_echo "Copying Keyman Engine for Android into ${UPLOAD_PATH}..."
+  cd "${UPLOAD_PATH}"
+  cp "${KEYMAN_ROOT}/android/KMAPro/kMAPro/libs/keyman-engine.aar" ./
+  add_zip_files "${ZIP_FILE}" "${ZIP_FLAGS[@]}" "keyman-engine.aar"
+  rm -f "keyman-engine.aar"
+
+  builder_echo "Copying Keyman Engine for Android Sample projects into ${UPLOAD_PATH}..."
+  cp -rf "${KEYMAN_ROOT}/android/Samples" ./
+  add_zip_files "${ZIP_FILE}" "-x@../../zip-excludes" "${ZIP_FLAGS[@]}" "Samples"
+  rm -rf "Samples"
+
+  # Copy release APK
+  cp "${KEYMAN_ROOT}/android/KMAPro/kMAPro/build/outputs/apk/release/${KEYMAN_APK}" ./
+
+  # FirstVoices app
+
+  if [ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]; then
+    cp "${KEYMAN_ROOT}/oem/firstvoices/android/app/build/outputs/apk/release/${FIRSTVOICES_APK}" ./
+  fi
+
+  #
+  # Write download info files
+  #
+
+  cd "${UPLOAD_PATH}"
+  write_download_info "Keyman Engine for Android" "${KEYMAN_ENGINE_ANDROID_ZIP}" "${KEYMAN_VERSION}" "${KEYMAN_TIER}" "android"
+  write_download_info "Keyman for Android" "${KEYMAN_APK}" "${KEYMAN_VERSION}" "${KEYMAN_TIER}" "android"
+
+  if [ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]; then
+    write_download_info "FirstVoices Keyboards" "${FIRSTVOICES_APK}" "${KEYMAN_VERSION}" "${KEYMAN_TIER}" "android"
+  fi
+
+  builder_finish_action success archive
+fi

android/zip-excludes

@@ -0,0 +1 @@
+Samples/*/build.sh

common/test/resources/package.json

@@ -3,6 +3,7 @@
   "description": "Common test resources for Keyman's JS & TS-based components & products",
   "type": "module",
   "license": "MIT",
+  "scripts": {},
   "devDependencies": {
     "@keymanapp/resources-gosh": "*",
     "typescript": "^5.4.5"

common/web/keyman-version/package.json

@@ -11,6 +11,7 @@
     "/build/"
   ],
   "license": "MIT",
+  "scripts": {},
   "type": "module",
   "devDependencies": {
     "typescript": "^5.4.5"

common/web/types/src/kmx/kmx-plus/element-string.ts

@@ -1,5 +1,5 @@
 import { constants } from '@keymanapp/ldml-keyboard-constants';
-import { DependencySections, StrsItem, UsetItem } from './kmx-plus.js';
+import { DependencySections, StrsItem, StrsOptions, UsetItem } from './kmx-plus.js';
 import { ElementParser, ElementSegment, ElementType } from '../../ldml-keyboard/pattern-parser.js';
 import * as util from '../../util/util.js';
 import MATCH_HEX_ESCAPE = util.MATCH_HEX_ESCAPE;
@@ -33,7 +33,7 @@ export class ElementString extends Array<ElemElement> {
    * @param source if a string array, does not get reinterpreted as UnicodeSet. This is used with vars, etc. Or pass `["str"]` for an explicit 1-element elem.
    * If it is a string, will be interpreted per reorder element rules.
    */
-  static fromStrings(sections: DependencySections, source: string | string[], order?: string, tertiary?: string, tertiary_base?: string, prebase?: string) : ElementString {
+  static fromStrings(sections: DependencySections, options: StrsOptions, source: string | string[], order?: string, tertiary?: string, tertiary_base?: string, prebase?: string) : ElementString {
     // the returned array
     const array = new ElementString();
     if(!source) {
@@ -81,21 +81,21 @@ export class ElementString extends Array<ElemElement> {
           // error. So we can just exit here.
           return null; // UnicodeSet error
         }
-        const uset = sections.usetparser.parseUnicodeSet(item.segment, needRanges);
+        const uset = sections.usetparser.parseUnicodeSet(item.segment, needRanges, options?.x);
         if (!uset) {
-          return null; // UnicodeSet error already thrown
+          return null; // UnicodeSet error already added to callback
         }
-        elem.uset = sections.uset.allocUset(uset, sections);
-        elem.value = sections.strs.allocString('', {singleOk: true}); // no string
+        elem.uset = sections.uset.allocUset(uset, sections, options?.x);
+        elem.value = sections.strs.allocString('', {...options, singleOk: true}); // no string
       } else if (item.type === ElementType.codepoint || item.type === ElementType.escaped || item.type === ElementType.string) {
         // some kind of a string
         let str = item.segment;
         if (item.type === ElementType.escaped && !MATCH_HEX_ESCAPE.test(str)) {
           str = unescapeOneQuadString(str);
           // TODO-LDML: any other escape forms here?
-          elem.value = sections.strs.allocString(str, { singleOk: true });
+          elem.value = sections.strs.allocString(str, { ...options, singleOk: true });
         } else {
-          elem.value = sections.strs.allocString(str, { unescape: true, singleOk: true });
+          elem.value = sections.strs.allocString(str, { ...options, unescape: true, singleOk: true });
         }
         // Now did we end up with one char or no?
         if (elem.value.isOneChar) {