Commit graph

93 commits

Author SHA1 Message Date
Darcy Wong
33e216fbc6 fix(android): Update KMSample1 when changing orientation 2025-09-03 09:47:43 +07:00
Darcy Wong
e5291fc90b fix(android): Remove flatDir from other Gradle files 2025-08-22 09:08:34 +07:00
Darcy Wong
77b56c5018 maint(android): Cleanup builder_describe_outputs for configure action 2025-08-20 12:49:42 +07:00
Marc Durdin
81c807c257 chore(common): Merge branch 'master' into maint/common/14453-move-ci-scripts 2025-08-19 10:46:11 +02:00
Darcy Wong
c30ec23be9
Merge pull request #14514 from keymanapp/fix/android/samples-edge-to-edge
fix(android): Update Sample, Test, and FirstVoices apps for edge to edge 🪟
2025-08-18 14:30:51 +07:00
Darcy Wong
5e62747cf1
Merge branch 'master' into main/android/taregt-api-35 2025-08-12 15:36:25 +07:00
Marc Durdin
a81138c62b
Merge pull request #14449 from keymanapp/maint/common/14065-consolidate-builder-scripts
maint(common): consolidate builder scripts 🐸
2025-08-12 10:41:09 +07:00
Marc Durdin
f95b26ac1f
Merge pull request #14446 from keymanapp/maint/common/14275-rename-and-cleanup-shellHelperFunctions.sh
maint(common): rename shellHelperFunctions.sh to utils.inc.sh 🐸
2025-08-12 10:40:59 +07:00
Darcy Wong
3ceccfc054 chore(android): Specify Java language version 21
Resolves Gradle deprecation and language version warnings
```gradle
Java compiler version 21 has deprecated support for compiling with source/target version 8.
```

The `java.toolchain.languageVersion` syntax is a superset that covers the previous syntax `android.compileOptions`
2025-08-11 11:44:51 +07:00
Darcy Wong
0992061c41 fix(android): Update Sample and Test apps to edge-to-edge 2025-08-07 13:38:24 +07:00
Marc Durdin
f3fb3ac87b maint(common): move build-utils-ci.inc.sh to ci/ci-publish.inc.sh
Removes a number of unused functions from the file, renames remaining
functions to match our builder script prefix patterns, removes unused
imports from various build scripts (e.g. Android).

Fixes: #14453
2025-08-05 12:54:56 +10:00
Marc Durdin
f394245636 maint(common): consolidate builder scripts
Clarifies the confusing builder.inc.sh / build-utils.sh distinction by
giving the scripts more appropriate names. Most build scripts should use
builder-full.inc.sh; some helper scripts can use builder-basic.inc.sh.
Documented in resources/build/README.md.

Renames:
* resources/build/builder.inc.sh to resources/build/builder-full.inc.sh
* resources/build/build-utils.sh to resources/build/builder-basic.inc.sh

Other changes:
* Moves Android-specific functions out of builder-basic.inc.sh and into
  android/build.sh.
* Renames functions in builder-basic.inc.sh

More functions may be moved from builder-basic.inc.sh into utils.inc.sh
or other scripts in the future.

Fixes: #14065
Build-bot: build all
Test-bot: skip
2025-08-02 08:11:24 +10:00
Marc Durdin
65158a0526 maint(common): rename shellHelperFunctions.sh to utils.inc.sh
Adds documentation for various functions, removes unused functions (a
couple of simple, very lightly used functions were unDRYed; these could
go back the other way across all shell scripts if necessary). TODO items
noted for follow-up refactoring.

Fixes: #14275
Relates-to: #14269
Build-bot: build all
Test-bot: skip
2025-08-02 06:58:40 +10:00
Darcy Wong
d694ab0889 fix(android): Update compileSdk to 35 2025-07-29 10:07:18 +07:00
Darcy Wong
ed7c0caf9d maint(android): Update Android Target API to 35 2025-07-24 08:04:50 +07:00
Darcy Wong
428178ce8c maint(android): Update Java and Gradle for Sample projects 2025-05-09 09:31:17 +07:00
Darcy Wong
b9f1f51a33 chore(android): Use builder_is_ci_build rather than --ci flag 2025-04-28 10:42:52 +07:00
Darcy Wong
072aa7d21f chore(android): update Gradle wrapper version 2024-05-14 13:55:52 +07:00
Darcy Wong
dd20ae30d0 chore(android/samples): Update dependencies 2024-05-08 07:58:58 +07:00
Marc Durdin
cd8121ef65 chore(common): builder scripts now use /resources/build/builder.inc.sh
Note: there is a bit of potential confusion about the difference between
/resources/builder.inc.sh (the full implementation for builder scripts),
and /resources/build/builder.inc.sh (the source script that builder
scripts should always use).

This allows us to make assumptions that will always be true for builder
scripts that may not be true for other scripts, such as setting base
folder.
2024-05-02 15:54:31 +07:00
Marc Durdin
0f390d47cc chore(common): maintenance on build scripts - cd
Fixes #11324.

* Always `cd "$THIS_SCRIPT_PATH"`
* Remove unnecessary `cd` from all build.sh
* Remove unnecessary `set -eu` from all build.sh (and `# set -x`)
* Replace old build-utils.sh incantation in a few build.sh scripts
2024-05-02 15:54:29 +07:00
Darcy Wong
fdb14f2582 chore(android): Update targetSdkVersion to 34 2024-01-16 09:26:24 +07:00
Darcy Wong
89fde7a447 fix(android/samples): Cleanup Sample/Tests apk's 2023-06-16 07:39:41 -05:00
Darcy Wong
8d296568ce chore(android): Move namespace to gradle files 2023-04-25 14:39:15 +07:00
Darcy Wong
cd2d2b794b fix(android): Move cp from configure to build actions 2023-03-31 13:22:28 +07:00
Darcy Wong
ff6d5dbd44 chore(android): Update Android projects for Java 11 2023-03-29 09:46:27 +07:00
Darcy Wong
9948407ee9 chore(android): Update gradle-wrapper to 7.5.1 2023-03-29 09:46:27 +07:00
Darcy Wong
30859f8d2c chore(android/samples): Add todo comments for builder tests 2023-03-16 09:27:59 +07:00
Darcy Wong
3d57f17c83 fix(android/samples): Define empty builder test steps 2023-03-16 09:20:31 +07:00
Darcy Wong
1a8d047ba1
Apply suggestions from code review
Co-authored-by: Marc Durdin <marc@durdin.net>
2023-03-13 11:13:14 +07:00
Darcy Wong
78adb337a1 refactor(android): Use builder_is_debug_build 2023-03-08 09:57:36 +07:00
Darcy Wong
55349e32cf fix(android): Have top level builder handle cleaning up upload 2023-03-03 13:21:16 +07:00
Darcy Wong
6ab7068e0c
Apply suggestions from code review
Co-authored-by: Marc Durdin <marc@durdin.net>
2023-03-03 07:57:42 +07:00
Darcy Wong
8e140a34a0 fix(android/samples): CONFIG typo 2023-03-02 09:15:35 +07:00
Darcy Wong
f70044029c fix(android): Configure path 2023-02-28 08:41:55 +07:00
Darcy Wong
90b1bc82f2 fix(android): Include config in path to keyman-engine.aar 2023-02-27 11:42:24 +07:00
Darcy Wong
e1820013c6 fix(android): Fix output paths 2023-02-24 13:46:00 +07:00
Darcy Wong
7a1f80e70d fix(android): Update configure actions 2023-02-24 11:33:26 +07:00
Darcy Wong
132e7f6f86 chore(android/samples): Tidy up Sample builder scripts 2023-02-23 13:56:58 +07:00
Darcy Wong
0555028892 refactor(android/samples): Update KMSample builder scripts 2023-02-23 11:43:10 +07:00
Darcy Wong
cf2c402462 chore(android): Merge remote-tracking branch 'origin/master' into refactor/android/builder-script 2023-02-03 13:13:24 +07:00
Darcy Wong
a11164c57b chore(android): Merge branch 'master' into refactor/android/builder-script 2023-01-12 15:17:36 +07:00
Darcy Wong
92c982723c chore(android/samples): Update namespace for Sample apps 2023-01-06 09:04:12 +07:00
Darcy Wong
ad3fd833e3 chore(android): Merge remote-tracking branch 'origin/master' into refactor/android/builder-script 2022-12-15 16:06:00 +07:00
Darcy Wong
a4ff79037e chore(android/samples): Remove Sentry dependencies 2022-12-14 07:03:16 +07:00
Darcy Wong
2a0368bc54 chore(android): Update Gradle dependencies 2022-12-13 11:26:35 +07:00
Darcy Wong
6a8865d0b6 chore(android): Update Target SDK Version to 31 2022-11-18 08:48:58 +07:00
Darcy Wong
e7e8dc6908 chore(android/samples): Update builder scripts 2022-10-20 11:05:45 +07:00
Darcy Wong
f21ffde0fc fix(android/engine): Add language name when installing lexical-model 2022-09-22 14:28:54 +07:00
Marc Durdin
767927bf16 chore(common): use /usr/bin/env bash
Fixes up scripts (except under /linux) to use `#!/usr/bin/env bash`
instead of `#!/bin/bash` or `#!/bin/sh` so that we don't end up with
the ancient version of bash supplied with macOS.

This became urgent with this PR, because of bash-4.xisms in
build-utils.sh, for example on line 572:

```
if [[ -v _builder_params[$e] ]]; then
```
2022-07-25 14:59:37 +10:00