Skip to content

Commit 16de7c8

Browse files
committed
removed unneeded semicolumns in gradle
1 parent 10507bd commit 16de7c8

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ def DIST_FRAMEWORK_PATH = "$DIST_PATH/framework"
2929

3030
task checkEnvironmentVariables {
3131
if ("$System.env.JAVA_HOME" == "" || "$System.env.JAVA_HOME" == "null") {
32-
throw new GradleException("Set JAVA_HOME to point to the correct Jdk location\n");
32+
throw new GradleException("Set JAVA_HOME to point to the correct Jdk location\n")
3333
}
3434

3535
if ("$System.env.ANDROID_HOME" == "" || "$System.env.ANDROID_HOME" == "null") {
36-
throw new GradleException("Set ANDROID_HOME to point to the correct Android SDK location\n");
36+
throw new GradleException("Set ANDROID_HOME to point to the correct Android SDK location\n")
3737
}
3838

3939
if ("$System.env.GIT_COMMIT" == "null" && !project.hasProperty("gitCommitVersion")) {
40-
logger.warn("Warning: The GIT_COMMIT is not set. This NativeScript Android Runtime will not be tagged with the git commit it is build from\n");
40+
logger.warn("Warning: The GIT_COMMIT is not set. This NativeScript Android Runtime will not be tagged with the git commit it is build from\n")
4141
}
4242

4343
if (project.hasProperty("metadataGen") && !file("../android-metadata-generator/dist/tns-android-metadata-generator-0.0.1.tgz").exists()) {
44-
throw new GradleException("android-metadata-generator build output not found and no metadataGen option specified. Build android-metadata-generator first.\n");
44+
throw new GradleException("android-metadata-generator build output not found and no metadataGen option specified. Build android-metadata-generator first.\n")
4545
}
4646
}
4747

@@ -305,7 +305,7 @@ task setPackageVersionInPackageJsonFile {
305305
def inputFile = new File("$DIST_PATH/package.json")
306306
def json = new JsonSlurper().parseText(inputFile.text)
307307
json.version = pVersion
308-
def jb = new JsonBuilder(json);
308+
def jb = new JsonBuilder(json)
309309
inputFile.text = JsonOutput.prettyPrint(jb.toString())
310310
}
311311
}
@@ -396,7 +396,7 @@ def getRunTestsBuildArguments = { taskName ->
396396
arguments.add("-PuseCCache")
397397
}
398398
arguments += ["--warning-mode", "all"]
399-
return arguments;
399+
return arguments
400400
}
401401

402402
task runTests (type: Exec) {

test-app/app/build.gradle

+14-14
Original file line numberDiff line numberDiff line change
@@ -145,30 +145,30 @@ def applyPluginGradleConfigurations = { ->
145145
}
146146

147147
def getAppIdentifier = { packageJsonMap ->
148-
def appIdentifier = "";
148+
def appIdentifier = ""
149149
if (packageJsonMap && packageJsonMap.nativescript) {
150-
appIdentifier = packageJsonMap.nativescript.id;
150+
appIdentifier = packageJsonMap.nativescript.id
151151
if (!(appIdentifier instanceof String)) {
152-
appIdentifier = appIdentifier.android;
152+
appIdentifier = appIdentifier.android
153153
}
154154
}
155155

156-
return appIdentifier;
156+
return appIdentifier
157157
}
158158

159159
def setAppIdentifier = { ->
160-
println "\t + setting applicationId";
161-
File packageJsonFile = new File("$rootDir/../../package.json");
160+
println "\t + setting applicationId"
161+
File packageJsonFile = new File("$rootDir/../../package.json")
162162

163163
if (packageJsonFile.exists()) {
164-
def content = packageJsonFile.getText("UTF-8");
165-
def jsonSlurper = new JsonSlurper();
166-
def packageJsonMap = jsonSlurper.parseText(content);
167-
def appIdentifier = getAppIdentifier(packageJsonMap);
164+
def content = packageJsonFile.getText("UTF-8")
165+
def jsonSlurper = new JsonSlurper()
166+
def packageJsonMap = jsonSlurper.parseText(content)
167+
def appIdentifier = getAppIdentifier(packageJsonMap)
168168

169169
if (appIdentifier) {
170-
project.ext.nsApplicationIdentifier = appIdentifier;
171-
android.defaultConfig.applicationId = appIdentifier;
170+
project.ext.nsApplicationIdentifier = appIdentifier
171+
android.defaultConfig.applicationId = appIdentifier
172172
}
173173
}
174174
}
@@ -413,7 +413,7 @@ task runSbg(type: JavaExec) {
413413
args "static-binding-generator.jar"
414414

415415
doFirst {
416-
new File("$OUTPUT_JAVA_DIR/com/tns/gen").deleteDir();
416+
new File("$OUTPUT_JAVA_DIR/com/tns/gen").deleteDir()
417417
}
418418
}
419419

@@ -668,7 +668,7 @@ task validateAppIdMatch {
668668
"NativeScript CLI might not work properly.$lineSeparator" +
669669
"Remove applicationId from app.gradle and update the \"nativescript.id\" in package.json.$lineSeparator" +
670670
"Actual: ${android.defaultConfig.applicationId}$lineSeparator" +
671-
"Expected(from \"package.json\"): ${project.nsApplicationIdentifier}$lineSeparator";
671+
"Expected(from \"package.json\"): ${project.nsApplicationIdentifier}$lineSeparator"
672672

673673
logger.error(errorMessage)
674674
}

test-app/runtests.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
2-
def runOnDevice = project.hasProperty("runOnDevice");
3-
def runOnDeviceOrEmulator = runOnDevice ? "-d" : "-e";
2+
def runOnDevice = project.hasProperty("runOnDevice")
3+
def runOnDeviceOrEmulator = runOnDevice ? "-d" : "-e"
44

55
def onlyX86 = project.hasProperty("onlyX86")
66
def useCCache = project.hasProperty("useCCache")
@@ -37,7 +37,7 @@ def getBuildArguments = { ->
3737
if (useCCache) {
3838
arguments.push("-PuseCCache")
3939
}
40-
return arguments;
40+
return arguments
4141
}
4242

4343
task installApk(type: Exec) {

0 commit comments

Comments
 (0)