update gradle version, libraries versions, removed comments from build.gradle s

Author: lucacampanella

build.gradle

@@ -9,17 +9,11 @@ buildscript {
 }
 
 plugins {
-    //id 'com.gradle.build-scan' version '2.3'
     id 'com.github.ben-manes.versions' version '0.21.0' // task: dependencyUpdates
     id 'org.ajoberstar.reckon' version '0.11.0'
     id 'org.sonarqube' version '2.7.1'
 }
 
-//buildScan {
-//    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-//    termsOfServiceAgree = 'yes'
-//}
-
 reckon {
     scopeFromProp()
     stageFromProp('beta', 'rc', 'final')
@@ -52,12 +46,13 @@ allprojects {
     ext {
         corda_release_group = 'net.corda'
         corda_release_version = '4.0'
-        spoon_version = '7.4.0' //TODO: understand how to propagate this
+        spoon_version = '7.4.0'
         assertj_version = '3.12.2'
-        junit5_version = '5.4.2'
+        junit5_version = '5.5.0'
         short_description='Gradle plugin to automatically generate graph that represent Corda flows interactions.'
         url='https://github.com/lucacampanella/corda-flows-doc-builder'
         git_url = url + ".git"
+        kotlin_version = "1.3.41"
     }
 
     group 'com.github.lucacampanella'
@@ -154,15 +149,15 @@ subprojects {
                 artifact sourcesJar
                 artifact javadocJar
                 pom {
-                    //name = project.name todo: change fro gradle 5
+                    name = project.name
                     description = project.short_description
                     url = project.url
-//                    licenses {
-//                        license {
-//                            name = 'The Apache License, Version 2.0'
-//                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-//                        }
-//                    }
+                    licenses {
+                        license {
+                            name = 'The Apache License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
+                    }
                 }
             }
         }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 #distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

graph-builder/build.gradle

@@ -6,16 +6,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0'//4.0.1'// todo: change fro gradle 5
-//--------------------------------------- Added for publishing on sonartype
-//        classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'3
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 plugins {
     id 'application'
-//    id 'maven-publish'
 }
 apply plugin: 'kotlin'
 apply plugin: 'com.github.johnrengelman.shadow'
@@ -37,28 +34,19 @@ dependencies {
     implementation "fr.inria.gforge.spoon:spoon-core:$spoon_version"
 
     implementation "org.jboss.windup.decompiler.fernflower:fernflower:2.5.0.Final"
-    implementation "org.benf:cfr:0.135"
+    implementation "org.benf:cfr:0.135"//145 doesn't work for some reason
 
     implementation "org.jfree:jfreesvg:3.4"
     implementation "org.slf4j:slf4j-simple:1.7.26"
     implementation "info.picocli:picocli:3.9.6"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.21"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     testImplementation "org.slf4j:slf4j-simple:1.7.26"
     testImplementation project(":test-utils").sourceSets.test.output
 }
-//jar {
-//    from configurations.implementation.collect {
-//
-//        it.isDirectory() ? it : zipTree(it)
-//    }
-//} todo: change fro gradle 5
-mainClassName = 'com.github.lucacampanella.callgraphflows.Main'
 
-//application {
-//    mainClassName = 'com.github.lucacampanella.callgraphflows.Main'
-//}
+mainClassName = 'com.github.lucacampanella.callgraphflows.Main'
 
 task copyTestJarToResources(type: Copy) {
     from buildDir.toURI().toURL().toString() + "/libs/JarAnalyzerTestJar.jar";
@@ -110,53 +98,10 @@ task generateIndexFileForTests() {
 
 test.finalizedBy generateIndexFileForTests
 
-//task copyKotlinTestJarToResources(type: Copy) {
-//    from buildDir.toURI().toURL().toString() + "/libs/KotlinTestJar.jar";
-//    into sourceSets.test.output.resourcesDir
-//}
-//
-//task createKotlinTestJar(type: Jar) {
-//
-////    archiveFileName = "KotlinTestJar.jar"
-////    from {
-////        sourceSets.test.output
-////    }
-////    //include '**/kotlin/**/*.class'
-////    includeEmptyDirs false
-//
-//
-//    println file(buildDir.toString() + "/classes/kotlin/test").listFiles({File file -> file.toString().contains("KotlinTestFlow")} as FileFilter)
-//    from file(buildDir.toString() + "/classes/kotlin/test").listFiles({File file -> file.toString().contains("KotlinTestFlow")} as FileFilter)
-//    archiveFileName = "KotlinTestJar.jar"
-////    doLast {
-////        println "kotlin test jar"
-////        println sourceSets.test.output.classesDirs
-////        println sourceSets.test.output.classesDirs.asFileTree.filter {
-////            it.toString().contains("KotlinTestFlow")
-////        }.collect()
-////
-////
-////        //println file(sourceSets.test.output.asPath).listFiles()
-////        //println configurations.testRuntimeClasspath.asPath//collect { it.isDirectory() ? it : zipTree(it) }
-////        from sourceSets.test.output.classesDirs.asFileTree.filter { it.toString().contains("KotlinTestFlow")}.collect()
-////    }
-//
-//}
-//
-//copyKotlinTestJarToResources.dependsOn(createKotlinTestJar)
-//tasks.withType(Test).each{it -> it.dependsOn(copyKotlinTestJarToResources)}
-
-
-//createKotlinTestJar.dependsOn(compileTestKotlin)
-//processTestResources.dependsOn(createKotlinTestJar)
-//processTestResources {
-//    from file(buildDir.toString() + "/libs/KotlinTestJar.jar")
-//}
-
 publishing {
     publications {
         mavenJava(MavenPublication) {
             artifact shadowJar
         }
     }
-} //todo: change fro gradle 5
+}

graph-builder/src/test/java/com/github/lucacampanella/callgraphflows/staticanalyzer/testclasses/SimpleTestFlow.java

@@ -50,8 +50,6 @@ public Acceptor(FlowSession otherSession) {
         @Override
         public Void call() throws FlowException {
 
-            boolean condition = true;
-
             otherSession.receive(Boolean.class);
             otherSession.send("Test");
             return null;

plugin/build.gradle

@@ -6,9 +6,6 @@ plugins {
 
 repositories {
     mavenCentral()
-//    maven {
-//        url "https://dl.bintray.com/lucacampanella/mvn-release"
-//    }
 }
 
 dependencies {

simple-flow-project/build.gradle

@@ -9,15 +9,11 @@ plugins {
     id 'com.github.lucacampanella.plugin.flows-doc-builder-plugin'
 }
 
-//apply plugin: 'com.github.lucacampanella.plugin.flows-doc-builder-plugin'
-
 ext {
     corda_release_group = 'net.corda'
     corda_release_version = '4.0'
 }
 repositories {
-    // Use jcenter for resolving your dependencies.
-    // You can declare any Maven/Ivy/file repository here.
     mavenCentral()
     jcenter()
 }