feat: update gradle and some flow transformers

build.gradle

@@ -1,47 +1,44 @@
+plugins {
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+    id 'java'
+}
+
 group 'me.itzsomebody'
 version '2.0.0-SNAPSHOT'
 
-apply plugin: 'java'
-
+defaultTasks 'clean', 'shadowJar'
 sourceCompatibility = 1.8
+def main = 'me.itzsomebody.radon.Main'
 
-jar {
-    baseName = project.name
-
-    manifest {
-        attributes 'Main-Class': 'me.itzsomebody.radon.Main'
-    }
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
 }
 
-task fatJar(type: Jar) {
-    baseName = project.name + '-shaded'
-
-    manifest {
-        attributes 'Main-Class': 'me.itzsomebody.radon.Main'
-    }
-
-    from { configurations.compile.collect { !it.isDirectory() && it.getName().endsWith(".jar") ? zipTree(it) : it } }
-    with jar
+jar {
+    manifest { attributes 'Main-Class': main }
 }
 
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
+shadowJar() {
+    classifier = null
+
+    relocate 'org.objectweb.asm', 'me.itzsomebody.radon.asm.lib'
+    exclude 'module-info.class'
+    manifest { attributes 'Main-Class': main }
 }
 
 repositories {
     mavenCentral()
-	maven { // Needed for SnakeYAML
-        url "http://oss.sonatype.org/content/groups/public/"
-    }
+    maven { url "http://oss.sonatype.org/content/groups/public/" } // SnakeYAML
 }
 
 dependencies {
-    compile 'org.ow2.asm:asm:7.0'
-    compile 'org.ow2.asm:asm-tree:7.0'
-    compile 'org.ow2.asm:asm-commons:7.0'
-    compile 'org.ow2.asm:asm-util:7.0'
-	compile 'org.yaml:snakeyaml:1.20-SNAPSHOT'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.powermock:powermock-api-mockito:1.6.6'
-    testCompile 'org.powermock:powermock-module-junit4:1.6.6'
+    implementation 'org.ow2.asm:asm:7.1'
+    implementation 'org.ow2.asm:asm-tree:7.1'
+    implementation 'org.ow2.asm:asm-commons:7.1'
+    implementation 'org.ow2.asm:asm-util:7.1'
+    implementation 'org.yaml:snakeyaml:1.20-SNAPSHOT'
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.6'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip

src/main/java/me/itzsomebody/radon/asm/StackHeightZeroFinder.java

@@ -305,4 +305,4 @@ private static int doMethodEmulation(String desc) {
 
         return result;
     }
-}
+}

src/main/java/me/itzsomebody/radon/transformers/obfuscators/flow/BlockSplitter.java

@@ -39,7 +39,7 @@
  */
 public class BlockSplitter extends FlowObfuscation {
     // used to limit number of recursive calls on doSplit()
-    private static final int LIMIT_SIZE = 10;
+    private static final int LIMIT_SIZE = 11;
 
     @Override
     public void transform() {

src/main/java/me/itzsomebody/radon/transformers/obfuscators/flow/FlowObfuscationSetting.java

@@ -22,9 +22,9 @@ public enum FlowObfuscationSetting {
     REPLACE_GOTO(Boolean.class, new GotoReplacer()),
     INSERT_BOGUS_SWITCH_JUMPS(Boolean.class, new BogusSwitchJumpInserter()),
     INSERT_BOGUS_JUMPS(Boolean.class, new BogusJumpInserter()),
+    MUTILATE_NULL_CHECK(Boolean.class, new NullCheckMutilator()),
     SPLIT_BLOCKS(Boolean.class, new BlockSplitter()),
-    FAKE_CATCH_BLOCKS(Boolean.class, new FakeCatchBlocks()),
-    MUTILATE_NULL_CHECK(Boolean.class, new NullCheckMutilator());
+    FAKE_CATCH_BLOCKS(Boolean.class, new FakeCatchBlocks());
 
     private final Class expectedType;
     private final FlowObfuscation flowObfuscation;