From fbae28b48a439b0fb1f87c2e040cdbc3f3b7473f Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Mon, 27 Feb 2017 14:30:26 +0100
Subject: [PATCH] removing usage of deprecated method << (using doLast/doFirst
instead)
---
CHANGELOG.md | 1 +
build.gradle | 39 +++++++++++++++++----------------------
2 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b15fe2..58715ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
Upcoming version:
-----------------
+ - removing usage of deprecated method << (using doLast/doFirst instead) (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)
- using owner/group name for postgresql logs (Nikolaus Krismer)
diff --git a/build.gradle b/build.gradle
index b6a5d20..bce3031 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,7 @@ eclipse {
filterGit.appendNode('id', 1421146667415)
filterGit.appendNode('name', '')
filterGit.appendNode('type', 30)
- Node matcherGit = filterGradle.appendNode('matcher')
+ Node matcherGit = filterGit.appendNode('matcher')
matcherGit.appendNode('id', 'org.eclipse.ui.ide.multiFilter')
matcherGit.appendNode('arguments', '1.0-name-matches-false-false-.git')
@@ -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
task vagrantExport(type: Zip) {
@@ -117,24 +133,3 @@ task vagrantExport(type: Zip) {
filter(FixCrLfFilter)
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
--
GitLab