From c36a933743397a34e531bdc4763faf61b40e311b Mon Sep 17 00:00:00 2001
From: Izek Greenfield <igreenfield@axiomsl.com>
Date: Tue, 7 Nov 2017 09:12:25 +0200
Subject: [PATCH] Move to gradle 4.x

---
 build.gradle                                  | 41 +++++++++++++------
 .../gradle/acumen/GradleAcumenPlugin.groovy   | 35 ++++++++++------
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 3 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1c1bfa5..6d875b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,24 +1,33 @@
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'gradle-one-jar'
-
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
-
-group = 'com.github.rholder'
-version = '2.1.0'
-
 buildscript {
     repositories {
         mavenCentral()
+
     }
     dependencies {
         classpath 'com.github.rholder:gradle-one-jar:1.0.4'
     }
 }
 
+plugins {
+    id "org.jetbrains.intellij" version "0.2.17"
+}
+
+apply plugin: 'java'
+apply plugin: 'idea'
+apply plugin: 'gradle-one-jar'
+
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+group = 'com.github.rholder'
+version = '2.1.1'
+
+
+
 allprojects {
     repositories {
+        maven { url 'https://repo.gradle.org/gradle/libs-releases' }
         maven {
             url 'http://repo.gradle.org/gradle/libs-releases-local'
         }
@@ -30,6 +39,12 @@ configurations {
     provided
 }
 
+intellij {
+    version = '2017.2.5'
+    type = 'IU'
+//    localPath = 'C:/Program Files/JetBrains/IntelliJ IDEA 2017.2.4/jre64'
+}
+
 sourceSets.main {
     compileClasspath += configurations.provided
 }
@@ -54,9 +69,9 @@ dependencies {
     runtime 'org.slf4j:slf4j-simple:1.7.2'
 
     // IntelliJ plugin runtime libraries, since they're not available from a convenient repo
-    provided files('intellij/extensions-135.690.jar')
-    provided files('intellij/openapi-135.690.jar')
-    provided files('intellij/util-135.690.jar')
+//    provided files('intellij/extensions-135.690.jar')
+//    provided files('intellij/openapi-135.690.jar')
+//    provided files('intellij/util-135.690.jar')
 
     // force this project to build before assembling jar so we can stuff it in there
     provided project(':gradle-acumen')
diff --git a/gradle-acumen/src/main/groovy/com/github/rholder/gradle/acumen/GradleAcumenPlugin.groovy b/gradle-acumen/src/main/groovy/com/github/rholder/gradle/acumen/GradleAcumenPlugin.groovy
index 87e4955..4779483 100644
--- a/gradle-acumen/src/main/groovy/com/github/rholder/gradle/acumen/GradleAcumenPlugin.groovy
+++ b/gradle-acumen/src/main/groovy/com/github/rholder/gradle/acumen/GradleAcumenPlugin.groovy
@@ -36,8 +36,8 @@ class GradleAcumenPlugin implements Plugin<Project> {
             node.version = r.selected.moduleVersion.version
             node.reason = r.selected.selectionReason.description
 
-            if(r.requested instanceof ModuleComponentSelector) {
-                node.requestedVersion = ((ModuleComponentSelector)r.requested).version
+            if (r.requested instanceof ModuleComponentSelector) {
+                node.requestedVersion = ((ModuleComponentSelector) r.requested).version
             }
 
             node.nodeType = "dependency"
@@ -73,19 +73,28 @@ class GradleAcumenPlugin implements Plugin<Project> {
 
         //noinspection GroovyAssignabilityCheck
         project.configurations.each { Configuration conf ->
-            DefaultGradleTreeNode configurationNode = new DefaultGradleTreeNode(
-                    name: conf.name,
-                    nodeType: "configuration"
-            )
+            if (conf.name != 'apiElements'
+                    && conf.name != 'implementation'
+                    && conf.name != "runtimeElements"
+                    && conf.name != "runtimeOnly"
+                    && conf.name != "testImplementation"
+                    && conf.name != "testRuntimeOnly"
+            ) {
+                DefaultGradleTreeNode configurationNode = new DefaultGradleTreeNode(
+                        name: conf.name,
+                        nodeType: "configuration"
+                )
+
+                // reprocessing existing deps can overflow the stack when there are cycles
+                Set<DefaultGradleTreeNode> existingDeps = new LinkedHashSet<DefaultGradleTreeNode>()
+                conf.incoming.resolutionResult.root.dependencies.each { DependencyResult dr ->
+
+                    DefaultGradleTreeNode dependencyNode = resolveDependency(configurationNode, dr, existingDeps)
+                    configurationNode.children.add(dependencyNode)
+                }
 
-            // reprocessing existing deps can overflow the stack when there are cycles
-            Set<DefaultGradleTreeNode> existingDeps = new LinkedHashSet<DefaultGradleTreeNode>()
-            conf.incoming.resolutionResult.root.dependencies.each { DependencyResult dr ->
-                DefaultGradleTreeNode dependencyNode = resolveDependency(configurationNode, dr, existingDeps)
-                configurationNode.children.add(dependencyNode)
+                rootNode.children.add(configurationNode)
             }
-
-            rootNode.children.add(configurationNode)
         }
 
         return rootNode
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 312855d..112876f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 26 18:29:59 CDT 2015
+#Sun Oct 22 20:24:57 GMT+03:00 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip