From 1c277802181a5488d818448743a4098ed86ecd7f Mon Sep 17 00:00:00 2001
From: "Colin P. Mccabe" <cmccabe@confluent.io>
Date: Mon, 22 Apr 2019 11:01:40 -0700
Subject: [PATCH 1/2] MINOR: reformat settings.gradle to be more readable

---
 build.gradle    | 11 ++++++++++-
 settings.gradle | 30 +++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index c6ab5f7577ea9..01a9786447b74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -605,7 +605,16 @@ for ( sv in availableScalaVersions ) {
 }
 
 def connectPkgs = ['connect:api', 'connect:runtime', 'connect:transforms', 'connect:json', 'connect:file', 'connect:basic-auth-extension']
-def pkgs = ['clients', 'examples', 'log4j-appender', 'tools', 'streams', 'streams:streams-scala', 'streams:test-utils', 'streams:examples'] + connectPkgs
+def pkgs = [
+    'clients',
+    'examples',
+    'log4j-appender',
+    'streams',
+    'streams:examples',
+    'streams:streams-scala',
+    'streams:test-utils',
+    'tools'
+] + connectPkgs
 
 /** Create one task per default Scala version */
 def withDefScalaVersions(taskName) {
diff --git a/settings.gradle b/settings.gradle
index 5ae78e4036033..b2814b1844dc0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,8 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-include 'core', 'examples', 'clients', 'tools', 'streams', 'streams:streams-scala', 'streams:test-utils', 'streams:examples',
-        'streams:upgrade-system-tests-0100', 'streams:upgrade-system-tests-0101', 'streams:upgrade-system-tests-0102',
-        'streams:upgrade-system-tests-0110', 'streams:upgrade-system-tests-10', 'streams:upgrade-system-tests-11', 'streams:upgrade-system-tests-20',
-        'streams:upgrade-system-tests-21' , 'log4j-appender', 'connect:api', 'connect:transforms', 'connect:runtime', 'connect:json', 'connect:file',
-        'connect:basic-auth-extension', 'jmh-benchmarks', 'generator'
+include 'clients',
+    'connect:api',
+    'connect:basic-auth-extension',
+    'connect:file',
+    'connect:json',
+    'connect:runtime',
+    'connect:transforms',
+    'core',
+    'examples',
+    'generator',
+    'jmh-benchmarks',
+    'log4j-appender',
+    'streams',
+    'streams:examples',
+    'streams:streams-scala',
+    'streams:test-utils',
+    'streams:upgrade-system-tests-0100',
+    'streams:upgrade-system-tests-0101',
+    'streams:upgrade-system-tests-0102',
+    'streams:upgrade-system-tests-0110',
+    'streams:upgrade-system-tests-10',
+    'streams:upgrade-system-tests-11',
+    'streams:upgrade-system-tests-20',
+    'streams:upgrade-system-tests-21',
+    'tools'

From c6f4f5e4512ef71259832e1a63f5e784ccb1aa4a Mon Sep 17 00:00:00 2001
From: "Colin P. Mccabe" <cmccabe@confluent.io>
Date: Tue, 23 Apr 2019 13:17:13 -0700
Subject: [PATCH 2/2] Also reformat connectPkgs

---
 build.gradle | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 01a9786447b74..90dfacbd79889 100644
--- a/build.gradle
+++ b/build.gradle
@@ -604,7 +604,15 @@ for ( sv in availableScalaVersions ) {
   }
 }
 
-def connectPkgs = ['connect:api', 'connect:runtime', 'connect:transforms', 'connect:json', 'connect:file', 'connect:basic-auth-extension']
+def connectPkgs = [
+    'connect:api',
+    'connect:basic-auth-extension',
+    'connect:file',
+    'connect:json',
+    'connect:runtime',
+    'connect:transforms'
+]
+
 def pkgs = [
     'clients',
     'examples',