From db4567a0cc318188f2f00c1145007c92f3d87075 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 27 Apr 2017 10:16:14 +0300 Subject: [PATCH] build scripts cleanup: removed unnecessary semicolons and unused code --- .../intellij/build/impl/MacDistributionBuilder.groovy | 9 ++++----- .../jetbrains/intellij/build/impl/MacDmgBuilder.groovy | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy index 9b28d25202e3..a7f024ae2a38 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy @@ -149,12 +149,12 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder { def coreKeys = ["idea.platform.prefix", "idea.paths.selector", "idea.executable"] - String coreProperties = submapToXml(properties, coreKeys); + String coreProperties = submapToXml(properties, coreKeys) StringBuilder effectiveProperties = new StringBuilder() properties.each { k, v -> if (!coreKeys.contains(k)) { - effectiveProperties.append("$k=$v\n"); + effectiveProperties.append("$k=$v\n") } } @@ -198,7 +198,7 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder { """ } - String bundledHelpAttributes; + String bundledHelpAttributes if (helpId != null) { bundledHelpAttributes = """ CFBundleHelpBookName @@ -232,7 +232,6 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder { replacefilter(token: "@@url_schemes@@", value: urlSchemesString) replacefilter(token: "@@archs@@", value: archsString) replacefilter(token: "@@min_osx@@", value: macCustomizer.minOSXVersion) - replacefilter(token: "@@min_osx@@", value: macCustomizer.minOSXVersion) replacefilter(token: "@@bundled_help_attributes@@", value: bundledHelpAttributes) } @@ -341,7 +340,7 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder { private Map readIdeaProperties(File propertiesFile, Map customProperties = [:]) { Map ideaProperties = [:] propertiesFile.withReader { - Properties loadedProperties = new Properties(); + Properties loadedProperties = new Properties() loadedProperties.load(it) ideaProperties.putAll(loadedProperties as Map) } diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy index a6063e29245e..9c96ef02212e 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy @@ -211,7 +211,7 @@ class MacDmgBuilder { by the main Ant classloader as well and fail because 'commons-net-*.jar' isn't included to Ant classpath. Probably we could call FTPClient directly to avoid this hack. */ - def ftpTaskLoaderRef = "FTP_TASK_CLASS_LOADER"; + def ftpTaskLoaderRef = "FTP_TASK_CLASS_LOADER" Path ftpPath = new Path(ant.project) ftpPath.createPathElement().setLocation(new File("$communityLib/commons-net-3.3.jar")) ftpPath.createPathElement().setLocation(new File("$communityLib/ant/lib/ant-commons-net.jar")) @@ -219,7 +219,7 @@ class MacDmgBuilder { ["FTP", "FTPTaskConfig"] as String[])) ant.taskdef(name: "ftp", classname: "org.apache.tools.ant.taskdefs.optional.net.FTP", loaderRef: ftpTaskLoaderRef) - def sshTaskLoaderRef = "SSH_TASK_CLASS_LOADER"; + def sshTaskLoaderRef = "SSH_TASK_CLASS_LOADER" Path pathSsh = new Path(ant.project) pathSsh.createPathElement().setLocation(new File("$communityLib/jsch-0.1.54.jar")) pathSsh.createPathElement().setLocation(new File("$communityLib/ant/lib/ant-jsch.jar"))