Skip to content

Commit

Permalink
chore: Merge branch 'master' into chore/merge-master-epic-win-upg-cert
Browse files Browse the repository at this point in the history
  • Loading branch information
rc-swag committed Oct 16, 2023
2 parents 891d321 + 91e996f commit 6269bff
Show file tree
Hide file tree
Showing 731 changed files with 13,416 additions and 30,371 deletions.
3 changes: 1 addition & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ developer/:
- developer/**

developer/compilers/:
- developer/src/kmcomp/**
- developer/src/kmcmpdll/**
- developer/src/kmc/**
- developer/src/kmcmplib/**
- developer/src/kmc-*/**

developer/ide/:
Expand Down
12 changes: 0 additions & 12 deletions .github/multi-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,3 @@ labels:
- label: 'windows/'
matcher:
title: '\(.*windows.*\):'

#
# epics -- we will add/remove these as we work on new epics each release
#

- label: 'epic-ldml'
matcher:
branch: '.*epic-ldml.*' # anywhere in the branch name, e.g. feat/epic-ldml/developer/... or feat/developer/foo-epic-ldml

- label: 'epic-kmcompx'
matcher:
branch: '.*epic-kmcompx.*'
14 changes: 0 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@

# /developer/TIKE/
/windows/src/developer/TIKE/stock.kct
/windows/src/developer/TIKE/kmcmpdll.dll

# /developer/TIKE/redist/
/windows/src/developer/TIKE/redist/Addins
Expand All @@ -85,12 +84,6 @@
/windows/src/developer/inst/download.mak
/windows/src/developer/inst/copydev.mak

# /developer/kmcmpdll/
/windows/src/developer/kmcmpdll/*.lastbuildstate

# /developer/kmcmpdll/Debug/
/windows/src/developer/kmcmpdll/Debug/*.idb

/windows/src/developer/stock/stock.kct
/windows/src/developer/uitemplates/keyman.kct

Expand Down Expand Up @@ -186,10 +179,3 @@ lcov.info
/keyman*.changes
/keyman*.tar.?z

#Sabine:
# /common/test/keyboards/invalid/source/*.kmx
# /developer/src/test/auto/kmcomp/*.kmn
# /developer/src/test/auto/kmcomp/*.kvk
# /developer/src/test/auto/kmcomp/*.kvk*
# /developer/src/test/auto/kmcomp/*.txt

64 changes: 64 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,69 @@
# Keyman Version History

## 17.0.191 alpha 2023-10-15

* chore: update readme for keyboard_info schema (#9746)

## 17.0.190 alpha 2023-10-12

* chore(web): web build streamlining (#9743)
* chore(linux): Add code coverage reports for keyman-config and keyman-system-service (#9753)

## 17.0.189 alpha 2023-10-11

* refactor(linux): Use auto cleanup (and fix some memory leaks) (#9648)
* refactor(linux): Simplify adding keyboard (#9734)

## 17.0.188 alpha 2023-10-11

* chore(android,windows): Update crowdin strings for Kannada (#9737)

## 17.0.187 alpha 2023-10-11

* chore(developer): convert Server to ES Modules (#9673)
* chore(common): convert hextobin to ES Modules (#9676)
* chore(common): convert resources/build/version to ES Modules (#9678)
* chore(common): keyman-version now generates only es module (#9680)
* chore(common): cleanup final Typescript non-ESM metadata (#9681)
* chore(ios): renew certificate (#9697)
* (#9687)
* feat(developer): ldml fix all remaining TODOs around markers and variables (#9688)
* fix(windows): re-enable signature check (#9695)
* fix(common): fix schema fixer (#9727)
* chore(core): rename keyboardprocessor.h to keyman_core_api.h (#9723)
* chore: rename km_kbp_ to km_core_ (#9724)
* chore(developer): fixup signcode paths for server (#9730)
* fix(linux): Explicitly initialize GTK (#9706)
* chore(linux): Improve Sentry reports (#9725)
* epic(developer): refactor package-metadata for 17.0 (#9485)
* chore: clean up a few minor discrepancies in builder.inc.sh (#9731)
* fix: path for ESM increment-version, and exit code (#9738)

## 17.0.186 alpha 2023-10-04

* feat(developer): show an INFO message when warnings have failed a build (#9652)
* chore(developer): reduce duplicate words warning to hint (#9653)
* feat(developer): issue hint if package includes keyboard source files (#9658)
* chore(developer): switch on code coverage reporting for kmc (#9662)
* fix(core): clean cached ICU in core (#9668)
* feat(developer): warn if .kps includes a .js which is not touch-capable (#9667)

## 17.0.185 alpha 2023-10-03

* chore(web): Add non-printing characters to the OSK (#9547)
* feat(developer): support `store(&version) '17.0'` (#9656)
* chore(developer): add test for `checkFilenameConventions == false` or unset (#9661)
* feat(developer): ldml scan codes support (#9615)

## 17.0.184 alpha 2023-10-02

* fix(web): fixes toolbar refocus timing after a keyboard change (#9618)

## 17.0.183 alpha 2023-09-29

* feat(web): browser-KMW support for default subkeys (#9496)
* refactor(linux): Add more tests for `keymanutil.c` ️ (#9595)

## 17.0.182 alpha 2023-09-28

* chore(web): builds that output to web/build/publish should also clean it (#9613)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.0.183
17.0.192
3 changes: 3 additions & 0 deletions android/KMAPro/kMAPro/src/main/res/values-kn-rIN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
<!-- Context: Textfield prompt (&#8230; is the ellipsis character "...") -->
<string name="textview_hint" comment="Prompt to start typing">ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ&#8230;</string>
<!-- Context: Splash screen (version/copyright info currently disabled -->
<string name="splash_blank" translatable="false" comment="Blank text while version info on splash page is disabled"></string>
<!-- Context: Splash screen (version/copyright info currently disabled -->
<!-- Context: Text Size dialog -->
<string name="text_size" comment="Current text size (number)">ಅಕ್ಷರದ ಗಾತ್ರ: %1$d</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_up" comment="Make text bigger">ಅಕ್ಷರದ ಗಾತ್ರ ಹೆಚ್ಚಿಸಿ</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_down" comment="Make text smaller">ಅಕ್ಷರದ ಗಾತ್ರ ತಗ್ಗಿಸಿ</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_slider" comment="Adjust text size">ಅಕ್ಷರ ಗಾತ್ರದ ಸ್ಲೈಡರ್</string>
<!-- Context: Clear Text dialog -->
<string name="all_text_will_be_cleared" comment="Erase all the text">\nಎಲ್ಲಾ ಪಠ್ಯವನ್ನು ತೆರವುಗೊಳಿಸಲಾಗುತ್ತದೆ\n</string>
<!-- Context: Get Started menu -->
Expand Down
Binary file not shown.
Binary file modified android/Tests/KeyboardHarness/app/src/main/assets/test9469.kmp
Binary file not shown.
2 changes: 2 additions & 0 deletions android/Tests/KeyboardHarness/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ and consists of these engineering keyboards:
* web/testing/chirality/chirality.js
* web/testing/platform/platformtest.js

test9469.kmp is another engineering keyboard to show non-printing characters on the OSK.

### Compiling From Command Line
1. Launch a command prompt to the `android/` folder
2. Compile KMEA. This will build and copy `keyman-engine.aar` to the Samples and Test projects
Expand Down
12 changes: 6 additions & 6 deletions common/include/km_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ typedef uint8_t KMX_BYTE;
typedef uint16_t KMX_WORD;

#if defined(__cplusplus)
typedef char16_t km_kbp_cp;
typedef char32_t km_kbp_usv;
typedef char16_t km_core_cp;
typedef char32_t km_core_usv;
#else
typedef uint16_t km_kbp_cp; // code point
typedef uint32_t km_kbp_usv; // Unicode Scalar Value
typedef uint16_t km_core_cp; // code point
typedef uint32_t km_core_usv; // Unicode Scalar Value
#endif

typedef km_kbp_cp KMX_WCHAR; // wc, 16-bit UNICODE character
typedef km_core_cp KMX_WCHAR; // wc, 16-bit UNICODE character
typedef KMX_WCHAR* PKMX_WCHAR;

typedef char KMX_CHAR;
Expand All @@ -60,7 +60,7 @@ typedef KMX_DWORD* PKMX_DWORD;

#ifdef USE_CHAR16_T
#define lpuch(x) u ## x
typedef km_kbp_cp KMX_UCHAR;
typedef km_core_cp KMX_UCHAR;
#else
#define lpuch(x) L ## x
typedef wchar_t KMX_UCHAR;
Expand Down
3 changes: 2 additions & 1 deletion common/include/kmx_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ namespace kmx {
#define VERSION_150 0x00000F00

#define VERSION_160 0x00001000
#define VERSION_170 0x00001100

#define VERSION_MIN VERSION_50
#define VERSION_MAX VERSION_160
#define VERSION_MAX VERSION_170

//
// Backspace types
Expand Down
2 changes: 1 addition & 1 deletion common/include/test_assert.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#endif
#define try_status(expr) { \
auto __s = (expr); \
if (__s != KM_KBP_STATUS_OK) { \
if (__s != KM_CORE_STATUS_OK) { \
_assert_failed(__s, u ## #expr); \
} \
}
Expand Down
4 changes: 1 addition & 3 deletions common/models/templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
"exports": {
".": "./build/obj/index.js",
"./lib": {
"types": "./build/lib/index.d.ts",
"import": "./build/lib/index.mjs",
"require": "./build/lib/index.cjs"
"types": "./build/lib/index.d.ts"
},
"./obj/*.js": "./build/obj/*.js"
},
Expand Down
3 changes: 1 addition & 2 deletions common/models/wordbreakers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"exports": {
".": "./build/obj/index.js",
"./lib": {
"import": "./build/lib/index.mjs",
"require": "./build/lib/index.cjs"
"types": "./build/lib/index.d.ts"
},
"./obj/*.js": "./build/obj/*.js"
},
Expand Down
28 changes: 0 additions & 28 deletions common/predictive-text/testing/index.html

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6269bff

Please sign in to comment.