@@ -29,6 +29,8 @@ def minSdkVer = "";
29
29
def targetSdkVer = " " ;
30
30
def supportVer = " " ;
31
31
32
+ def envVars = new LinkedList<String > ()
33
+
32
34
task checkEnvironmentVariables {
33
35
if (" $System . env . JAVA_HOME " == " " || " $System . env . JAVA_HOME " == " null" ) {
34
36
throw new GradleException (" Set JAVA_HOME to point to the correct Jdk location\n " );
@@ -48,18 +50,23 @@ task checkEnvironmentVariables {
48
50
49
51
if (project. hasProperty(" compileSdk" )) {
50
52
compileSdkVer = " -PcompileSdk=$compileSdk "
53
+ envVars. add(compileSdkVer)
51
54
}
52
55
if (project. hasProperty(" buildToolsVersion" )) {
53
56
buildToolsVer = " -PbuildToolsVersion=$buildToolsVersion "
57
+ envVars. add(buildToolsVer)
54
58
}
55
59
if (project. hasProperty(" minSdk" )) {
56
60
minSdkVer = " -PminSdk=$minSdk "
61
+ envVars. add(minSdkVer)
57
62
}
58
63
if (project. hasProperty(" targetSdk" )) {
59
64
targetSdkVer = " -PtargetSdk=$targetSdk "
65
+ envVars. add(targetSdkVer)
60
66
}
61
67
if (project. hasProperty(" supportVersion" )) {
62
68
supportVer = " -PsupportVersion=$supportVersion "
69
+ envVars. add(supportVer)
63
70
}
64
71
}
65
72
@@ -175,10 +182,20 @@ task generateRuntime (type: Exec) {
175
182
176
183
// command gradlew buildar -PpackageVersion=[from_package.json] -PgitCommitVersion=[from_some_sys_variable]
177
184
if (isWinOs) {
178
- commandLine " cmd" , " /c" , " gradlew" , " buildar" , " -PpackageVersion=${ pVersion} " , " -PgitCommitVersion=${ arVersion} " , compileSdkVer, buildToolsVer, minSdkVer, targetSdkVer, supportVer
185
+ envVars. addFirst(" -PgitCommitVersion=${ arVersion} " );
186
+ envVars. addFirst(" -PpackageVersion=${ pVersion} " );
187
+ envVars. addFirst(" buildar" );
188
+ envVars. addFirst(" gradlew" );
189
+ envVars. addFirst(" /c" );
190
+ envVars. addFirst(" cmd" );
191
+ commandLine envVars. toArray()
179
192
}
180
193
else {
181
- commandLine " ./gradlew" , " buildar" , " -PpackageVersion=${ pVersion} " , " -PgitCommitVersion=${ arVersion} " , compileSdkVer, buildToolsVer, minSdkVer, targetSdkVer, supportVer
194
+ envVars. addFirst(" -PgitCommitVersion=${ arVersion} " );
195
+ envVars. addFirst(" -PpackageVersion=${ pVersion} " );
196
+ envVars. addFirst(" buildar" );
197
+ envVars. addFirst(" ./gradlew" );
198
+ commandLine envVars. toArray();
182
199
}
183
200
}
184
201
}
0 commit comments