Skip to content

Commit 7517950

Browse files
committed
fix : Update Maven command functions
1 parent e2796b8 commit 7517950

File tree

1 file changed

+20
-6
lines changed
  • src/tools/appautomate-utils/appium-sdk/languages

1 file changed

+20
-6
lines changed

src/tools/appautomate-utils/appium-sdk/languages/java.ts

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export function getJavaAppFrameworkForMaven(framework: string): string {
5252
function getMavenCommandForWindows(
5353
framework: string,
5454
mavenFramework: string,
55+
username: string,
56+
accessKey: string,
5557
): string {
5658
return (
5759
`mvn archetype:generate -B ` +
@@ -61,15 +63,17 @@ function getMavenCommandForWindows(
6163
`-DgroupId="${MAVEN_ARCHETYPE_GROUP_ID}" ` +
6264
`-DartifactId="${MAVEN_ARCHETYPE_ARTIFACT_ID}" ` +
6365
`-Dversion="${MAVEN_ARCHETYPE_VERSION}" ` +
64-
`-DBROWSERSTACK_USERNAME="${process.env.BROWSERSTACK_USERNAME}" ` +
65-
`-DBROWSERSTACK_ACCESS_KEY="${process.env.BROWSERSTACK_ACCESS_KEY}" ` +
66+
`-DBROWSERSTACK_USERNAME="${username}" ` +
67+
`-DBROWSERSTACK_ACCESS_KEY="${accessKey}" ` +
6668
`-DBROWSERSTACK_FRAMEWORK="${framework}"`
6769
);
6870
}
6971

7072
function getMavenCommandForUnix(
7173
framework: string,
7274
mavenFramework: string,
75+
username: string,
76+
accessKey: string,
7377
): string {
7478
return (
7579
`mvn archetype:generate -B ` +
@@ -79,8 +83,8 @@ function getMavenCommandForUnix(
7983
`-DgroupId="${MAVEN_ARCHETYPE_GROUP_ID}" ` +
8084
`-DartifactId="${MAVEN_ARCHETYPE_ARTIFACT_ID}" ` +
8185
`-Dversion="${MAVEN_ARCHETYPE_VERSION}" ` +
82-
`-DBROWSERSTACK_USERNAME="${process.env.BROWSERSTACK_USERNAME}" ` +
83-
`-DBROWSERSTACK_ACCESS_KEY="${process.env.BROWSERSTACK_ACCESS_KEY}" ` +
86+
`-DBROWSERSTACK_USERNAME="${username}" ` +
87+
`-DBROWSERSTACK_ACCESS_KEY="${accessKey}" ` +
8488
`-DBROWSERSTACK_FRAMEWORK="${framework}"`
8589
);
8690
}
@@ -98,12 +102,22 @@ export function getJavaSDKCommand(
98102
let mavenCommand: string;
99103

100104
if (isWindows) {
101-
mavenCommand = getMavenCommandForWindows(framework, mavenFramework);
105+
mavenCommand = getMavenCommandForWindows(
106+
framework,
107+
mavenFramework,
108+
username,
109+
accessKey,
110+
);
102111
if (appPath) {
103112
mavenCommand += ` -DBROWSERSTACK_APP="${appPath}"`;
104113
}
105114
} else {
106-
mavenCommand = getMavenCommandForUnix(framework, mavenFramework);
115+
mavenCommand = getMavenCommandForUnix(
116+
framework,
117+
mavenFramework,
118+
username,
119+
accessKey,
120+
);
107121
if (appPath) {
108122
mavenCommand += ` -DBROWSERSTACK_APP="${appPath}"`;
109123
}

0 commit comments

Comments
 (0)