Skip to content

Commit 4ca3c63

Browse files
authored
Prefix new android configuration options (#288)
* Prefix android config options with android * Adjust defaults and show build target even for profiles (to show platform options)
1 parent 1c905a9 commit 4ca3c63

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

Tasks/UnityBuild/UnityBuildV3/task.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,8 @@
108108
"type": "pickList",
109109
"label": "Build target",
110110
"defaultValue": "standalone",
111-
"helpMarkDown": "Build platform to build the Unity project for.",
111+
"helpMarkDown": "Build platform to build the Unity project for / the build platform targeted by the specified profile.",
112112
"groupName": "build",
113-
"visibleRule": "buildFlow = platform",
114113
"options": {
115114
"standalone": "Standalone (agent-based)",
116115
"Win": "Windows Standalone (32-bit)",
@@ -210,7 +209,7 @@
210209
"helpMarkDown": "(Optional) Specify additional command line arguments, see the [documentation](https://docs.unity3d.com/Manual/CommandLineArguments.html) for more info."
211210
},
212211
{
213-
"name": "buildAppBundle",
212+
"name": "androidBuildAppBundle",
214213
"type": "boolean",
215214
"label": "Build Android App Bundle (Google Play)",
216215
"groupName": "platform",
@@ -220,54 +219,54 @@
220219
"visibleRule": "buildTarget == Android && buildScriptType == default"
221220
},
222221
{
223-
"name": "signAppBundle",
222+
"name": "androidSignAppBundle",
224223
"type": "boolean",
225224
"label": "Sign APK / app bundle",
226225
"groupName": "platform",
227-
"defaultValue": true,
226+
"defaultValue": false,
228227
"required": false,
229228
"helpMarkDown": "Whether to sign the produced APK / app bundle using a custom keystore.",
230229
"visibleRule": "buildTarget == Android && buildScriptType == default"
231230
},
232231
{
233-
"name": "keystoreName",
232+
"name": "androidKeystoreName",
234233
"type": "filePath",
235234
"helpMarkDown": "Android keystore name / file path.",
236235
"label": "Keystore file path",
237236
"groupName": "platform",
238237
"required": true,
239238
"defaultValue": "",
240-
"visibleRule": "buildTarget == Android && signAppBundle == true && buildScriptType == default"
239+
"visibleRule": "buildTarget == Android && androidSignAppBundle == true && buildScriptType == default"
241240
},
242241
{
243-
"name": "keystorePass",
242+
"name": "androidKeystorePass",
244243
"type": "string",
245244
"label": "Keystore password",
246245
"groupName": "platform",
247246
"helpMarkDown": "Android keystore password.",
248247
"required": true,
249248
"defaultValue": "",
250-
"visibleRule": "buildTarget == Android && signAppBundle == true && buildScriptType == default"
249+
"visibleRule": "buildTarget == Android && androidSignAppBundle == true && buildScriptType == default"
251250
},
252251
{
253-
"name": "keystoreAliasName",
252+
"name": "androidKeystoreAliasName",
254253
"type": "string",
255254
"label": "Keystore alias name",
256255
"groupName": "platform",
257256
"helpMarkDown": "Android key alias name.",
258257
"required": true,
259258
"defaultValue": "",
260-
"visibleRule": "buildTarget == Android && signAppBundle == true && buildScriptType == default"
259+
"visibleRule": "buildTarget == Android && androidSignAppBundle == true && buildScriptType == default"
261260
},
262261
{
263-
"name": "keystoreAliasPass",
262+
"name": "androidKeystoreAliasPass",
264263
"type": "string",
265264
"label": "Keystore alias password",
266265
"groupName": "platform",
267266
"helpMarkDown": "Password for the key used for signing an Android application. If left empty, the keystore main password is assumed.",
268267
"required": false,
269268
"defaultValue": "",
270-
"visibleRule": "buildTarget == Android && signAppBundle == true && buildScriptType == default"
269+
"visibleRule": "buildTarget == Android && androidSignAppBundle == true && buildScriptType == default"
271270
}
272271
],
273272
"outputVariables": [

Tasks/UnityBuild/UnityBuildV3/unity-build.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ const additionalCmdArgsInputVariableName = 'additionalCmdArgs';
2424
const customUnityEditorsPathInputVariableName = 'customUnityEditorsPath';
2525
const cleanBuildInputVariableName = 'Build.Repository.Clean';
2626
const versionSelectionModeVariableName = 'versionSelectionMode';
27-
const signAppBundleInputVariableName = 'signAppBundle';
28-
const keystoreNameInputVariableName = 'keystoreName';
29-
const keystorePassInputVariableName = 'keystorePass';
30-
const keystoreAliasNameInputVariableName = 'keystoreAliasName';
31-
const keystoreAliasPassInputVariableName = 'keystoreAliasPass';
32-
const buildAppBundleInputVariableName = 'buildAppBundle';
27+
const signAppBundleInputVariableName = 'androidSignAppBundle';
28+
const keystoreNameInputVariableName = 'androidKeystoreName';
29+
const keystorePassInputVariableName = 'androidKeystorePass';
30+
const keystoreAliasNameInputVariableName = 'androidKeystoreAliasName';
31+
const keystoreAliasPassInputVariableName = 'androidKeystoreAliasPass';
32+
const buildAppBundleInputVariableName = 'androidBuildAppBundle';
3333
const buildFlowInputVariableName = 'buildFlow';
3434
const buildProfileInputVariableName = 'buildProfile';
3535

0 commit comments

Comments
 (0)