From 2bc07682427de71f16569dea0c25aeb423d2daab Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Wed, 10 Jan 2018 22:36:57 -0600
Subject: [PATCH] Simplify loading of plugins shared by many subprojects

---
 build.gradle                                  | 19 ++++++++++++-------
 com.ibm.wala.cast.java.test.data/build.gradle |  5 -----
 com.ibm.wala.cast.java.test/build.gradle      |  4 +---
 com.ibm.wala.cast.js.rhino.test/build.gradle  |  4 +---
 com.ibm.wala.cast.js.test.data/build.gradle   |  4 ----
 com.ibm.wala.cast.js.test/build.gradle        |  4 +---
 com.ibm.wala.cast.test/build.gradle           |  4 +---
 com.ibm.wala.core.tests/build.gradle          |  4 +---
 com.ibm.wala.ide.tests/build.gradle           |  4 +---
 9 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/build.gradle b/build.gradle
index 15ad28705..f4becde9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,15 @@
+////////////////////////////////////////////////////////////////////////
+//
+//  plugin configuration must precede everything else
+//
+
+plugins {
+	id 'com.github.hauner.jarTest' version '1.0.1' apply false
+	id 'de.undercouch.download' version '3.3.0' apply false
+	id 'nebula.lint' version '8.3.1'
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 //
 //  common Java setup shared by multiple projects
@@ -66,13 +78,6 @@ subprojects {
 //  optional lint checking of Gradle scripts
 //
 
-buildscript {
-	repositories.jcenter()
-	dependencies {
-		classpath 'com.netflix.nebula:gradle-lint-plugin:latest.release'
-	}
-}
-
 allprojects {
 	apply plugin: 'nebula.lint'
 	gradleLint.alwaysRun = true
diff --git a/com.ibm.wala.cast.java.test.data/build.gradle b/com.ibm.wala.cast.java.test.data/build.gradle
index 7f8401357..4dd56d162 100644
--- a/com.ibm.wala.cast.java.test.data/build.gradle
+++ b/com.ibm.wala.cast.java.test.data/build.gradle
@@ -1,8 +1,3 @@
-plugins {
-	id 'com.github.hauner.jarTest' version '1.0.1'
-	id 'de.undercouch.download' version '3.3.0'
-}
-
 sourceSets.test.java.srcDirs = ['src']
 
 
diff --git a/com.ibm.wala.cast.java.test/build.gradle b/com.ibm.wala.cast.java.test/build.gradle
index e99434d46..4ed7b41f2 100644
--- a/com.ibm.wala.cast.java.test/build.gradle
+++ b/com.ibm.wala.cast.java.test/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'com.github.hauner.jarTest' version '1.0.1'
-}
+apply plugin: 'com.github.hauner.jarTest'
 
 sourceSets.test.java.srcDirs = ['src']
 
diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle
index 80c3a3a75..4ce339195 100644
--- a/com.ibm.wala.cast.js.rhino.test/build.gradle
+++ b/com.ibm.wala.cast.js.rhino.test/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'com.github.hauner.jarTest' version '1.0.1'
-}
+apply plugin: 'com.github.hauner.jarTest'
 
 sourceSets.test {
 	java.srcDirs = ['harness-src']
diff --git a/com.ibm.wala.cast.js.test.data/build.gradle b/com.ibm.wala.cast.js.test.data/build.gradle
index 5819a8098..efa7a5798 100644
--- a/com.ibm.wala.cast.js.test.data/build.gradle
+++ b/com.ibm.wala.cast.js.test.data/build.gradle
@@ -1,7 +1,3 @@
-plugins {
-	id 'de.undercouch.download' version '3.3.0'
-}
-
 apply plugin: 'base'
 
 import de.undercouch.gradle.tasks.download.*
diff --git a/com.ibm.wala.cast.js.test/build.gradle b/com.ibm.wala.cast.js.test/build.gradle
index 05ca899ca..5d2a19682 100644
--- a/com.ibm.wala.cast.js.test/build.gradle
+++ b/com.ibm.wala.cast.js.test/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'com.github.hauner.jarTest' version '1.0.1'
-}
+apply plugin: 'com.github.hauner.jarTest'
 
 sourceSets.test.java.srcDirs = ['harness-src']
 
diff --git a/com.ibm.wala.cast.test/build.gradle b/com.ibm.wala.cast.test/build.gradle
index 293397d2b..6f9230d26 100644
--- a/com.ibm.wala.cast.test/build.gradle
+++ b/com.ibm.wala.cast.test/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'com.github.hauner.jarTest' version '1.0.1'
-}
+apply plugin: 'com.github.hauner.jarTest'
 
 apply plugin: 'cpp'
 
diff --git a/com.ibm.wala.core.tests/build.gradle b/com.ibm.wala.core.tests/build.gradle
index 57c1c8846..5c3f5129d 100644
--- a/com.ibm.wala.core.tests/build.gradle
+++ b/com.ibm.wala.core.tests/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'com.github.hauner.jarTest' version '1.0.1'
-}
+apply plugin: 'com.github.hauner.jarTest'
 
 sourceSets.test {
 	java.srcDirs = ['src']
diff --git a/com.ibm.wala.ide.tests/build.gradle b/com.ibm.wala.ide.tests/build.gradle
index 4c2d5ce68..c9a77a71a 100644
--- a/com.ibm.wala.ide.tests/build.gradle
+++ b/com.ibm.wala.ide.tests/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'com.github.hauner.jarTest' version '1.0.1'
-}
+apply plugin: 'com.github.hauner.jarTest'
 
 sourceSets.test.java.srcDirs = ['src']