Skip to content

Commit 6dfc703

Browse files
author
Juan Ignacio Ubeira
authored
Merge pull request rosjava#15 from jubeira/gradle_3-5-1
Gradle update: 3.5.1
2 parents bdb24da + 11f4f66 commit 6dfc703

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

src/genjava/gradle/gradle.tar.gz

3.45 KB
Binary file not shown.

src/genjava/templates/genjava_project/build.gradle.in

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
task wrapper(type: Wrapper) {
18-
gradleVersion = '2.14.1'
18+
gradleVersion = '3.5.1'
1919
}
2020

2121
buildscript {
@@ -67,26 +67,28 @@ jar {
6767
}
6868
}
6969

70-
task info << {
71-
println "\nProject Info"
72-
println "============\n"
73-
println "Name : ${rootProject}"
74-
println "Dir : ${projectDir}"
75-
println "Group : ${group}"
76-
println "Version : ${version}"
77-
println "Configurations: " + configurations
70+
task info {
71+
doLast {
72+
println "\nProject Info"
73+
println "============\n"
74+
println "Name : ${rootProject}"
75+
println "Dir : ${projectDir}"
76+
println "Group : ${group}"
77+
println "Version : ${version}"
78+
println "Configurations: " + configurations
7879

79-
println "\nPackage Info"
80-
println "============\n"
81-
println "Name : %(project_name)s"
82-
println "Dir : %(pkg_directory)s"
80+
println "\nPackage Info"
81+
println "============\n"
82+
println "Name : %(project_name)s"
83+
println "Dir : %(pkg_directory)s"
8384

84-
println "\nGenerate Info"
85-
println "============\n"
86-
println "Output Dir : ${generated_sources_directory}"
87-
println "Task Args : " + tasks["generateSources"].args
88-
tasks["generateSources"].outputs.getFiles().getAsFileTree().each {
89-
println "Files : ${it}"
85+
println "\nGenerate Info"
86+
println "============\n"
87+
println "Output Dir : ${generated_sources_directory}"
88+
println "Task Args : " + tasks["generateSources"].args
89+
tasks["generateSources"].outputs.getFiles().getAsFileTree().each {
90+
println "Files : ${it}"
91+
}
9092
}
9193
}
9294

@@ -98,8 +100,10 @@ task info << {
98100
* Until we get this properly fixed (it fails in genjava), then we use the following bugfix to deal with the
99101
* 'Could not copy MANIFEST.MF...' error that occurs when no sources are to be made for an artifact.
100102
*/
101-
task bugfixtask << {
102-
mkdir sourceSets.main.output.classesDir
103+
task bugfixtask {
104+
doLast {
105+
mkdir sourceSets.main.output.classesDir
106+
}
103107
}
104108

105109
jar.dependsOn(bugfixtask)

0 commit comments

Comments
 (0)