Merge branch 'develop' into post-java8-features

Author: mstrobel

Procyon.Decompiler/build.gradle

@@ -1,32 +1,17 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'eu.appsatori:gradle-fatjar-plugin:0.3'
-    }
-}
-
-jar.enabled = false
 uploadArchives.enabled = false
 
-apply plugin: 'eu.appsatori.fatjar'
-
-fatJar {
-    from rootProject.allprojects.collect({ it.sourceSets.main.allSource })
-
+jar {
     manifest {
         attributes 'Title': archivesBaseName, 'Manifest-Version': '1.0', 'Version': version, 'Main-Class' : 'com.strobel.decompiler.DecompilerDriver'
     }
+
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
 }
 
 dependencies {
-    compile 'com.beust:jcommander:1.81'
+    compile 'com.beust:jcommander:1.78'
     compile project(':Procyon.Core')
     compile project(':Procyon.CompilerTools')
 }
-
-artifacts {
-    archives fatJar
-}

build.gradle

@@ -25,7 +25,7 @@ ext.getProcyonVersion = { ->
         }
     }
 
-    logger.warn("wARNING: Could not resolve version from source; falling back to '$fallbackVersion'.")
+    logger.warn("WARNING: Could not resolve version from source; falling back to '$fallbackVersion'.")
 
     return fallbackVersion
 }
@@ -41,15 +41,15 @@ allprojects {
 
     version procyonVersion
 
-    group 'org.bitbucket.mstrobel'
+    group 'com.github.mstrobel'
     sourceCompatibility = 1.7    // JDK version
 
     repositories {
         mavenCentral()
     }
 
     dependencies {
-        testCompile 'junit:junit:4.11'
+        testCompile 'junit:junit:4.13.2'
     }
 }
 
@@ -121,7 +121,12 @@ subprojects {
         }
     }
 
-    if (project.name != "Procyon.Decompiler") {
+    if (project.name == "Procyon.Decompiler") {
+        artifacts {
+            archives jar
+        }
+    }
+    else {
         javadoc {
             options.encoding = 'UTF-8'
         }
@@ -165,17 +170,17 @@ subprojects {
                         name project.archivesBaseName
                         packaging 'jar'
                         description 'Procyon'
-                        url 'https://bitbucket.org/mstrobel/procyon'
+                        url 'https://github.com/mstrobel/procyon'
 
                         scm {
-                            url 'https://bitbucket.org/mstrobel/procyon'
-                            connection 'scm:hg:https://[email protected]/mstrobel/procyon'
-                            developerConnection 'scm:hg:https://mstrobel@bitbucket.org/mstrobel/procyon'
+                            url 'https://github.com/mstrobel/procyon'
+                            connection 'scm:git:https://github.com/mstrobel/procyon.git'
+                            developerConnection 'scm:git:https://mstrobel@github.com/mstrobel/procyon.git'
                         }
 
                         issueManagement {
-                            system 'jira'
-                            url 'https://bitbucket.org/mstrobel/procyon/issues'
+                            system 'github'
+                            url 'https://github.com/mstrobel/procyon/issues'
                         }
 
                         licenses {
@@ -213,4 +218,3 @@ subprojects {
         }
     }
 }
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Sun Oct 27 14:39:59 EDT 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists