Skip to content
Snippets Groups Projects
Commit fbae28b4 authored by User expired's avatar User expired
Browse files

removing usage of deprecated method << (using doLast/doFirst instead)

parent 10f680ba
No related branches found
No related tags found
No related merge requests found
Upcoming version: Upcoming version:
----------------- -----------------
- removing usage of deprecated method << (using doLast/doFirst instead) (Nikolaus Krismer)
- updating gradle wrapper (to version 3.4) (Nikolaus Krismer) - updating gradle wrapper (to version 3.4) (Nikolaus Krismer)
- fixed some issues with postgresql logs when using NFS for synced folders (Nikolaus Krismer) - fixed some issues with postgresql logs when using NFS for synced folders (Nikolaus Krismer)
- using owner/group name for postgresql logs (Nikolaus Krismer) - using owner/group name for postgresql logs (Nikolaus Krismer)
......
...@@ -63,7 +63,7 @@ eclipse { ...@@ -63,7 +63,7 @@ eclipse {
filterGit.appendNode('id', 1421146667415) filterGit.appendNode('id', 1421146667415)
filterGit.appendNode('name', '') filterGit.appendNode('name', '')
filterGit.appendNode('type', 30) filterGit.appendNode('type', 30)
Node matcherGit = filterGradle.appendNode('matcher') Node matcherGit = filterGit.appendNode('matcher')
matcherGit.appendNode('id', 'org.eclipse.ui.ide.multiFilter') matcherGit.appendNode('id', 'org.eclipse.ui.ide.multiFilter')
matcherGit.appendNode('arguments', '1.0-name-matches-false-false-.git') matcherGit.appendNode('arguments', '1.0-name-matches-false-false-.git')
...@@ -102,6 +102,22 @@ vagrantDestroy.doFirst { ...@@ -102,6 +102,22 @@ vagrantDestroy.doFirst {
} }
} }
vagrantUp.doFirst {
if (!vagrantDir.isDirectory()) {
println "Creating directory $vagrantDir and copying content"
vagrantDir.mkdirs()
sync {
from files('etc/vagrant')
into vagrantDir
filter(FixCrLfFilter)
filter(ReplaceTokens, tokens: [db_username: 'niko', db_password: 'secretPhdPassword#2014!'])
}
}
}
// Custom tasks // Custom tasks
task vagrantExport(type: Zip) { task vagrantExport(type: Zip) {
...@@ -117,24 +133,3 @@ task vagrantExport(type: Zip) { ...@@ -117,24 +133,3 @@ task vagrantExport(type: Zip) {
filter(FixCrLfFilter) filter(FixCrLfFilter)
filter(ReplaceTokens, tokens: [db_username: 'myUser', db_password: 'myPassword']) filter(ReplaceTokens, tokens: [db_username: 'myUser', db_password: 'myPassword'])
} }
task vagrantPrepare << {
description = 'Prepares the vagrant environment (creates directory, copies Vagrantfile, ...)'
if (!vagrantDir.isDirectory()) {
println "Creating directory $vagrantDir and copying content"
vagrantDir.mkdirs()
sync {
from files('etc/vagrant')
into vagrantDir
filter(FixCrLfFilter)
filter(ReplaceTokens, tokens: [db_username: 'niko', db_password: 'secretPhdPassword#2014!'])
}
}
}
// task dependencies
tasks.vagrantUp.dependsOn vagrantPrepare
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment