Gradle: Use plugins DSL where possible

2019-02-17 01:27:05 +00:00
parent 1ae987927b
commit 56c1739d54
10 changed files with 32 additions and 12 deletions
--- a/apps/i2psnark/build.gradle
+++ b/apps/i2psnark/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}

 sourceSets {
    main {
--- a/apps/i2ptunnel/build.gradle
+++ b/apps/i2ptunnel/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}

 sourceSets {
    main {
--- a/apps/ministreaming/build.gradle
+++ b/apps/ministreaming/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+}

 archivesBaseName = 'mstreaming'

--- 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 {
--- a/apps/streaming/build.gradle
+++ b/apps/streaming/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+}

 sourceSets {
    main {
--- a/apps/susidns/build.gradle
+++ b/apps/susidns/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}

 sourceSets {
    main {
--- a/apps/susimail/build.gradle
+++ b/apps/susimail/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'war'
+plugins {
+    id 'war'
+}

 sourceSets {
    main {
--- 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')
--- 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'

--- a/router/build.gradle
+++ b/router/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+}

 sourceSets {
    main {