diff --git a/.gitignore b/.gitignore index 9a636c6..3386f58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ /mstrobel-procyon-ee404caa9a29.zip -/v0.5.36.tar.gz -/procyon-1.0~SNAPSHOT.tar.gz -/procyon-92ba3f44b8f2b755a21efcdc05dec347ab4df552.tar.gz -/procyon-88a95fa93c58322393174f84543edc7a0a2ca44d.tar.gz diff --git a/adaptToNewerJcommander.patch b/adaptToNewerJcommander.patch new file mode 100644 index 0000000..bab3d59 --- /dev/null +++ b/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 = "") +- private final List _inputs = new ArrayList<>(); ++ private List _inputs = new ArrayList<>(); + + @Parameter( + names = { "-?", "--help" }, + diff --git a/disableFatJar.patch b/disableFatJar.patch new file mode 100644 index 0000000..5d8bbef --- /dev/null +++ b/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' + diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 817fc26..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -ex - -name=procyon -version=`cat procyon.spec | grep "%global commit " | sed "s/.*commit //"` - -# RETRIEVE -rm -rf procyon -git clone "https://github.com/mstrobel/procyon.git" - -# CLEAN TARBALL -pushd procyon -git checkout "$version" - -rm -rf .git .idea docs -rm -rf gradle* -popd - -rm -rf "${name}-${version}" -mv procyon "${name}-${version}" - -tar -czf "${name}-${version}.tar.gz" "${name}-${version}" -rm -rf "${name}-${version}" diff --git a/madeToPasXlint.patch b/madeToPasXlint.patch deleted file mode 100644 index c1eb252..0000000 --- a/madeToPasXlint.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/Procyon.CompilerTools/src/main/java/com/strobel/assembler/metadata/MethodBinder.java -+++ b/Procyon.CompilerTools/src/main/java/com/strobel/assembler/metadata/MethodBinder.java2 -@@ -213,7 +213,7 @@ - - // - // Find the most specific method based on the parameters. On the first pass, prohibit -- // auto-(un)boxing and variable arity (see JLS §15.12.2.2). -+ // auto-(un)boxing and variable arity (see JLS 15.12.2.2). - // - int result = findMostSpecific( - m1.getParameters(), -@@ -229,7 +229,7 @@ - - // - // If the first attempt produced an ambiguous result, try again with boxing conversions -- // allowed (see JLS §15.12.2.3). -+ // allowed (see JLS 15.12.2.3). - // - if (result == 0) { - result = findMostSpecific( -@@ -247,7 +247,7 @@ - - // - // If the second attempt produced an ambiguous result, try again with both boxing -- // conversions and variable arity allowed (see JLS §15.12.2.4). -+ // conversions and variable arity allowed (see JLS 15.12.2.4). - // - if (result == 0) { - result = findMostSpecific( - diff --git a/procyon.spec b/procyon.spec index 08caf50..e87b00f 100644 --- a/procyon.spec +++ b/procyon.spec @@ -1,40 +1,56 @@ #in noarch? why... %define debug_package %{nil} +# assembled single-jar decompiler can not be currently packed in fedora, but can be build locally +%global enable_fat_jar 0 %global remove_tests 1 -%global commit 88a95fa93c58322393174f84543edc7a0a2ca44d -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20220221 - Name: procyon -Version: 0.6.0 -Release: 0.11.%{commitdate}.git%{shortcommit}%{?dist} +Version: 0.5.33 +Release: 0.2.pre02%{?dist} Summary: procyon java decompiler and other tools -# Automatically converted from old format: ASL 2.0 - review is highly recommended. -License: Apache-2.0 -URL: https://github.com/mstrobel/procyon -# ./generate-tarball.sh -# This script uses a fork of the original project -Source0: %{name}-%{commit}.tar.gz +License: ASL 2.0 +URL: https://bitbucket.org/mstrobel/procyon/ +#Source0: https://bitbucket.org/mstrobel/procyon/get/ee404caa9a29.zip +Source0: mstrobel-procyon-ee404caa9a29.zip Source1: procyon-decompiler -Patch3: madeToPasXlint.patch - - +# main removal is not upstream-able, and is enforced by fedora policy +# signature is touching online world, necessary for packaging, not usptream able +Patch0: removeSigningAndIfDecompilerAndMain.patch +# fat jar do not have much sense for fedora packagin. not upstream-able +Patch1: disableFatJar.patch +# patch should be proposed to upstream. +Patch2: adaptToNewerJcommander.patch BuildArch: noarch -ExclusiveArch: %{java_arches} noarch - BuildRequires: javapackages-tools -BuildRequires: java-25-devel +BuildRequires: java-devel +%if %{enable_fat_jar} +BuildRequires: gradle +%else +BuildRequires: gradle-local +%endif BuildRequires: dos2unix BuildRequires: beust-jcommander -Requires: java-25-headless +Requires: java-headless Requires: javapackages-tools -# main package is just meta package for all subprojects and their artifacts +# main package is just meta package for all subprojects andtheirs artifacts Recommends: %{name}-compilertools = %{version}-%{release} Recommends: %{name}-core = %{version}-%{release} Recommends: %{name}-expressions = %{version}-%{release} Recommends: %{name}-reflection = %{version}-%{release} Recommends: %{name}-decompiler = %{version}-%{release} +%if %{enable_fat_jar} +Recommends: %{name}-decompiler-all = %{version}-%{release} +%endif +Recommends: %{name}-compilertools-javadoc = %{version}-%{release} +Recommends: %{name}-core-javadoc = %{version}-%{release} +Recommends: %{name}-expressions-javadoc = %{version}-%{release} +Recommends: %{name}-reflection-javadoc = %{version}-%{release} +Recommends: %{name}-decompiler-javadoc = %{version}-%{release} +Recommends: %{name}-compilertools-srcs = %{version}-%{release} +Recommends: %{name}-core-srcs = %{version}-%{release} +Recommends: %{name}-expressions-srcs = %{version}-%{release} +Recommends: %{name}-reflection-srcs = %{version}-%{release} +Recommends: %{name}-decompiler-srcs = %{version}-%{release} %description Procyon is a suite of Java metaprogramming tools focused on code generation and analysis. @@ -45,7 +61,6 @@ The Procyon libraries are available from Maven Central under group ID org.bitbuc %package compilertools Summary: The procyon-compilertools project BuildArch: noarch -ExclusiveArch: %{java_arches} noarch Requires: javapackages-tools %description compilertools @@ -57,7 +72,6 @@ The Compiler Toolset is still early in development and subject to change. %package core Summary: The procyon-core framework contains common support classes BuildArch: noarch -ExclusiveArch: %{java_arches} noarch Requires: javapackages-tools %description core @@ -69,7 +83,6 @@ and some runtime type helpers. %package expressions Summary: The procyon-expressions framework provides a more natural form of Linq-like code generation BuildArch: noarch -ExclusiveArch: %{java_arches} noarch Requires: javapackages-tools %description expressions @@ -84,7 +97,6 @@ minus the dynamic callsite support (and with more relaxed rules regarding type c %package decompiler Summary: procyon-decompiler is a front-end for the Java decompiler BuildArch: noarch -ExclusiveArch: %{java_arches} noarch Requires: %{name}-core Requires: %{name}-compilertools Requires: beust-jcommander @@ -95,10 +107,21 @@ procyon-decompiler is a front-end for the Java decompiler included in procyon-co For more information about the decompiler, see the Java Decompiler wiki page - https://bitbucket.org/mstrobel/procyon/wiki/Java%20Decompiler +%if %{enable_fat_jar} +%package decompiler-all +Summary: procyon-decompiler-all is library with assembled core and compiler-tools together with cli +BuildArch: noarch +Requires: javapackages-tools + +%description decompiler-all +procyon-decompiler is a front-end for the Java decompiler with all depndencies packed +For more information about the decompiler, see the Java Decompiler wiki page - +https://bitbucket.org/mstrobel/procyon/wiki/Java%20Decompiler +%endif + %package reflection Summary: The procyon-reflection framework provides a rich reflection and code generation API BuildArch: noarch -ExclusiveArch: %{java_arches} noarch Requires: javapackages-tools %description reflection @@ -108,8 +131,83 @@ Emit APIs and is meant to address many of the shortcomings of the core Java refl limited and cumbersome support for generic type inspection. Its code generation facilities include a TypeBuilder, MethodBuilder, and a bytecode emitter. +%package compilertools-javadoc +Summary: The procyon-compilertools project javadoc +BuildArch: noarch + +%description compilertools-javadoc +javadoc + +%package core-javadoc +Summary: The procyon-core framework javadoc +BuildArch: noarch + +%description core-javadoc +javadoc + +%package expressions-javadoc +Summary: The procyon-expressions framework provides javadoc +BuildArch: noarch + +%description expressions-javadoc +javadoc + +%package decompiler-javadoc +Summary: procyon-decompiler javadoc +BuildArch: noarch + +%description decompiler-javadoc +javadoc + +%package reflection-javadoc +Summary: The procyon-reflection framework javadoc +BuildArch: noarch + +%description reflection-javadoc +javadoc + +%package compilertools-srcs +Summary: The procyon-compilertools project sources +BuildArch: noarch +Requires: javapackages-tools + +%description compilertools-srcs +sources + +%package core-srcs +Summary: The procyon-core framework sources +BuildArch: noarch +Requires: javapackages-tools + +%description core-srcs +sources + +%package expressions-srcs +Summary: The procyon-expressions framework provides sources +BuildArch: noarch +Requires: javapackages-tools + +%description expressions-srcs +sources + +%package decompiler-srcs +Summary: procyon-decompiler sources +BuildArch: noarch +Requires: javapackages-tools + +%description decompiler-srcs +sources + +%package reflection-srcs +Summary: The procyon-reflection framework sources +BuildArch: noarch +Requires: javapackages-tools + +%description reflection-srcs +sources + %prep -%setup -q -n %{name}-%{commit} +%setup -q -n mstrobel-procyon-ee404caa9a29 %if %{remove_tests} find | grep "\\.class$" #find | grep "\\.jar$" @@ -121,57 +219,83 @@ find | grep "\\.jar$" && exit 1 dos2unix Procyon.Decompiler/build.gradle dos2unix build.gradle dos2unix README.md -dos2unix Procyon.CompilerTools/src/main/java/com/strobel/assembler/metadata/MethodBinder.java -%patch -P3 -p1 +# also removing main method from enter point jar +%patch0 -p1 +%if %{enable_fat_jar} +echo "not applying patch1, enabeld fat jar" +%else +%patch1 -p1 +%endif +%patch2 -p1 %build -mkdir -p build/Procyon.CompilerTools/{libs,classes} -mkdir -p build/Procyon.Core/{libs,classes} -mkdir -p build/Procyon.Decompiler/{libs,classes} -mkdir -p build/Procyon.Expressions/{libs,classes} -mkdir -p build/Procyon.Reflection/{libs,classes} - -sourceVersion="-source 8 -target 8 -g" - -javac $sourceVersion -d build/Procyon.Core/classes/ ` find Procyon.Core/src/main/java -type f | grep "\.java"` -javac $sourceVersion -d build/Procyon.Reflection/classes/ -cp build/Procyon.Core/classes/ ` find Procyon.Reflection/src/main/java -type f | grep "\.java"` -javac $sourceVersion -d build/Procyon.Expressions/classes/ -cp build/Procyon.Core/classes/:build/Procyon.Reflection/classes/ ` find Procyon.Expressions/src/main/java -type f | grep "\.java"` -javac $sourceVersion -d build/Procyon.CompilerTools/classes/ -cp build/Procyon.Core/classes/ ` find Procyon.CompilerTools/src/main/java -type f | grep "\.java"` - -# pack the jars -for x in Procyon.CompilerTools Procyon.Core Procyon.Reflection Procyon.Expressions ; do - pushd build/$x/classes/ - project=`echo $x | sed -e "s/Procyon.//" | sed -e 's/\(.*\)/\L\1/'` - jar -cf ../../../build/$x/libs/%{name}-$project-%{version}.jar com - popd -done - +#gradle build -x test +%gradle_build -f # create just launcher jar to be used in fedora -mkdir build/launcher-minimal -mkdir build/launcher-minimal/classes -javac -source 8 -target 8 -cp build/Procyon.Core/classes/:build/Procyon.CompilerTools/classes/:%{_javadir}/beust-jcommander.jar -d build/launcher-minimal/classes ` find Procyon.Decompiler/src/main/java -type f | grep "\.java"` +mkdir launcher-minimal +mkdir launcher-minimal/classes +javac -cp build/Procyon.Core/libs/%{name}-core-%{version}.jar:build/Procyon.CompilerTools/libs/%{name}-compilertools-%{version}.jar:%{_javadir}/beust-jcommander.jar -d launcher-minimal/classes ` find Procyon.Decompiler/src/main/java -type f | grep "\.java"` +%if %{enable_fat_jar} +# some dependent packages depnds on this assembeld decompiler jar (we build without its main in manifest (good idea?), see patch0 +gradle fatjar -x test +# rename +mv build/Procyon.Decompiler/libs/%{name}-decompiler-%{version}.jar build/Procyon.Decompiler/libs/%{name}-decompiler-all-%{version}.jar +%endif # pack the minimal jar -pushd build/launcher-minimal/classes/ -jar -cf ../../../build/Procyon.Decompiler/libs/%{name}-decompiler-%{version}.jar com +pushd launcher-minimal/classes/ +jar -cf ../../build/Procyon.Decompiler/libs/%{name}-decompiler-%{version}.jar com popd %install mkdir -p $RPM_BUILD_ROOT/%{_bindir}/ cp %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ # cusotm launcher for main method in main jar mkdir -p $RPM_BUILD_ROOT/%{_javadir}/%{name}/ +mkdir -p $RPM_BUILD_ROOT/%{_javadir}/%{name}/srcs +mkdir -p $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/ cp build/Procyon.CompilerTools/libs/%{name}-compilertools-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/ cp build/Procyon.Core/libs/%{name}-core-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/ cp build/Procyon.Decompiler/libs/%{name}-decompiler-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/ +%if %{enable_fat_jar} +cp build/Procyon.Decompiler/libs/%{name}-decompiler-all-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/ +%endif cp build/Procyon.Expressions/libs/%{name}-expressions-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/ cp build/Procyon.Reflection/libs/%{name}-reflection-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/ +cp build/Procyon.CompilerTools/libs/%{name}-compilertools-%{version}-javadoc.jar $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/ +cp build/Procyon.Core/libs/%{name}-core-%{version}-javadoc.jar $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/ +cp build/Procyon.Decompiler/libs/%{name}-decompiler-%{version}-javadoc.jar $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/ +cp build/Procyon.Expressions/libs/%{name}-expressions-%{version}-javadoc.jar $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/ +cp build/Procyon.Reflection/libs/%{name}-reflection-%{version}-javadoc.jar $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/ + +cp build/Procyon.CompilerTools/libs/%{name}-compilertools-%{version}-sources.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/srcs/ +cp build/Procyon.Core/libs/%{name}-core-%{version}-sources.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/srcs/ +cp build/Procyon.Decompiler/libs/%{name}-decompiler-%{version}-sources.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/srcs/ +cp build/Procyon.Expressions/libs/%{name}-expressions-%{version}-sources.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/srcs/ +cp build/Procyon.Reflection/libs/%{name}-reflection-%{version}-sources.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/srcs/ pushd $RPM_BUILD_ROOT/%{_javadir}/%{name}/ ln -s %{name}-compilertools-%{version}.jar %{name}-compilertools.jar ln -s %{name}-core-%{version}.jar %{name}-core.jar ln -s %{name}-decompiler-%{version}.jar %{name}-decompiler.jar +%if %{enable_fat_jar} +ln -s %{name}-decompiler-all-%{version}.jar %{name}-decompiler-all.jar +%endif ln -s %{name}-expressions-%{version}.jar %{name}-expressions.jar ln -s %{name}-reflection-%{version}.jar %{name}-reflection.jar popd +pushd $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/ +ln -s %{name}-compilertools-%{version}-javadoc.jar %{name}-compilertools-javadoc.jar +ln -s %{name}-core-%{version}-javadoc.jar %{name}-core-javadoc.jar +ln -s %{name}-decompiler-%{version}-javadoc.jar %{name}-decompiler-javadoc.jar +ln -s %{name}-expressions-%{version}-javadoc.jar %{name}-expressions-javadoc.jar +ln -s %{name}-reflection-%{version}-javadoc.jar %{name}-reflection-javadoc.jar +popd +pushd $RPM_BUILD_ROOT/%{_javadir}/%{name}/srcs +ln -s %{name}-compilertools-%{version}-sources.jar %{name}-compilertools-sources.jar +ln -s %{name}-core-%{version}-sources.jar %{name}-core-sources.jar +ln -s %{name}-decompiler-%{version}-sources.jar %{name}-decompiler-sources.jar +ln -s %{name}-expressions-%{version}-sources.jar %{name}-expressions-sources.jar +ln -s %{name}-reflection-%{version}-sources.jar %{name}-reflection-sources.jar +popd %files %license License.txt @@ -206,6 +330,16 @@ popd %license License.txt %doc README.md +%if %{enable_fat_jar} +%files decompiler-all +%dir %{_javadir}/%{name} +%{_bindir}/%{name}-decompiler +%{_javadir}/%{name}/%{name}-decompiler-all-%{version}.jar +%{_javadir}/%{name}/%{name}-decompiler-all.jar +%license License.txt +%doc README.md +%endif + %files reflection %dir %{_javadir}/%{name}/ %{_javadir}/%{name}/%{name}-reflection-%{version}.jar @@ -213,5 +347,90 @@ popd %license License.txt %doc README.md +%files compilertools-javadoc +%dir %{_javadocdir}/%{name}/ +%{_javadocdir}/%{name}/%{name}-compilertools-%{version}-javadoc.jar +%{_javadocdir}/%{name}/%{name}-compilertools-javadoc.jar +%license License.txt +%doc README.md + +%files core-javadoc +%dir %{_javadocdir}/%{name}/ +%{_javadocdir}/%{name}/%{name}-core-%{version}-javadoc.jar +%{_javadocdir}/%{name}/%{name}-core-javadoc.jar +%license License.txt +%doc README.md + +%files expressions-javadoc +%dir %{_javadocdir}/%{name}/ +%{_javadocdir}/%{name}/%{name}-expressions-%{version}-javadoc.jar +%{_javadocdir}/%{name}/%{name}-expressions-javadoc.jar +%license License.txt +%doc README.md + +%files decompiler-javadoc +%dir %{_javadocdir}/%{name}/ +%{_bindir}/%{name}-decompiler +%{_javadocdir}/%{name}/%{name}-decompiler-%{version}-javadoc.jar +%{_javadocdir}/%{name}/%{name}-decompiler-javadoc.jar +%license License.txt +%doc README.md + +%files reflection-javadoc +%dir %{_javadocdir}/%{name}/ +%{_javadocdir}/%{name}/%{name}-reflection-%{version}-javadoc.jar +%{_javadocdir}/%{name}/%{name}-reflection-javadoc.jar +%license License.txt +%doc README.md + +%files compilertools-srcs +%dir %{_javadir}/%{name} +%dir %{_javadir}/%{name}/srcs +%{_javadir}/%{name}/srcs/%{name}-compilertools-%{version}-sources.jar +%{_javadir}/%{name}/srcs/%{name}-compilertools-sources.jar +%license License.txt +%doc README.md + +%files core-srcs +%dir %{_javadir}/%{name} +%dir %{_javadir}/%{name}/srcs +%{_javadir}/%{name}/srcs/%{name}-core-%{version}-sources.jar +%{_javadir}/%{name}/srcs/%{name}-core-sources.jar +%license License.txt +%doc README.md + +%files expressions-srcs +%dir %{_javadir}/%{name} +%dir %{_javadir}/%{name}/srcs +%{_javadir}/%{name}/srcs/%{name}-expressions-%{version}-sources.jar +%{_javadir}/%{name}/srcs/%{name}-expressions-sources.jar +%license License.txt +%doc README.md + +%files decompiler-srcs +%dir %{_javadir}/%{name} +%dir %{_javadir}/%{name}/srcs +%{_bindir}/%{name}-decompiler +%{_javadir}/%{name}/srcs/%{name}-decompiler-%{version}-sources.jar +%{_javadir}/%{name}/srcs/%{name}-decompiler-sources.jar +%license License.txt +%doc README.md + +%files reflection-srcs +%dir %{_javadir}/%{name} +%dir %{_javadir}/%{name}/srcs +%{_javadir}/%{name}/srcs/%{name}-reflection-%{version}-sources.jar +%{_javadir}/%{name}/srcs/%{name}-reflection-sources.jar +%license License.txt +%doc README.md + %changelog -%autochangelog +* Sat Feb 02 2019 Fedora Release Engineering - 0.5.33-0.2.pre02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Dec 21 2018 Jiri Vanek 0.5.33-0.1.pre02 +- created special package for assembled fat jar +- adapted rest of package to include and cooperate with minimal decompiler frontend + +* Fri Dec 21 2018 Jiri Vanek 0.5.33-0.1.pre01 +- inital load diff --git a/removeSigningAndIfDecompilerAndMain.patch b/removeSigningAndIfDecompilerAndMain.patch new file mode 100644 index 0000000..31315a9 --- /dev/null +++ b/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 +- } +- } +- } +- } +- } +- } +- } + } + diff --git a/sources b/sources index 1dfc060..8948dbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (procyon-88a95fa93c58322393174f84543edc7a0a2ca44d.tar.gz) = 69c782cb8648f5c8f6ed1999d301df2318f64a3d3479a16ef340891deaef7a1b161d4d2808d98e70372381626dbe5488d9d0dc9b6c17feacc8e0d38f1747985e +SHA512 (mstrobel-procyon-ee404caa9a29.zip) = f47a9539509ac380e5fc1cb694a8f5f17a9b925726f937c92cffcce4490ed6e4773f9cf265fc28c8a4eb51da6b0257730a4ae3a8e343e17c1dfe9eeee4fcadb0