Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removed unnecessary semicolons from the gradle script templates.
- Loading branch information
Showing
6 changed files
with
47 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
src/org/netbeans/gradle/project/resources/newproject/multi-project-root.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,20 +1,20 @@ | |||
import org.gradle.api.artifacts.*; | import org.gradle.api.artifacts.* | ||
|
|
||
apply plugin: 'base'; // To add "clean" task to the root project. | apply plugin: 'base' // To add "clean" task to the root project. | ||
|
|
||
task mergedJavadoc(type: Javadoc, description: 'Creates Javadoc from all the projects.') { | task mergedJavadoc(type: Javadoc, description: 'Creates Javadoc from all the projects.') { | ||
title = 'All modules'; | title = 'All modules' | ||
destinationDir = new File(project.buildDir, 'merged-javadoc'); | destinationDir = new File(project.buildDir, 'merged-javadoc') | ||
|
|
||
// Note: The closures below are executed lazily. | // Note: The closures below are executed lazily. | ||
source { | source { | ||
subprojects*.sourceSets*.main*.allSource; | subprojects*.sourceSets*.main*.allSource | ||
} | } | ||
classpath.from { | classpath.from { | ||
subprojects*.configurations*.compile*.copyRecursive({ !(it instanceof ProjectDependency); })*.resolve(); | subprojects*.configurations*.compile*.copyRecursive({ !(it instanceof ProjectDependency); })*.resolve() | ||
} | } | ||
} | } | ||
|
|
||
task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') { | task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') { | ||
gradleVersion = '1.1'; | gradleVersion = '1.1' | ||
} | } |
8 changes: 4 additions & 4 deletions
8
src/org/netbeans/gradle/project/resources/newproject/multi-project-settings.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,18 +1,18 @@ | |||
rootProject.name = '${PROJECT_NAME}'; | rootProject.name = '${PROJECT_NAME}' | ||
|
|
||
// Find the directories containing a "build.gradle" file in the root directory | // Find the directories containing a "build.gradle" file in the root directory | ||
// of the project. That is, every directory containing a "build.gradle" will | // of the project. That is, every directory containing a "build.gradle" will | ||
// be automatically the subproject of this project. | // be automatically the subproject of this project. | ||
def subDirs = rootDir.listFiles(new FileFilter() { | def subDirs = rootDir.listFiles(new FileFilter() { | ||
public boolean accept(File file) { | public boolean accept(File file) { | ||
if (!file.isDirectory()) { | if (!file.isDirectory()) { | ||
return false; | return false | ||
} | } | ||
|
|
||
return new File(file, 'build.gradle').isFile(); | return new File(file, 'build.gradle').isFile() | ||
} | } | ||
}); | }); | ||
|
|
||
subDirs.each { File dir -> | subDirs.each { File dir -> | ||
include dir.name; | include dir.name | ||
} | } |
2 changes: 1 addition & 1 deletion
2
src/org/netbeans/gradle/project/resources/newproject/single-project-settings.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1 +1 @@ | |||
rootProject.name = '${PROJECT_NAME}'; | rootProject.name = '${PROJECT_NAME}' |
22 changes: 11 additions & 11 deletions
22
src/org/netbeans/gradle/project/resources/newproject/single-project.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,28 +1,28 @@ | |||
apply plugin: 'java'; | apply plugin: 'java' | ||
|
|
||
sourceCompatibility = '${SOURCE_LEVEL}'; | sourceCompatibility = '${SOURCE_LEVEL}' | ||
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'; | [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' | ||
|
|
||
String mainClass = '${MAIN_CLASS}'; | String mainClass = '${MAIN_CLASS}' | ||
|
|
||
task (run, dependsOn: classes, type: JavaExec) { | task (run, dependsOn: classes, type: JavaExec) { | ||
main = mainClass; | main = mainClass | ||
classpath = sourceSets.main.runtimeClasspath; | classpath = sourceSets.main.runtimeClasspath | ||
} | } | ||
|
|
||
task (debug, dependsOn: classes, type: JavaExec) { | task (debug, dependsOn: classes, type: JavaExec) { | ||
main = mainClass; | main = mainClass | ||
classpath = sourceSets.main.runtimeClasspath; | classpath = sourceSets.main.runtimeClasspath | ||
debug = true; | debug = true | ||
} | } | ||
|
|
||
repositories { | repositories { | ||
mavenCentral(); | mavenCentral() | ||
} | } | ||
|
|
||
dependencies { | dependencies { | ||
// TODO: Add dependencies here ... | // TODO: Add dependencies here ... | ||
// You can read more about how to add dependency here: | // You can read more about how to add dependency here: | ||
// http://www.gradle.org/docs/current/userguide/dependency_management.html#sec:how_to_declare_your_dependencies | // http://www.gradle.org/docs/current/userguide/dependency_management.html#sec:how_to_declare_your_dependencies | ||
testCompile group: 'junit', name: 'junit', version: '4.10'; | testCompile group: 'junit', name: 'junit', version: '4.10' | ||
} | } |
4 changes: 2 additions & 2 deletions
4
src/org/netbeans/gradle/project/resources/newproject/subproject.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters