Merge pull request #11445 from keymanapp/chore/merge-beta-into-master

chore: merge beta into master, final
keymanapp · May 15, 2024 · 2fdea14 · 2fdea14
2 parents 2e7e948 + 1643c1d
commit 2fdea14
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/HISTORY.md b/HISTORY.md
@@ -155,6 +155,13 @@
 * chore(common): move to 18.0 alpha (#10713)
 * chore: move to 18.0 alpha
 
+## 17.0.323 beta 2024-05-13
+
+* chore(windows): Update crowdin string for Khmer (#11409)
+* fix(android): disable Sentry session tracking (#11419)
+* fix(mac): restore OSK keys that became invisible in mac OS 14 Sonoma (#11388)
+* chore(android,ios): Add fv_nlakapamuxcheen (#11405)
+
 ## 17.0.322 beta 2024-05-10
 
 * fix(web): fixes illegal KMW event state - can't focus a null element (#11385)

diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-18.0.36
+18.0.36
diff --git a/resources/build/trigger-definitions.inc.sh b/resources/build/trigger-definitions.inc.sh
@@ -123,3 +123,15 @@ bc_stable_16_0_web=(Keymanweb_Build)
 bc_stable_16_0_developer=(Keyman_Developer_Release)
 
 vcs_stable_16_0=HttpsGithubComKeymanappKeyman
+
+# Stable 17.0 Build Configurations
+
+bc_stable_17_0_android=(KeymanAndroid_Build)
+bc_stable_17_0_ios=(Keyman_iOS_Master)
+bc_stable_17_0_linux=(KeymanLinux_Master)
+bc_stable_17_0_mac=(KeymanMac_Master)
+bc_stable_17_0_windows=(Keyman_Build)
+bc_stable_17_0_web=(Keymanweb_Build)
+bc_stable_17_0_developer=(Keyman_Developer_Release)
+
+vcs_stable_17_0=HttpsGithubComKeymanappKeyman