@callstack/brownfield-cli 4.1.0 → 4.2.0
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/brownfield/commands/packageAndroid.d.ts.map +1 -1
- package/dist/brownfield/commands/packageAndroid.js +8 -2
- package/dist/brownfield/commands/publishAndroid.d.ts.map +1 -1
- package/dist/brownfield/commands/publishAndroid.js +8 -2
- package/dist/expoPluginConfig.d.ts +2 -0
- package/dist/expoPluginConfig.d.ts.map +1 -1
- package/dist/expoPluginConfig.js +1 -0
- package/dist/types.d.ts +6 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/schema.json +4 -0
- package/src/brownfield/commands/packageAndroid.ts +17 -4
- package/src/brownfield/commands/publishAndroid.ts +23 -11
- package/src/expoPluginConfig.ts +3 -0
- package/src/types.ts +7 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageAndroid.d.ts","sourceRoot":"","sources":["../../../src/brownfield/commands/packageAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,OAAO,EACL,YAAY,EAGb,MAAM,uBAAuB,CAAC;AAQ/B,eAAO,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"packageAndroid.d.ts","sourceRoot":"","sources":["../../../src/brownfield/commands/packageAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,OAAO,EACL,YAAY,EAGb,MAAM,uBAAuB,CAAC;AAQ/B,eAAO,MAAM,qBAAqB,SAsCjC,CAAC;AAEF,eAAO,MAAM,qBAAqB,cAGjC,CAAC"}
|
|
@@ -8,8 +8,14 @@ import { getProjectInfo } from '../utils/project.js';
|
|
|
8
8
|
import { runBrownieCodegenIfApplicable } from '../../brownie/helpers/runBrownieCodegenIfApplicable.js';
|
|
9
9
|
import { runNavigationCodegenIfApplicable } from '../../navigation/helpers/runNavigationCodegenIfApplicable.js';
|
|
10
10
|
import { mergeBrownfieldConfigWithOptions } from '../../config.js';
|
|
11
|
-
export const packageAndroidCommand = curryOptions(new Command('package:android')
|
|
12
|
-
|
|
11
|
+
export const packageAndroidCommand = curryOptions(new Command('package:android')
|
|
12
|
+
.description('Build Android AAR')
|
|
13
|
+
.option('--use-local-maven', 'Use local Maven for Brownfield plugin resolution'), packageAarOptions).action(actionRunner(async (cliOptions) => {
|
|
14
|
+
const { useLocalMaven, ...restOptions } = cliOptions;
|
|
15
|
+
const options = mergeBrownfieldConfigWithOptions({
|
|
16
|
+
...restOptions,
|
|
17
|
+
...(useLocalMaven ? { useLocalMaven: true } : {}),
|
|
18
|
+
}, 'android');
|
|
13
19
|
const projectRoot = findProjectRoot();
|
|
14
20
|
await runExpoPrebuildIfNeeded({
|
|
15
21
|
projectRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishAndroid.d.ts","sourceRoot":"","sources":["../../../src/brownfield/commands/publishAndroid.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAGL,YAAY,EACb,MAAM,uBAAuB,CAAC;AAQ/B,eAAO,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"publishAndroid.d.ts","sourceRoot":"","sources":["../../../src/brownfield/commands/publishAndroid.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAGL,YAAY,EACb,MAAM,uBAAuB,CAAC;AAQ/B,eAAO,MAAM,qBAAqB,SAsCjC,CAAC;AAEF,eAAO,MAAM,qBAAqB,cAGjC,CAAC"}
|
|
@@ -8,8 +8,14 @@ import { runExpoPrebuildIfNeeded } from '../utils/expo.js';
|
|
|
8
8
|
import { runBrownieCodegenIfApplicable } from '../../brownie/helpers/runBrownieCodegenIfApplicable.js';
|
|
9
9
|
import { runNavigationCodegenIfApplicable } from '../../navigation/helpers/runNavigationCodegenIfApplicable.js';
|
|
10
10
|
import { mergeBrownfieldConfigWithOptions } from '../../config.js';
|
|
11
|
-
export const publishAndroidCommand = curryOptions(new Command('publish:android')
|
|
12
|
-
|
|
11
|
+
export const publishAndroidCommand = curryOptions(new Command('publish:android')
|
|
12
|
+
.description('Publish Android package to Maven local')
|
|
13
|
+
.option('--use-local-maven', 'Use local Maven for Brownfield plugin resolution'), publishLocalAarOptions).action(actionRunner(async (cliOptions) => {
|
|
14
|
+
const { useLocalMaven, ...restOptions } = cliOptions;
|
|
15
|
+
const options = mergeBrownfieldConfigWithOptions({
|
|
16
|
+
...restOptions,
|
|
17
|
+
...(useLocalMaven ? { useLocalMaven: true } : {}),
|
|
18
|
+
}, 'android');
|
|
13
19
|
const projectRoot = findProjectRoot();
|
|
14
20
|
await runExpoPrebuildIfNeeded({
|
|
15
21
|
projectRoot,
|
|
@@ -22,6 +22,7 @@ export type BrownfieldPluginProps = {
|
|
|
22
22
|
artifactId?: string;
|
|
23
23
|
version?: string;
|
|
24
24
|
useLocalGradlePlugin?: boolean;
|
|
25
|
+
useLocalMaven?: boolean;
|
|
25
26
|
missingDimensionStrategies?: string[];
|
|
26
27
|
};
|
|
27
28
|
};
|
|
@@ -35,6 +36,7 @@ export type ResolvedBrownfieldPluginAndroidConfig = {
|
|
|
35
36
|
artifactId: string;
|
|
36
37
|
version: string;
|
|
37
38
|
useLocalGradlePlugin: boolean;
|
|
39
|
+
useLocalMaven: boolean;
|
|
38
40
|
missingDimensionStrategies: string[];
|
|
39
41
|
};
|
|
40
42
|
export type ResolvedBrownfieldPluginIosConfig = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expoPluginConfig.d.ts","sourceRoot":"","sources":["../src/expoPluginConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE;QACJ,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;QAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;KACvC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,iCAAiC,GAAG,IAAI,CAAC;IAC9C,OAAO,EAAE,qCAAqC,GAAG,IAAI,CAAC;CACvD,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,GAAG,CAAC,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AA0DF;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,gBAAgB,GAAG,IAAI,EACnC,WAAW,EAAE,qBAAqB,GACjC,IAAI,CAQN;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,qBAAqB,EAClC,UAAU,EAAE,gBAAgB,GAAG,IAAI,EACnC,UAAU,EAAE,oBAAoB,GAC/B,8BAA8B,
|
|
1
|
+
{"version":3,"file":"expoPluginConfig.d.ts","sourceRoot":"","sources":["../src/expoPluginConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE;QACJ,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;QAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;KACvC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,iCAAiC,GAAG,IAAI,CAAC;IAC9C,OAAO,EAAE,qCAAqC,GAAG,IAAI,CAAC;CACvD,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,GAAG,CAAC,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AA0DF;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,gBAAgB,GAAG,IAAI,EACnC,WAAW,EAAE,qBAAqB,GACjC,IAAI,CAQN;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,qBAAqB,EAClC,UAAU,EAAE,gBAAgB,GAAG,IAAI,EACnC,UAAU,EAAE,oBAAoB,GAC/B,8BAA8B,CA8ChC"}
|
package/dist/expoPluginConfig.js
CHANGED
|
@@ -97,6 +97,7 @@ export function resolveBrownfieldPluginConfig(pluginProps, fileConfig, expoConfi
|
|
|
97
97
|
artifactId: effectiveProps.android?.artifactId ?? androidModuleName,
|
|
98
98
|
version: effectiveProps.android?.version ?? '0.0.1-SNAPSHOT',
|
|
99
99
|
useLocalGradlePlugin: effectiveProps.android?.useLocalGradlePlugin ?? false,
|
|
100
|
+
useLocalMaven: effectiveProps.android?.useLocalMaven ?? false,
|
|
100
101
|
missingDimensionStrategies: effectiveProps.android?.missingDimensionStrategies ?? [],
|
|
101
102
|
}
|
|
102
103
|
: null,
|
package/dist/types.d.ts
CHANGED
|
@@ -70,6 +70,12 @@ export type BrownfieldExpoAndroidConfig = {
|
|
|
70
70
|
* Disabled by default.
|
|
71
71
|
*/
|
|
72
72
|
useLocalGradlePlugin?: boolean;
|
|
73
|
+
/**
|
|
74
|
+
* When true, prefer artifacts from the local Maven repository
|
|
75
|
+
* when resolving the Brownfield plugin dependencies.
|
|
76
|
+
* Disabled by default.
|
|
77
|
+
*/
|
|
78
|
+
useLocalMaven?: boolean;
|
|
73
79
|
/**
|
|
74
80
|
* Missing dimension strategies as dimension + flavor(s), e.g. "type, alpha".
|
|
75
81
|
*/
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/schema.json
CHANGED
|
@@ -84,6 +84,10 @@
|
|
|
84
84
|
"description": "When true, load the Brownfield Gradle plugin from `@callstack/react-native-brownfield/gradle-plugin/brownfield` via `includeBuild` instead of adding the Maven classpath dependency. Disabled by default.",
|
|
85
85
|
"type": "boolean"
|
|
86
86
|
},
|
|
87
|
+
"useLocalMaven": {
|
|
88
|
+
"description": "When true, prefer artifacts from the local Maven repository when resolving the Brownfield plugin dependencies. Disabled by default.",
|
|
89
|
+
"type": "boolean"
|
|
90
|
+
},
|
|
87
91
|
"version": {
|
|
88
92
|
"description": "Maven version used when publishing the AAR.",
|
|
89
93
|
"type": "string"
|
|
@@ -19,12 +19,25 @@ import { runNavigationCodegenIfApplicable } from '../../navigation/helpers/runNa
|
|
|
19
19
|
import { mergeBrownfieldConfigWithOptions } from '../../config.js';
|
|
20
20
|
|
|
21
21
|
export const packageAndroidCommand = curryOptions(
|
|
22
|
-
new Command('package:android')
|
|
22
|
+
new Command('package:android')
|
|
23
|
+
.description('Build Android AAR')
|
|
24
|
+
.option(
|
|
25
|
+
'--use-local-maven',
|
|
26
|
+
'Use local Maven for Brownfield plugin resolution'
|
|
27
|
+
),
|
|
23
28
|
packageAarOptions
|
|
24
29
|
).action(
|
|
25
|
-
actionRunner(
|
|
26
|
-
|
|
27
|
-
|
|
30
|
+
actionRunner(
|
|
31
|
+
async (cliOptions: PackageAarFlags & { useLocalMaven?: boolean }) => {
|
|
32
|
+
const { useLocalMaven, ...restOptions } = cliOptions;
|
|
33
|
+
const options = mergeBrownfieldConfigWithOptions(
|
|
34
|
+
{
|
|
35
|
+
...restOptions,
|
|
36
|
+
...(useLocalMaven ? { useLocalMaven: true } : {}),
|
|
37
|
+
},
|
|
38
|
+
'android'
|
|
39
|
+
);
|
|
40
|
+
const projectRoot = findProjectRoot();
|
|
28
41
|
|
|
29
42
|
await runExpoPrebuildIfNeeded({
|
|
30
43
|
projectRoot,
|
|
@@ -19,13 +19,24 @@ import { runNavigationCodegenIfApplicable } from '../../navigation/helpers/runNa
|
|
|
19
19
|
import { mergeBrownfieldConfigWithOptions } from '../../config.js';
|
|
20
20
|
|
|
21
21
|
export const publishAndroidCommand = curryOptions(
|
|
22
|
-
new Command('publish:android')
|
|
23
|
-
'Publish Android package to Maven local'
|
|
24
|
-
|
|
22
|
+
new Command('publish:android')
|
|
23
|
+
.description('Publish Android package to Maven local')
|
|
24
|
+
.option(
|
|
25
|
+
'--use-local-maven',
|
|
26
|
+
'Use local Maven for Brownfield plugin resolution'
|
|
27
|
+
),
|
|
25
28
|
publishLocalAarOptions
|
|
26
29
|
).action(
|
|
27
|
-
actionRunner(
|
|
28
|
-
|
|
30
|
+
actionRunner(
|
|
31
|
+
async (cliOptions: PublishLocalAarFlags & { useLocalMaven?: boolean }) => {
|
|
32
|
+
const { useLocalMaven, ...restOptions } = cliOptions;
|
|
33
|
+
const options = mergeBrownfieldConfigWithOptions(
|
|
34
|
+
{
|
|
35
|
+
...restOptions,
|
|
36
|
+
...(useLocalMaven ? { useLocalMaven: true } : {}),
|
|
37
|
+
},
|
|
38
|
+
'android'
|
|
39
|
+
);
|
|
29
40
|
const projectRoot = findProjectRoot();
|
|
30
41
|
|
|
31
42
|
await runExpoPrebuildIfNeeded({
|
|
@@ -38,12 +49,13 @@ export const publishAndroidCommand = curryOptions(
|
|
|
38
49
|
await runBrownieCodegenIfApplicable(projectRoot, 'kotlin');
|
|
39
50
|
await runNavigationCodegenIfApplicable(projectRoot);
|
|
40
51
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
52
|
+
await publishLocalAarAction({
|
|
53
|
+
projectRoot,
|
|
54
|
+
pluginConfig: platformConfig,
|
|
55
|
+
moduleName: options.moduleName,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
)
|
|
47
59
|
);
|
|
48
60
|
|
|
49
61
|
export const publishAndroidExample = new ExampleUsage(
|
package/src/expoPluginConfig.ts
CHANGED
|
@@ -24,6 +24,7 @@ export type BrownfieldPluginProps = {
|
|
|
24
24
|
artifactId?: string;
|
|
25
25
|
version?: string;
|
|
26
26
|
useLocalGradlePlugin?: boolean;
|
|
27
|
+
useLocalMaven?: boolean;
|
|
27
28
|
missingDimensionStrategies?: string[];
|
|
28
29
|
};
|
|
29
30
|
};
|
|
@@ -38,6 +39,7 @@ export type ResolvedBrownfieldPluginAndroidConfig = {
|
|
|
38
39
|
artifactId: string;
|
|
39
40
|
version: string;
|
|
40
41
|
useLocalGradlePlugin: boolean;
|
|
42
|
+
useLocalMaven: boolean;
|
|
41
43
|
missingDimensionStrategies: string[];
|
|
42
44
|
};
|
|
43
45
|
|
|
@@ -191,6 +193,7 @@ export function resolveBrownfieldPluginConfig(
|
|
|
191
193
|
version: effectiveProps.android?.version ?? '0.0.1-SNAPSHOT',
|
|
192
194
|
useLocalGradlePlugin:
|
|
193
195
|
effectiveProps.android?.useLocalGradlePlugin ?? false,
|
|
196
|
+
useLocalMaven: effectiveProps.android?.useLocalMaven ?? false,
|
|
194
197
|
missingDimensionStrategies:
|
|
195
198
|
effectiveProps.android?.missingDimensionStrategies ?? [],
|
|
196
199
|
}
|
package/src/types.ts
CHANGED
|
@@ -95,6 +95,13 @@ export type BrownfieldExpoAndroidConfig = {
|
|
|
95
95
|
useLocalGradlePlugin?: boolean;
|
|
96
96
|
|
|
97
97
|
/**
|
|
98
|
+
* When true, prefer artifacts from the local Maven repository
|
|
99
|
+
* when resolving the Brownfield plugin dependencies.
|
|
100
|
+
* Disabled by default.
|
|
101
|
+
*/
|
|
102
|
+
useLocalMaven?: boolean;
|
|
103
|
+
|
|
104
|
+
/**
|
|
98
105
|
* Missing dimension strategies as dimension + flavor(s), e.g. "type, alpha".
|
|
99
106
|
*/
|
|
100
107
|
missingDimensionStrategies?: string[];
|