Some small changes to fix idea importing

7 files changed, 264 insertions, 149 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..473f5559
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/Enigma.iml
+/bin
+/build
+/.gradle
+/.idea
diff --git a/build.gradle b/build.gradle
index fc599e2b..b223f28d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@ apply plugin: 'maven'
 group = 'cuchaz'
 version = '0.10.4b'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 // Custom source layout
 sourceSets {
@@ -51,6 +51,7 @@ dependencies {
         compile 'com.google.guava:guava:17.+'
         compile 'org.javassist:javassist:3.+'
         compile 'org.bitbucket.mstrobel:procyon-decompiler:0.5.28-enigma'
+        compile 'org.javassist:javassist:3.20.0-GA'
         application 'de.sciss:syntaxpane:1.1.+'
         
         testCompile 'junit:junit:4.+'
diff --git a/build.py b/build.py
deleted file mode 100644
index 55dc85f0..00000000
--- a/build.py
+++ /dev/null
@@ -1,147 +0,0 @@
-
-import os
-import sys
-
-# settings
-PathSsjb = "../ssjb"
-Author = "Cuchaz"
-Version = "0.11b"
-
-DirBin = "bin"
-DirLib = "lib"
-DirBuild = "build"
-PathLocalMavenRepo = "../maven"
-
-
-# import ssjb
-sys.path.insert(0, PathSsjb)
-import ssjb
-import ssjb.ivy
-
-
-ArtifactStandalone = ssjb.ivy.Dep("cuchaz:enigma:%s" % Version)
-ArtifactLib = ssjb.ivy.Dep("cuchaz:enigma-lib:%s" % Version)
-
-# dependencies
-ExtraRepos = [
-        "http://maven.cuchazinteractive.com"
-]
-LibDeps = [
-        ssjb.ivy.Dep("com.google.guava:guava:17.0"),
-        ssjb.ivy.Dep("org.javassist:javassist:3.19.0-GA"),
-        ssjb.ivy.Dep("org.bitbucket.mstrobel:procyon-decompiler:0.5.28-enigma")
-]
-StandaloneDeps = LibDeps + [
-        ssjb.ivy.Dep("de.sciss:syntaxpane:1.1.4")
-]
-ProguardDep = ssjb.ivy.Dep("net.sf.proguard:proguard-base:5.1")
-TestDeps = [
-        ssjb.ivy.Dep("junit:junit:4.12"),
-        ssjb.ivy.Dep("org.hamcrest:hamcrest-all:1.3")
-]
-
-# functions
-
-def buildTestJar(name, glob):
-
-        ssjb.file.mkdir(os.path.join(DirBuild, "test-inputs"))
-        ssjb.file.mkdir(os.path.join(DirBuild, "test-obf"))
-        pathJar = os.path.join(DirBuild, "test-inputs/%s.jar" % name)
-        pathObfJar = os.path.join(DirBuild, "test-obf/%s.jar" % name)
-
-        # build the unobf jar
-        with ssjb.file.TempDir("tmp") as dirTemp:
-                ssjb.file.copyTree(dirTemp, DirBin, ssjb.file.find(DirBin, "cuchaz/enigma/inputs/Keep.class"))
-                ssjb.file.copyTree(dirTemp, DirBin, ssjb.file.find(DirBin, glob))
-                ssjb.jar.makeJar(pathJar, dirTemp)
-
-        # build the obf jar
-        ssjb.callJavaJar(
-                os.path.join(DirLib, "proguard.jar"),
-                ["@proguard-test.conf", "-injars", pathJar, "-outjars", pathObfJar]
-        )
-
-def buildDeobfTestJar(outPath, inPath):
-        ssjb.callJava(
-                [DirBin, os.path.join(DirLib, "deps.jar")],
-                "cuchaz.enigma.CommandMain",
-                ["deobfuscate", inPath, outPath]
-        )
-
-def applyReadme(dirTemp):
-        ssjb.file.copy(dirTemp, "license.APL2.txt")
-        ssjb.file.copy(dirTemp, "license.LGPL3.txt")
-        ssjb.file.copy(dirTemp, "readme.txt")
-
-def buildStandaloneJar(dirOut):
-        with ssjb.file.TempDir(os.path.join(dirOut, "tmp")) as dirTemp:
-                ssjb.file.copyTree(dirTemp, DirBin, ssjb.file.find(DirBin))
-                for path in ssjb.ivy.getJarPaths(StandaloneDeps, ExtraRepos):
-                        ssjb.jar.unpackJar(dirTemp, path)
-                ssjb.file.delete(os.path.join(dirTemp, "LICENSE.txt"))
-                ssjb.file.delete(os.path.join(dirTemp, "META-INF/maven"))
-                applyReadme(dirTemp)
-                manifest = ssjb.jar.buildManifest(
-                        ArtifactStandalone.artifactId,
-                        ArtifactStandalone.version,
-                        Author,
-                        "cuchaz.enigma.Main"
-                )
-                pathFatJar = os.path.join(DirBuild, "%s-fat.jar" % ArtifactStandalone.getName()) 
-                ssjb.jar.makeJar(pathFatJar, dirTemp, manifest=manifest)
-
-                # proguard the jar (without obfuscating) to remove some bloat
-                # the guava library is particularly bad...
-                pathDietJar = os.path.join(DirBuild, "%s.jar" % ArtifactStandalone.getName())
-                ssjb.callJavaJar(
-                        os.path.join(DirLib, "proguard.jar"),
-                        ["@proguard-build.conf", "-injars", pathFatJar, "-outjars", pathDietJar]
-                )
-
-                ssjb.ivy.deployJarToLocalMavenRepo(PathLocalMavenRepo, pathDietJar, ArtifactStandalone)
-
-
-def buildLibJar(dirOut):
-        with ssjb.file.TempDir(os.path.join(dirOut, "tmp")) as dirTemp:
-                ssjb.file.copyTree(dirTemp, DirBin, ssjb.file.find(DirBin))
-                applyReadme(dirTemp)
-                pathJar = os.path.join(DirBuild, "%s.jar" % ArtifactLib.getName()) 
-                ssjb.jar.makeJar(pathJar, dirTemp)
-                ssjb.ivy.deployJarToLocalMavenRepo(PathLocalMavenRepo, pathJar, ArtifactLib, deps=LibDeps)
-
-
-# tasks
-
-def taskGetDeps():
-        """Get all the Deps."""
-        ssjb.file.mkdir(DirLib)
-        ssjb.ivy.makeLibsJar(os.path.join(DirLib, "deps.jar"), StandaloneDeps, extraRepos=ExtraRepos)
-        ssjb.ivy.makeLibsJar(os.path.join(DirLib, "test-deps.jar"), TestDeps)
-        ssjb.ivy.makeJar(os.path.join(DirLib, "proguard.jar"), ProguardDep)
-
-def taskBuildTestJars():
-        """Build the test jar."""
-        buildTestJar("loneClass", "cuchaz/enigma/inputs/loneClass/*.class")
-        buildTestJar("constructors", "cuchaz/enigma/inputs/constructors/*.class")
-        buildTestJar("inheritanceTree", "cuchaz/enigma/inputs/inheritanceTree/*.class")
-        buildTestJar("innerClasses", "cuchaz/enigma/inputs/innerClasses/*.class")
-        taskBuildTranslationTestJar()
-
-def taskBuildTranslationTestJar():
-        """Build the Translation test jar."""
-        buildTestJar("translation", "cuchaz/enigma/inputs/translation/*.class")
-        buildDeobfTestJar(os.path.join(DirBuild, "test-deobf/translation.jar"), os.path.join(DirBuild, "test-obf/translation.jar"))
-
-def taskBuild():
-        """Build the engima jar."""
-        ssjb.file.delete(DirBuild)
-        ssjb.file.mkdir(DirBuild)
-        buildStandaloneJar(DirBuild)
-        buildLibJar(DirBuild)
-
-ssjb.registerTask("getDeps", taskGetDeps)
-ssjb.registerTask("buildTestJars", taskBuildTestJars)
-ssjb.registerTask("buildTranslationTestJar", taskBuildTranslationTestJar)
-ssjb.registerTask("build", taskBuild)
-ssjb.run()
-
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..94114481
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..6ada8a3b
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Jun 26 11:20:16 BST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 00000000..9d82f789
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega