diff --git a/build/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy b/build/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy index 1aaeeb46d5c0..3dc0b8eee67c 100644 --- a/build/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy @@ -51,9 +51,9 @@ class ApplicationInfoProperties { shortCompanyName = root.company.first().@shortName ?: shortenCompanyName(companyName) } - public String getUpperCaseProductName() { shortProductName.toUpperCase() } + String getUpperCaseProductName() { shortProductName.toUpperCase() } - public String getFullVersion() { + String getFullVersion() { MessageFormat.format(fullVersionFormat, majorVersion, minorVersion, microVersion, patchVersion) } diff --git a/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy b/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy index 8ec9db4dd127..f7e111d16c91 100644 --- a/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy @@ -94,7 +94,7 @@ abstract class BuildContext { abstract boolean shouldBuildDistributionForOS(String os) - public static BuildContext createContext(AntBuilder ant, JpsGantProjectBuilder projectBuilder, JpsProject project, JpsGlobal global, + static BuildContext createContext(AntBuilder ant, JpsGantProjectBuilder projectBuilder, JpsProject project, JpsGlobal global, String communityHome, String projectHome, ProductProperties productProperties, ProprietaryBuildTools proprietaryBuildTools = ProprietaryBuildTools.DUMMY, BuildOptions options = new BuildOptions()) { @@ -164,7 +164,7 @@ interface BuildMessages { void error(String message, Throwable cause) void progress(String message) - public V block(String blockName, Closure body) + def V block(String blockName, Closure body) void artifactBuild(String relativeArtifactPath) diff --git a/build/groovy/org/jetbrains/intellij/build/BuildTasks.groovy b/build/groovy/org/jetbrains/intellij/build/BuildTasks.groovy index fe84fb943ba1..e9462742325b 100644 --- a/build/groovy/org/jetbrains/intellij/build/BuildTasks.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BuildTasks.groovy @@ -67,7 +67,7 @@ abstract class BuildTasks { abstract void buildUpdaterJar() - public static BuildTasks create(BuildContext context) { + static BuildTasks create(BuildContext context) { return new BuildTasksImpl(context) } } \ No newline at end of file diff --git a/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index 16bf12f31da0..96ee6f68390c 100644 --- a/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -13,12 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - - - - package org.jetbrains.intellij.build import groovy.transform.CompileStatic diff --git a/build/groovy/org/jetbrains/intellij/build/LogMessage.groovy b/build/groovy/org/jetbrains/intellij/build/LogMessage.groovy index 3c64dfde9646..56bcfb8ef9b7 100644 --- a/build/groovy/org/jetbrains/intellij/build/LogMessage.groovy +++ b/build/groovy/org/jetbrains/intellij/build/LogMessage.groovy @@ -15,7 +15,6 @@ */ package org.jetbrains.intellij.build -import groovy.transform.Canonical import groovy.transform.CompileStatic import groovy.transform.Immutable diff --git a/build/groovy/org/jetbrains/intellij/build/MacHostProperties.groovy b/build/groovy/org/jetbrains/intellij/build/MacHostProperties.groovy index 615e0551915d..14efea369d92 100644 --- a/build/groovy/org/jetbrains/intellij/build/MacHostProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/MacHostProperties.groovy @@ -43,7 +43,7 @@ import groovy.transform.Immutable */ @CompileStatic @Immutable -public class MacHostProperties { +class MacHostProperties { /** * Mac host host name. */ diff --git a/build/groovy/org/jetbrains/intellij/build/ProductModulesLayout.groovy b/build/groovy/org/jetbrains/intellij/build/ProductModulesLayout.groovy index 3cfe8432ba62..5ea216362e0f 100644 --- a/build/groovy/org/jetbrains/intellij/build/ProductModulesLayout.groovy +++ b/build/groovy/org/jetbrains/intellij/build/ProductModulesLayout.groovy @@ -13,24 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - package org.jetbrains.intellij.build import com.intellij.openapi.util.MultiValuesMap diff --git a/build/groovy/org/jetbrains/intellij/build/ProductProperties.groovy b/build/groovy/org/jetbrains/intellij/build/ProductProperties.groovy index dc6cd93dabd5..924cd9b58460 100644 --- a/build/groovy/org/jetbrains/intellij/build/ProductProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/ProductProperties.groovy @@ -22,7 +22,7 @@ import org.jetbrains.intellij.build.impl.PluginLayout * @author nik */ @CompileStatic -public abstract class ProductProperties { +abstract class ProductProperties { /** * Base name for script files (*.bat, *.sh, *.exe), usually a shortened product name in lower case (e.g. 'idea' for IntelliJ IDEA, 'datagrip' for DataGrip) */ diff --git a/build/groovy/org/jetbrains/intellij/build/SignTool.groovy b/build/groovy/org/jetbrains/intellij/build/SignTool.groovy index 95b8d23b1493..0a52db8ae371 100644 --- a/build/groovy/org/jetbrains/intellij/build/SignTool.groovy +++ b/build/groovy/org/jetbrains/intellij/build/SignTool.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * diff --git a/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy index cc85a1579ed9..fa49d5b3d872 100644 --- a/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy index fdffc16163e9..d0da09728950 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy index 5a2d0544d958..726b8506e0ab 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy @@ -112,7 +112,7 @@ class BuildMessagesImpl implements BuildMessages { } @Override - public V block(String blockName, Closure body) { + V block(String blockName, Closure body) { try { processMessage(new LogMessage(LogMessage.Kind.BLOCK_STARTED, blockName)) return body() diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy index b1c8fe0a73a6..b65bcf5638b5 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy @@ -38,7 +38,7 @@ class BundledJreManager { * Extract JRE for Linux distribution of the product * @return path to the directory containing 'jre' subdirectory with extracted JRE */ - public String extractLinuxJre() { + String extractLinuxJre() { return extractJre("linux") } @@ -46,7 +46,7 @@ class BundledJreManager { * Extract JRE for Windows distribution of the product * @return path to the directory containing 'jre' subdirectory with extracted JRE */ - public String extractWinJre(JvmArchitecture arch) { + String extractWinJre(JvmArchitecture arch) { return extractJre("win", arch) } @@ -54,14 +54,14 @@ class BundledJreManager { * Extract Oracle JRE for Windows distribution of the product * @return path to the directory containing 'jre' subdirectory with extracted JRE */ - public String extractOracleWinJre(JvmArchitecture arch) { + String extractOracleWinJre(JvmArchitecture arch) { return extractJre("win", arch, JreVendor.Oracle) } /** * Return path to a .tar.gz archive containing distribution of JRE for Mac OS which will be bundled with the product */ - public String findMacJreArchive() { + String findMacJreArchive() { return findJreArchive("mac")?.absolutePath } diff --git a/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy index 4fcc701f5f42..cd7290701319 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * diff --git a/build/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy b/build/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy index a75ca1fc4220..865f74d90ab1 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy @@ -29,7 +29,7 @@ import org.jetbrains.jps.model.library.JpsOrderRootType */ @CompileStatic class JdkUtils { - public static void defineJdk(JpsGlobal global, String jdkName, String jdkHomePath) { + static void defineJdk(JpsGlobal global, String jdkName, String jdkHomePath) { def sdk = JpsJavaExtensionService.instance.addJavaSdk(global, jdkName, jdkHomePath) def toolsJar = new File(jdkHomePath, "lib/tools.jar") if (toolsJar.exists()) { @@ -37,7 +37,7 @@ class JdkUtils { } } - public static String computeJdkHome(BuildMessages messages, String propertyName, String defaultDir, String envVarName) { + static String computeJdkHome(BuildMessages messages, String propertyName, String defaultDir, String envVarName) { String jdkDir = System.getProperty(propertyName) if (jdkDir != null) { return jdkDir diff --git a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy index e8ecdda32fd2..60277d6f72dd 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy @@ -37,7 +37,7 @@ class MacDistributionBuilder { macDistPath = "$buildContext.paths.buildOutputRoot/dist.mac" } - public layoutMac(File ideaPropertiesFile) { + void layoutMac(File ideaPropertiesFile) { buildContext.messages.progress("Building distributions for Mac OS") def docTypes = (customizer.associateIpr ? """ diff --git a/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy index 18d264787c5a..4ba90a923210 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy @@ -42,13 +42,13 @@ class MacDmgBuilder { this.remoteDir = remoteDir } - public static void signBinaryFiles(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties, + static void signBinaryFiles(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties, String macDistPath) { def dmgBuilder = createInstance(buildContext, customizer, macHostProperties) dmgBuilder.doSignBinaryFiles(macDistPath) } - public static void signAndBuildDmg(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties, String macZipPath) { + static void signAndBuildDmg(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties, String macZipPath) { MacDmgBuilder dmgBuilder = createInstance(buildContext, customizer, macHostProperties) def jreArchivePath = buildContext.bundledJreManager.findMacJreArchive() if (jreArchivePath != null) { diff --git a/build/groovy/org/jetbrains/intellij/build/impl/ModuleLibraryData.groovy b/build/groovy/org/jetbrains/intellij/build/impl/ModuleLibraryData.groovy index 5795683b7b24..90d222ad3018 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/ModuleLibraryData.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/ModuleLibraryData.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * diff --git a/build/groovy/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy b/build/groovy/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy index 92b618827e5f..858c0a6d747f 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * @@ -42,12 +27,12 @@ class NsisFileListGenerator { private final Map> directoryToFiles = [:] private final List filesRelativePaths = [] - public void addDirectory(String directoryPath, List relativeFileExcludePatterns = []) { + void addDirectory(String directoryPath, List relativeFileExcludePatterns = []) { def excludePatterns = relativeFileExcludePatterns.collect { Pattern.compile(FileUtil.convertAntToRegexp(it)) } processDirectory(new File(directoryPath), "", excludePatterns) } - public void generateInstallerFile(File outputFile) { + void generateInstallerFile(File outputFile) { outputFile.withWriter { BufferedWriter out -> directoryToFiles.each { if (!it.value.empty) { @@ -62,7 +47,7 @@ class NsisFileListGenerator { } } - public void generateUninstallerFile(File outputFile) { + void generateUninstallerFile(File outputFile) { outputFile.withWriter { BufferedWriter out -> filesRelativePaths.toSorted().each { out.writeLine("Delete \"\$INSTDIR\\${toWinPath(it)}\"") diff --git a/build/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy b/build/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy index f441908cf07a..e135b3f4c32e 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * @@ -33,7 +18,6 @@ package org.jetbrains.intellij.build.impl import org.jetbrains.intellij.build.BuildContext import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.model.module.JpsModuleReference /** diff --git a/build/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy b/build/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy index 0a094160c786..5ec03e51f511 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. * diff --git a/build/groovy/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.groovy b/build/groovy/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.groovy index ec3608419848..b7658d2e62ba 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.groovy @@ -1,33 +1,3 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /* * Copyright 2000-2016 JetBrains s.r.o. *