Skip to content

Commit 54468ac

Browse files
committed
Update gradle templates
1 parent 7cdfa29 commit 54468ac

File tree

4 files changed

+31
-20
lines changed

4 files changed

+31
-20
lines changed

org.nodeclipse.enide.editors.gradle/docs/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/* Android
22
* http://www.nodeclipse.org/projects/gradle
33
* Nodeclipse/Enide build.gradle template for classic Android project
44
* https://github.com/Nodeclipse/nodeclipse-1/blob/master/org.nodeclipse.enide.editors.gradle/docs/android/build.gradle

org.nodeclipse.enide.editors.gradle/docs/java/basic/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*
1+
/* Basic
22
* http://www.nodeclipse.org/projects/gradle
3-
* Nodeclipse/Enide build.gradle template for basic Java project
3+
* Nodeclipse/Enide build.gradle template for basic Java project (with Maven standart folder layout)
44
* https://github.com/Nodeclipse/nodeclipse-1/blob/master/org.nodeclipse.enide.editors.gradle/docs/java/basic/build.gradle
55
* Initially asked on
66
* http://stackoverflow.com/questions/14017364/how-to-create-java-gradle-project
Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/* Classic
22
* http://www.nodeclipse.org/projects/gradle
33
* build.gradle drop-in template for classic Eclipse (ant) Java project
44
* https://github.com/Nodeclipse/nodeclipse-1/blob/master/org.nodeclipse.enide.editors.gradle/docs/java/classic/build.gradle
@@ -7,6 +7,7 @@
77
* 2. after dependency changed, run `gradle build eclipse`
88
* History
99
* 2014-05-13 organize sections by plugins
10+
* 2014-05-20 =['src'] instead of 'src'; configure tests folder
1011
* @author Paul Verest
1112
* Refererences
1213
* http://www.gradle.org/docs/current/dsl/org.gradle.plugins.ide.eclipse.model.EclipseProject.html
@@ -18,23 +19,28 @@ apply plugin: 'java'
1819
sourceCompatibility = 1.8
1920
sourceSets {
2021
main {
21-
java {
22-
srcDir 'src'
23-
}
24-
resources {
25-
srcDir 'src'
26-
}
22+
java.srcDirs = ['src']
23+
resources.srcDirs = ['src']
2724
}
25+
test {
26+
java.srcDirs = ['tests']
27+
resources.srcDirs = ['tests']
28+
}
29+
}
30+
task initSourceFolders <<{
31+
sourceSets*.java.srcDirs*.each { it.mkdirs() }
32+
sourceSets*.resources.srcDirs*.each { it.mkdirs() }
2833
}
2934
repositories {
3035
mavenCentral()
36+
//jcenter()
3137
}
3238
dependencies {
3339
compile fileTree(dir: 'libs', include: '*.jar')
3440
testCompile "junit:junit:4.11"
3541
}
3642

37-
apply plugin: 'application'
43+
apply plugin: 'application' // this adds run task
3844
mainClassName = "com.example.MainClass"
3945

4046
apply plugin: 'eclipse'

org.nodeclipse.ui/templates/hello-world/build.gradle

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*
1+
/* Node.js
22
* http://www.nodeclipse.org/projects/gradle
3-
* Nodeclipse/Enide build.gradle template/drop-in for Node.js/Avatar.js project, version 0.15.1
3+
* Nodeclipse/Enide build.gradle template/drop-in for Node.js/Avatar.js project, version 0.16
44
* https://github.com/Nodeclipse/nodeclipse-1/blob/master/org.nodeclipse.ui/templates/hello-world/build.gradle
55
* This file lets you optionally run Node.js app as Java Avatar.js app
66
* Usage
@@ -13,6 +13,7 @@
1313
* History
1414
* 2014-04-25 rename to run, add <<
1515
* 2014-04-29 state that `gradle copyLibs` step is required
16+
* 2014-05-20 =['src'] instead of 'src'
1617
* @author Paul Verest
1718
*/
1819
println GradleVersion.current().prettyPrint()
@@ -25,28 +26,32 @@ repositories {
2526
maven {
2627
url "https://maven.java.net/content/repositories/public/"
2728
}
29+
//mavenCentral()
30+
//jcenter()
2831
}
2932

3033
dependencies {
3134
compile "com.oracle:avatar-js:0.10.25-SNAPSHOT"
3235
compile "com.oracle:libavatar-js-win-x64:0.10.25-SNAPSHOT"
36+
//compile fileTree(dir: 'libs', include: '*.jar')
37+
//testCompile "junit:junit:4.11"
3338
}
3439

3540
task copyLibs(type: Copy) {
3641
from configurations.compile
37-
into 'lib'
42+
into 'lib' // ! not libs
3843
//TODO files need to be renamed
3944
}
4045

4146
/* uncomment for adding Java sources
4247
sourceSets {
4348
main {
44-
java {
45-
srcDir 'src'
46-
}
47-
resources {
48-
srcDir 'src'
49-
}
49+
java.srcDirs = ['src']
50+
resources.srcDirs = ['src']
51+
}
52+
test {
53+
java.srcDirs = ['tests']
54+
resources.srcDirs = ['tests']
5055
}
5156
}
5257
task initSourceFolders { // add << before { to prevent executing during configuration phase

0 commit comments

Comments
 (0)