@saltcorn/mobile-builder 1.1.0-beta.21 → 1.1.0-beta.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/mobile-builder.d.ts +1 -1
- package/dist/mobile-builder.d.ts.map +1 -1
- package/dist/mobile-builder.js +2 -1
- package/dist/mobile-builder.js.map +1 -1
- package/dist/tests/versioncode.test.d.ts +2 -0
- package/dist/tests/versioncode.test.d.ts.map +1 -0
- package/dist/tests/versioncode.test.js +23 -0
- package/dist/tests/versioncode.test.js.map +1 -0
- package/dist/utils/capacitor-helper.d.ts +2 -0
- package/dist/utils/capacitor-helper.d.ts.map +1 -1
- package/dist/utils/capacitor-helper.js +18 -8
- package/dist/utils/capacitor-helper.js.map +1 -1
- package/dist/utils/common-build-utils.d.ts +8 -1
- package/dist/utils/common-build-utils.d.ts.map +1 -1
- package/dist/utils/common-build-utils.js +33 -5
- package/dist/utils/common-build-utils.js.map +1 -1
- package/docker/entry.bash +9 -4
- package/package.json +8 -8
package/dist/mobile-builder.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"AAIA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAqBlD,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAI9C,aAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAItC,aAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,
|
|
1
|
+
{"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"AAIA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAqBlD,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAI9C,aAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAItC,aAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,GAAG,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,SAA0B;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAE/B;;;OAGG;gBACS,GAAG,EAAE,mBAAmB;IAoCpC;;OAEG;IACG,KAAK;CAgFZ"}
|
package/dist/mobile-builder.js
CHANGED
|
@@ -28,7 +28,7 @@ class MobileBuilder {
|
|
|
28
28
|
this.appId = `${(0, utils_1.removeNonWordChars)(cfg.appName)}.mobile.app`;
|
|
29
29
|
else
|
|
30
30
|
this.appId = appIdDefault;
|
|
31
|
-
this.appVersion = cfg.appVersion;
|
|
31
|
+
this.appVersion = cfg.appVersion || "0.0.1";
|
|
32
32
|
this.appIcon = cfg.appIcon;
|
|
33
33
|
this.templateDir = cfg.templateDir;
|
|
34
34
|
this.buildDir = cfg.buildDir;
|
|
@@ -109,6 +109,7 @@ class MobileBuilder {
|
|
|
109
109
|
(0, fs_extra_1.copySync)(this.keyStorePath, (0, path_1.join)(this.buildDir, (0, path_1.basename)(this.keyStorePath)));
|
|
110
110
|
const capacitorHelper = new capacitor_helper_1.CapacitorHelper({
|
|
111
111
|
...this,
|
|
112
|
+
appVersion: this.appVersion,
|
|
112
113
|
appleTeamId: iosParams?.teamId,
|
|
113
114
|
provisioningGUUID: iosParams?.guuid,
|
|
114
115
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-builder.js","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":";;;AAAA,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACzD,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACpE,+BAAsC;AACtC,uCAAoC;AAEpC,mEAcoC;AACpC,uEAIsC;AAEtC,+DAA2D;AAC3D,gDAA0D;AAG1D,MAAM,YAAY,GAAG,qBAAqB,CAAC;AAC3C,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAiC3C;;GAEG;AACH,MAAa,aAAa;IAgCxB;;;OAGG;IACH,YAAY,GAAwB;QAfpC,gBAAW,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAgBnC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,cAAc,CAAC;QAC7C,IAAI,GAAG,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;aACjC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,KAAK,cAAc;YACpD,IAAI,CAAC,KAAK,GAAG,GAAG,IAAA,0BAAkB,EAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;;YAC1D,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"mobile-builder.js","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"versioncode.test.d.ts","sourceRoot":"","sources":["../../tests/versioncode.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const common_build_utils_1 = require("../utils/common-build-utils");
|
|
4
|
+
describe("versioncode tests", () => {
|
|
5
|
+
it("should generate version code", () => {
|
|
6
|
+
expect((0, common_build_utils_1.generateAndroidVersionCode)("0.0.1")).toBe(1);
|
|
7
|
+
expect((0, common_build_utils_1.generateAndroidVersionCode)("1.0.0")).toBe(1000000);
|
|
8
|
+
expect((0, common_build_utils_1.generateAndroidVersionCode)("1.1.0")).toBe(1001000);
|
|
9
|
+
expect((0, common_build_utils_1.generateAndroidVersionCode)("1.1.1")).toBe(1001001);
|
|
10
|
+
expect((0, common_build_utils_1.generateAndroidVersionCode)("1.1.999")).toBe(1001999);
|
|
11
|
+
expect((0, common_build_utils_1.generateAndroidVersionCode)("1.999.1")).toBe(1999001);
|
|
12
|
+
expect((0, common_build_utils_1.generateAndroidVersionCode)("0.999.1")).toBe(999001);
|
|
13
|
+
});
|
|
14
|
+
it("should throw error for invalid version", () => {
|
|
15
|
+
expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("")).toThrow();
|
|
16
|
+
expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1")).toThrow();
|
|
17
|
+
expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1.")).toThrow();
|
|
18
|
+
expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1000.1.1")).toThrow();
|
|
19
|
+
expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1000.1")).toThrow();
|
|
20
|
+
expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1.1000")).toThrow();
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
//# sourceMappingURL=versioncode.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"versioncode.test.js","sourceRoot":"","sources":["../../tests/versioncode.test.ts"],"names":[],"mappings":";;AAAA,oEAAyE;AAEzE,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEpD,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1D,MAAM,CAAC,IAAA,+CAA0B,EAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAA,+CAA0B,EAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAA,+CAA0B,EAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACvD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAE3D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -4,6 +4,7 @@ export declare type CapacitorCfg = {
|
|
|
4
4
|
platforms: string[];
|
|
5
5
|
buildType: "debug" | "release";
|
|
6
6
|
appName: string;
|
|
7
|
+
appVersion: string;
|
|
7
8
|
useDocker?: boolean;
|
|
8
9
|
keyStorePath?: string;
|
|
9
10
|
keyStoreAlias?: string;
|
|
@@ -16,6 +17,7 @@ export declare class CapacitorHelper {
|
|
|
16
17
|
platforms: string[];
|
|
17
18
|
buildType: "debug" | "release";
|
|
18
19
|
appName: string;
|
|
20
|
+
appVersion: string;
|
|
19
21
|
useDocker?: boolean;
|
|
20
22
|
keyStoreFile?: string;
|
|
21
23
|
keyStoreAlias?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capacitor-helper.d.ts","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"capacitor-helper.d.ts","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAgBnD,oBAAY,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,qBAAa,eAAe;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;gBAEH,GAAG,EAAE,YAAY;IAqBhB,QAAQ;IA6Bd,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM;IA8BpE,OAAO,CAAC,YAAY;IAkCpB,OAAO,CAAC,cAAc;IAgBtB,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,eAAe;IA8BvB,OAAO,CAAC,UAAU;IAmClB,OAAO,CAAC,OAAO;CAgBhB"}
|
|
@@ -18,6 +18,7 @@ class CapacitorHelper {
|
|
|
18
18
|
this.platforms = cfg.platforms;
|
|
19
19
|
this.buildType = cfg.buildType || "debug";
|
|
20
20
|
this.appName = cfg.appName;
|
|
21
|
+
this.appVersion = cfg.appVersion;
|
|
21
22
|
this.useDocker = cfg.useDocker;
|
|
22
23
|
this.keyStoreFile = cfg.keyStorePath
|
|
23
24
|
? (0, path_1.basename)(cfg.keyStorePath)
|
|
@@ -39,19 +40,25 @@ class CapacitorHelper {
|
|
|
39
40
|
await (0, common_build_utils_1.modifyAndroidManifest)(this.buildDir);
|
|
40
41
|
(0, common_build_utils_1.writeDataExtractionRules)(this.buildDir);
|
|
41
42
|
(0, common_build_utils_1.writeNetworkSecurityConfig)(this.buildDir);
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
(0, common_build_utils_1.modifyGradleConfig)({
|
|
44
|
+
buildDir: this.buildDir,
|
|
45
|
+
appVersion: this.appVersion,
|
|
46
|
+
keyStoreFile: this.keyStoreFile,
|
|
47
|
+
keyStoreAlias: this.keyStoreAlias,
|
|
48
|
+
keyStorePassword: this.keyStorePassword,
|
|
49
|
+
});
|
|
44
50
|
this.gradleBuild();
|
|
45
51
|
}
|
|
46
|
-
if (this.isIOS) {
|
|
47
|
-
(0, common_build_utils_1.writePodfile)(this.buildDir);
|
|
48
|
-
await (0, common_build_utils_1.modifyInfoPlist)(this.buildDir);
|
|
49
|
-
(0, common_build_utils_1.writePrivacyInfo)(this.buildDir);
|
|
50
|
-
this.xCodeBuild();
|
|
51
|
-
}
|
|
52
52
|
}
|
|
53
53
|
else
|
|
54
54
|
this.buildWithDocker();
|
|
55
|
+
if (this.isIOS) {
|
|
56
|
+
(0, common_build_utils_1.modifyXcodeProjectFile)(this.buildDir, this.appVersion);
|
|
57
|
+
(0, common_build_utils_1.writePodfile)(this.buildDir);
|
|
58
|
+
await (0, common_build_utils_1.modifyInfoPlist)(this.buildDir);
|
|
59
|
+
(0, common_build_utils_1.writePrivacyInfo)(this.buildDir);
|
|
60
|
+
this.xCodeBuild();
|
|
61
|
+
}
|
|
55
62
|
}
|
|
56
63
|
tryCopyAppFiles(copyDir, user, appName) {
|
|
57
64
|
const copyHelper = async (ending, apkBuildDir) => {
|
|
@@ -119,6 +126,7 @@ class CapacitorHelper {
|
|
|
119
126
|
`\n\n${result.error.toString()}`);
|
|
120
127
|
}
|
|
121
128
|
gradleBuild() {
|
|
129
|
+
console.log("gradlew build");
|
|
122
130
|
const result = (0, child_process_1.spawnSync)("./gradlew", [this.buildType === "release" ? "bundleRelease" : "assembleDebug"], {
|
|
123
131
|
cwd: this.buildDir + "/android",
|
|
124
132
|
maxBuffer: 1024 * 1024 * 10,
|
|
@@ -134,6 +142,7 @@ class CapacitorHelper {
|
|
|
134
142
|
`\n\n${result.error.toString()}`);
|
|
135
143
|
}
|
|
136
144
|
buildWithDocker() {
|
|
145
|
+
console.log("building with docker");
|
|
137
146
|
const spawnParams = [
|
|
138
147
|
"run",
|
|
139
148
|
"--network",
|
|
@@ -143,6 +152,7 @@ class CapacitorHelper {
|
|
|
143
152
|
"saltcorn/capacitor-builder",
|
|
144
153
|
];
|
|
145
154
|
spawnParams.push(this.buildType);
|
|
155
|
+
spawnParams.push(this.appVersion);
|
|
146
156
|
if (this.keyStoreFile)
|
|
147
157
|
spawnParams.push(this.keyStoreFile, this.keyStoreAlias || "??", this.keyStorePassword || "??");
|
|
148
158
|
const result = (0, child_process_1.spawnSync)("docker", spawnParams, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capacitor-helper.js","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAoD;AACpD,+BAAsC;AACtC,2BAA2C;AAC3C,uCAAoC;AAEpC,8CAA+C;AAC/C,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;AAC7C,sEAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"capacitor-helper.js","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,5 +85,12 @@ export declare function createSqliteDb(buildDir: string): Promise<number | null>
|
|
|
85
85
|
*/
|
|
86
86
|
export declare function prepareSplashPage(buildDir: string, pageName: string, serverUrl: string, tenantAppName?: string, user?: User): Promise<void>;
|
|
87
87
|
export declare function writePodfile(buildDir: string): void;
|
|
88
|
-
|
|
88
|
+
/**
|
|
89
|
+
* replace the MARKETING_VERSION in project.pbxproj
|
|
90
|
+
* @param buildDir
|
|
91
|
+
* @param appVersion new app version
|
|
92
|
+
*/
|
|
93
|
+
export declare function modifyXcodeProjectFile(buildDir: string, appVersion: string): void;
|
|
94
|
+
export declare function generateAndroidVersionCode(appVersion: string): number;
|
|
95
|
+
export declare function modifyGradleConfig({ buildDir, appVersion, keyStoreFile, keyStoreAlias, keyStorePassword, }: any): void;
|
|
89
96
|
//# sourceMappingURL=common-build-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-build-utils.d.ts","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAQnD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"common-build-utils.d.ts","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAQnD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAoCpE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAkDjE;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAY5D;AAED,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,iBAqC3D;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,QA8BxD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAiCvE;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,QAqB1D;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,iBAkBlE;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,iBAepB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EAAE,iBAkCpB;AA4CD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,mBAAmB,EAAE,MAAM,QA4B5B;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,iBAuBrD;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM;;;GAoB5B;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,QAqBhD;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,QA8B/C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,QA8BhD;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,iBA4BlD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,UAAU,EACV,cAAc,EACd,UAAU,EACV,eAAe,EACf,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,GACjB,EAAE,GAAG,QAoBL;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,MAAM,EAAE,iBA0C3B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,QAepD;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,0BAmBpD;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,EACtB,IAAI,CAAC,EAAE,IAAI,iBAmDZ;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,QAiD5C;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAc1E;AAED,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,UAS5D;AAED,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,GACjB,EAAE,GAAG,QA6BL"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.modifyGradleConfig = exports.writePodfile = exports.prepareSplashPage = exports.createSqliteDb = exports.copyTranslationFiles = exports.buildTablesFile = exports.writeCfgFile = exports.copySiteLogo = exports.copySbadmin2Deps = exports.copyServerFiles = exports.writePrivacyInfo = exports.decodeProvisioningProfile = exports.modifyInfoPlist = exports.prepareExportOptionsPlist = exports.prepareSplashIcon = exports.prepareAppIcon = exports.modifyConfigXml = exports.writeNetworkSecurityConfig = exports.copyPrepopulatedDb = exports.writeDataExtractionRules = exports.modifyAndroidManifest = exports.prepAppIcon = exports.writeCapacitorConfig = exports.prepareBuildDir = void 0;
|
|
6
|
+
exports.modifyGradleConfig = exports.generateAndroidVersionCode = exports.modifyXcodeProjectFile = exports.writePodfile = exports.prepareSplashPage = exports.createSqliteDb = exports.copyTranslationFiles = exports.buildTablesFile = exports.writeCfgFile = exports.copySiteLogo = exports.copySbadmin2Deps = exports.copyServerFiles = exports.writePrivacyInfo = exports.decodeProvisioningProfile = exports.modifyInfoPlist = exports.prepareExportOptionsPlist = exports.prepareSplashIcon = exports.prepareAppIcon = exports.modifyConfigXml = exports.writeNetworkSecurityConfig = exports.copyPrepopulatedDb = exports.writeDataExtractionRules = exports.modifyAndroidManifest = exports.prepAppIcon = exports.writeCapacitorConfig = exports.prepareBuildDir = void 0;
|
|
7
7
|
const index_1 = __importDefault(require("@saltcorn/data/db/index"));
|
|
8
8
|
const utils = require("@saltcorn/data/utils");
|
|
9
9
|
const { getSafeSaltcornCmd } = utils;
|
|
@@ -42,6 +42,7 @@ function prepareBuildDir(buildDir, templateDir) {
|
|
|
42
42
|
"@capacitor/geolocation@6.0.2",
|
|
43
43
|
"@capacitor/network@6.0.3",
|
|
44
44
|
"@capacitor-community/sqlite@6.0.2",
|
|
45
|
+
"@capacitor/screen-orientation@6.0.3",
|
|
45
46
|
];
|
|
46
47
|
result = (0, child_process_1.spawnSync)("npm", ["install", ...capDepsAndPlugins], {
|
|
47
48
|
cwd: buildDir,
|
|
@@ -679,13 +680,39 @@ function writePodfile(buildDir) {
|
|
|
679
680
|
});
|
|
680
681
|
}
|
|
681
682
|
exports.writePodfile = writePodfile;
|
|
682
|
-
|
|
683
|
+
/**
|
|
684
|
+
* replace the MARKETING_VERSION in project.pbxproj
|
|
685
|
+
* @param buildDir
|
|
686
|
+
* @param appVersion new app version
|
|
687
|
+
*/
|
|
688
|
+
function modifyXcodeProjectFile(buildDir, appVersion) {
|
|
689
|
+
const projectFile = (0, path_1.join)(buildDir, "ios", "App", "App.xcodeproj", "project.pbxproj");
|
|
690
|
+
const content = (0, fs_extra_1.readFileSync)(projectFile, "utf8");
|
|
691
|
+
const newContent = content.replaceAll(/MARKETING_VERSION = 1.0;/g, `MARKETING_VERSION = ${appVersion};`);
|
|
692
|
+
(0, fs_extra_1.writeFileSync)(projectFile, newContent, "utf8");
|
|
693
|
+
}
|
|
694
|
+
exports.modifyXcodeProjectFile = modifyXcodeProjectFile;
|
|
695
|
+
function generateAndroidVersionCode(appVersion) {
|
|
696
|
+
if (!/^\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(appVersion) || appVersion === "0.0.0")
|
|
697
|
+
throw new Error(`Invalid app version '${appVersion}'`);
|
|
698
|
+
const parts = appVersion.split(".");
|
|
699
|
+
return (parseInt(parts[0]) * 1000000 +
|
|
700
|
+
parseInt(parts[1]) * 1000 +
|
|
701
|
+
parseInt(parts[2]));
|
|
702
|
+
}
|
|
703
|
+
exports.generateAndroidVersionCode = generateAndroidVersionCode;
|
|
704
|
+
function modifyGradleConfig({ buildDir, appVersion, keyStoreFile, keyStoreAlias, keyStorePassword, }) {
|
|
683
705
|
const gradleFile = (0, path_1.join)(buildDir, "android", "app", "build.gradle");
|
|
684
706
|
const gradleContent = (0, fs_extra_1.readFileSync)(gradleFile, "utf8");
|
|
685
|
-
const
|
|
686
|
-
|
|
707
|
+
const versionCode = generateAndroidVersionCode(appVersion);
|
|
708
|
+
let newGradleContent = gradleContent
|
|
709
|
+
.replace(/versionName "1.0"/, `versionName "${appVersion}"`)
|
|
710
|
+
.replace(/versionCode 1/, `versionCode ${versionCode}`);
|
|
711
|
+
if (keyStoreFile) {
|
|
712
|
+
newGradleContent = gradleContent
|
|
713
|
+
.replace(/release\s*{/, `release {
|
|
687
714
|
signingConfig signingConfigs.release`)
|
|
688
|
-
|
|
715
|
+
.replace(/buildTypes\s*{/, `
|
|
689
716
|
signingConfigs {
|
|
690
717
|
release {
|
|
691
718
|
keyAlias '${keyStoreAlias}'
|
|
@@ -695,6 +722,7 @@ function modifyGradleConfig(buildDir, keyStoreFile, keyStoreAlias, keyStorePassw
|
|
|
695
722
|
}
|
|
696
723
|
}
|
|
697
724
|
buildTypes {`);
|
|
725
|
+
}
|
|
698
726
|
(0, fs_extra_1.writeFileSync)(gradleFile, newGradleContent, "utf8");
|
|
699
727
|
}
|
|
700
728
|
exports.modifyGradleConfig = modifyGradleConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-build-utils.js","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"common-build-utils.js","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"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"}
|
package/docker/entry.bash
CHANGED
|
@@ -3,11 +3,13 @@
|
|
|
3
3
|
set -e
|
|
4
4
|
|
|
5
5
|
BUILD_TYPE="$1"
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
APP_VERSION="$2"
|
|
7
|
+
KEYSTORE_FILE="$3"
|
|
8
|
+
KEYSTORE_ALIAS="$4"
|
|
9
|
+
KEYSTORE_PASSWORD="$5"
|
|
9
10
|
|
|
10
11
|
echo "BUILD_TYPE: $BUILD_TYPE"
|
|
12
|
+
echo "APP_VERSION: $APP_VERSION"
|
|
11
13
|
echo "KEYSTORE_FILE: $KEYSTORE_FILE"
|
|
12
14
|
echo "KEYSTORE_ALIAS: $KEYSTORE_ALIAS"
|
|
13
15
|
#echo "KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD"
|
|
@@ -82,7 +84,10 @@ cd ./android
|
|
|
82
84
|
# modify gradle config for keystore
|
|
83
85
|
if [ -n "$KEYSTORE_FILE" ]; then
|
|
84
86
|
echo "building signed app with keystore"
|
|
85
|
-
npm run modify-gradle-cfg -- --keystore-file=$KEYSTORE_FILE --keystore-alias=$KEYSTORE_ALIAS --keystore-password=$KEYSTORE_PASSWORD
|
|
87
|
+
npm run modify-gradle-cfg -- --app-version=$APP_VERSION --keystore-file=$KEYSTORE_FILE --keystore-alias=$KEYSTORE_ALIAS --keystore-password=$KEYSTORE_PASSWORD
|
|
88
|
+
else
|
|
89
|
+
echo "building unsigned app"
|
|
90
|
+
npm run modify-gradle-cfg -- --app-version=$APP_VERSION
|
|
86
91
|
fi
|
|
87
92
|
|
|
88
93
|
if [ "$BUILD_TYPE" == "release" ]; then
|
package/package.json
CHANGED
|
@@ -3,20 +3,20 @@
|
|
|
3
3
|
"description": "plugin to to build a mobile app from a tenant application",
|
|
4
4
|
"homepage": "https://saltcorn.com",
|
|
5
5
|
"repository": "github:saltcorn/saltcorn",
|
|
6
|
-
"version": "1.1.0-beta.
|
|
6
|
+
"version": "1.1.0-beta.22",
|
|
7
7
|
"author": "Christian Hugo",
|
|
8
8
|
"scripts": {
|
|
9
9
|
"test": "jest ./tests/ --runInBand",
|
|
10
10
|
"build": "webpack --mode development"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@saltcorn/markup": "1.1.0-beta.
|
|
14
|
-
"@saltcorn/data": "1.1.0-beta.
|
|
15
|
-
"@saltcorn/db-common": "1.1.0-beta.
|
|
16
|
-
"@saltcorn/server": "1.1.0-beta.
|
|
17
|
-
"@saltcorn/base-plugin": "1.1.0-beta.
|
|
18
|
-
"@saltcorn/sbadmin2": "1.1.0-beta.
|
|
19
|
-
"@saltcorn/mobile-app": "1.1.0-beta.
|
|
13
|
+
"@saltcorn/markup": "1.1.0-beta.22",
|
|
14
|
+
"@saltcorn/data": "1.1.0-beta.22",
|
|
15
|
+
"@saltcorn/db-common": "1.1.0-beta.22",
|
|
16
|
+
"@saltcorn/server": "1.1.0-beta.22",
|
|
17
|
+
"@saltcorn/base-plugin": "1.1.0-beta.22",
|
|
18
|
+
"@saltcorn/sbadmin2": "1.1.0-beta.22",
|
|
19
|
+
"@saltcorn/mobile-app": "1.1.0-beta.22",
|
|
20
20
|
"fs-extra": "^10.0.1",
|
|
21
21
|
"live-plugin-manager": "^0.17.1",
|
|
22
22
|
"resize-with-sharp-or-jimp": "0.1.8",
|