From 56c1739d54a481e8a729b3c1fd3a1b28a20731bd Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 17 Feb 2019 01:27:05 +0000
Subject: [PATCH] Gradle: Use plugins DSL where possible

---
 apps/i2psnark/build.gradle      | 4 +++-
 apps/i2ptunnel/build.gradle     | 4 +++-
 apps/ministreaming/build.gradle | 4 +++-
 apps/routerconsole/build.gradle | 6 ++++--
 apps/streaming/build.gradle     | 4 +++-
 apps/susidns/build.gradle       | 4 +++-
 apps/susimail/build.gradle      | 4 +++-
 build.gradle                    | 4 +++-
 core/build.gradle               | 6 ++++--
 router/build.gradle             | 4 +++-
 10 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/apps/i2psnark/build.gradle b/apps/i2psnark/build.gradle
index 59c26076b..001043e99 100644
--- a/apps/i2psnark/build.gradle
+++ b/apps/i2psnark/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}
 
 sourceSets {
     main {
diff --git a/apps/i2ptunnel/build.gradle b/apps/i2ptunnel/build.gradle
index 85bd28c71..02180bd45 100644
--- a/apps/i2ptunnel/build.gradle
+++ b/apps/i2ptunnel/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}
 
 sourceSets {
     main {
diff --git a/apps/ministreaming/build.gradle b/apps/ministreaming/build.gradle
index ee5001ea1..e3c4351c5 100644
--- a/apps/ministreaming/build.gradle
+++ b/apps/ministreaming/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+}
 
 archivesBaseName = 'mstreaming'
 
diff --git a/apps/routerconsole/build.gradle b/apps/routerconsole/build.gradle
index da26c367e..8abefd8e1 100644
--- a/apps/routerconsole/build.gradle
+++ b/apps/routerconsole/build.gradle
@@ -1,5 +1,7 @@
-apply plugin: 'war'
-apply plugin: 'scala'
+plugins {
+    id 'war'
+    id 'scala'
+}
 
 sourceSets {
     main {
diff --git a/apps/streaming/build.gradle b/apps/streaming/build.gradle
index ecc916f94..2772ad66b 100644
--- a/apps/streaming/build.gradle
+++ b/apps/streaming/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+}
 
 sourceSets {
     main {
diff --git a/apps/susidns/build.gradle b/apps/susidns/build.gradle
index 103163af7..ed958e3a9 100644
--- a/apps/susidns/build.gradle
+++ b/apps/susidns/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}
 
 sourceSets {
     main {
diff --git a/apps/susimail/build.gradle b/apps/susimail/build.gradle
index 7cb5787fc..fac1d6906 100644
--- a/apps/susimail/build.gradle
+++ b/apps/susimail/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}
 
 sourceSets {
     main {
diff --git a/build.gradle b/build.gradle
index 9dcd55476..57ef779dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'idea'
+plugins {
+    id 'idea'
+}
 
 // Exclude apps/ dir itself, but include its subdirs
 def javaProjects = subprojects - project(':apps')
diff --git a/core/build.gradle b/core/build.gradle
index 6dcdc3897..abff417fa 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,5 +1,7 @@
-apply plugin: 'java-library'
-apply plugin: 'scala'
+plugins {
+    id 'java-library'
+    id 'scala'
+}
 
 archivesBaseName = 'i2p'
 
diff --git a/router/build.gradle b/router/build.gradle
index bb2aa937b..0ea245c22 100644
--- a/router/build.gradle
+++ b/router/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+}
 
 sourceSets {
     main {