Merge branch 'rawhide' into epel8

adaptToNewerJcommander.patch

@@ -0,0 +1,12 @@
+--- a/Procyon.Decompiler/src/main/java/com/strobel/decompiler/CommandLineOptions.java_nw
++++ b/Procyon.Decompiler/src/main/java/com/strobel/decompiler/CommandLineOptions.java
+@@ -23,7 +23,7 @@
+ 
+ public class CommandLineOptions {
+     @Parameter(description = "<type names or class/jar files>")
+-    private final List<String> _inputs = new ArrayList<>();
++    private List<String> _inputs = new ArrayList<>();
+ 
+     @Parameter(
+         names = { "-?", "--help" },
+

disableFatJar.patch

@@ -0,0 +1,28 @@
+diff -r ee404caa9a29 Procyon.Decompiler/build.gradle
+--- a/Procyon.Decompiler/build.gradle
++++ b/Procyon.Decompiler/build.gradle.nw
+@@ -3,23 +3,10 @@
+         jcenter()
+     }
+ 
+-    dependencies {
+-        classpath 'eu.appsatori:gradle-fatjar-plugin:0.3'
+-    }
+ }
+ 
+ jar.enabled = true
+ uploadArchives.enabled = false
+-
+-apply plugin: 'eu.appsatori.fatjar'
+-
+-fatJar {
+-//    from rootProject.allprojects.collect({ it.sourceSets.main.allSource })
+-
+-    manifest {
+-        attributes 'Title': archivesBaseName, 'Manifest-Version': '1.0', 'Version': version
+-    }
+-}
+ 
+ dependencies {
+     compile 'com.beust:jcommander:1.30'
+

removeSigningAndIfDecompilerAndMain.patch

@@ -0,0 +1,127 @@
+diff -r ee404caa9a29 Procyon.Decompiler/build.gradle
+--- a/Procyon.Decompiler/build.gradle	Thu Jul 26 07:08:30 2018 -0400
++++ b/Procyon.Decompiler/build.gradle	Fri Dec 21 17:02:23 2018 +0100
+@@ -8,7 +8,7 @@
+     }
+ }
+ 
+-jar.enabled = false
++jar.enabled = true
+ uploadArchives.enabled = false
+ 
+ apply plugin: 'eu.appsatori.fatjar'
+@@ -17,7 +17,7 @@
+ //    from rootProject.allprojects.collect({ it.sourceSets.main.allSource })
+ 
+     manifest {
+-        attributes 'Title': archivesBaseName, 'Manifest-Version': '1.0', 'Version': version, 'Main-Class' : 'com.strobel.decompiler.DecompilerDriver'
++        attributes 'Title': archivesBaseName, 'Manifest-Version': '1.0', 'Version': version
+     }
+ }
+ 
+@@ -25,4 +25,4 @@
+     compile 'com.beust:jcommander:1.30'
+     compile project(':Procyon.Core')
+     compile project(':Procyon.CompilerTools')
+-}
+\ No newline at end of file
++}
+diff -r ee404caa9a29 build.gradle
+--- a/build.gradle	Thu Jul 26 07:08:30 2018 -0400
++++ b/build.gradle	Fri Dec 21 17:02:23 2018 +0100
+@@ -59,7 +59,6 @@
+ 
+ subprojects {
+     apply plugin: 'maven'
+-    apply plugin: 'signing'
+ 
+     archivesBaseName = 'procyon-' + it.name.split("\\.")[1].toLowerCase()
+ 
+@@ -80,7 +79,7 @@
+         from sourceSets.main.allSource
+     }
+ 
+-    if (project.name != "Procyon.Decompiler") {
++
+         javadoc {
+             options.encoding = 'UTF-8'
+         }
+@@ -91,78 +90,6 @@
+             archives sourcesJar
+         }
+ 
+-        signing {
+-            sign configurations.archives
+-        }
+ 
+-        uploadArchives {
+-            repositories.mavenDeployer {
+-                beforeDeployment { MavenDeployment deployment ->
+-                    signing.signPom(deployment)
+-                }
+-                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots") {
+-                    authentication(userName: project.properties.get("sonatypeUsername"), password: project.properties.get("sonatypePassword"))
+-                }
+-
+-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
+-                    authentication(userName: project.properties.get("sonatypeUsername"), password: project.properties.get("sonatypePassword"))
+-                }
+-
+-                pom {
+-                    groupId = project.group
+-                    version = project.version
+-                    artifactId = project.archivesBaseName
+-
+-                    project {
+-                        name project.archivesBaseName
+-                        packaging 'jar'
+-                        description 'Procyon'
+-                        url 'https://bitbucket.org/mstrobel/procyon'
+-
+-                        scm {
+-                            url 'https://bitbucket.org/mstrobel/procyon'
+-                            connection 'scm:hg:https://hg@bitbucket.org/mstrobel/procyon'
+-                            developerConnection 'scm:hg:https://mstrobel@bitbucket.org/mstrobel/procyon'
+-                        }
+-
+-                        issueManagement {
+-                            system 'jira'
+-                            url 'https://bitbucket.org/mstrobel/procyon/issues'
+-                        }
+-
+-                        licenses {
+-                            license {
+-                                name 'The Apache Software License, Version 2.0'
+-                                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+-                                distribution 'repo'
+-                            }
+-                        }
+-
+-                        developers {
+-                            developer {
+-                                id 'mstrobel'
+-                                name 'Mike Strobel'
+-                                roles {
+-                                    role 'owner'
+-                                    role 'packager'
+-                                    role 'developer'
+-                                }
+-                            }
+-                        }
+-
+-                        dependencies {
+-                            dependency {
+-                                groupId 'junit'
+-                                artifactId 'junit'
+-                                version '4.11'
+-                                scope 'test'
+-//                                optional = true
+-                            }
+-                        }
+-                    }
+-                }
+-            }
+-        }
+-    }
+ }
+