Update header generator and dependencies

Author: timscriptov

app/build.gradle

@@ -3,12 +3,13 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion = '30.0.2'
+    buildToolsVersion = '30.0.3'
     ndkVersion '21.0.6113669'
 
     defaultConfig {
         applicationId "com.mcal.disassembler"
         minSdkVersion 14
+        //noinspection OldTargetApi
         targetSdkVersion 29
         versionCode 23
         versionName "2.3"
@@ -41,18 +42,18 @@ dependencies {
 	implementation project(':library')
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 	implementation 'androidx.cardview:cardview:1.0.0'
-	implementation 'androidx.annotation:annotation:1.1.0'
+	implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation "androidx.core:core-ktx:1.3.1"
+    implementation "androidx.core:core-ktx:1.5.0"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10"
-    implementation 'org.jetbrains:annotations:19.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20"
+    implementation 'org.jetbrains:annotations:21.0.1'
 
-	implementation 'com.google.android.material:material:1.2.1'
+	implementation 'com.google.android.material:material:1.3.0'
 
 	implementation 'com.anjlab.android.iab.v3:library:1.1.0'
-    implementation  'com.jakewharton:butterknife:8.5.1'
+    implementation  'com.jakewharton:butterknife:10.2.3'
     //annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
     implementation 'com.nineoldandroids:library:2.4.0'
 }

app/proguard-rules.pro

@@ -1,6 +1,4 @@
 -keepattributes SourceFile, LineNumberTable
-
 -renamesourcefileattribute SourceFile
--repackageclasses disassembler
 
--keep class com.mcal.disassembler.activities.MainActivity
+-dontobfuscate

app/src/main/java/com/mcal/disassembler/util/FileSaver.java

@@ -5,9 +5,9 @@
 import java.io.IOException;
 
 public class FileSaver {
-    private String name;
-    private String[] file;
-    private String path;
+    private final String name;
+    private final String[] file;
+    private final String path;
 
     public FileSaver(String path, String name, String[] file) {
         this.name = name;

app/src/main/java/com/mcal/disassembler/util/HeaderGenerator.java

@@ -10,8 +10,8 @@
 import java.util.Vector;
 
 public class HeaderGenerator {
-    private DisassemblerClass disassemblerClass;
-    private DisassemblerVtable vtable;
+    private final DisassemblerClass disassemblerClass;
+    private final DisassemblerVtable vtable;
     private String[] namespace;
     private String className;
 
@@ -96,6 +96,8 @@ private String getOwnerClass(DisassemblerSymbol sym) throws Exception {
     public String[] generate() {
         Vector<String> lines = new Vector<>();
         try {
+            lines.addElement("#ifdef _" + className.toUpperCase() + "_H");
+            lines.addElement("");
             lines.addElement("#pragma once");
             lines.addElement("");
             lines.addElement("//This header template file is generated by Disassembler.");
@@ -151,6 +153,8 @@ public String[] generate() {
                 }
             }
             lines.addElement("};//" + className);
+            lines.addElement("");
+            lines.addElement("#endif // _" + className.toUpperCase() + "_H");
             for (String space : namespace) {
                 lines.addElement("}//" + space);
             }
@@ -196,7 +200,7 @@ private String getVirtualMethodDefinition(@NotNull DisassemblerSymbol symbol) th
 
     @Nullable
     private DisassemblerSymbol[] getObjects() {
-        Vector<DisassemblerSymbol> symbols = new Vector<DisassemblerSymbol>();
+        Vector<DisassemblerSymbol> symbols = new Vector<>();
         for (DisassemblerSymbol symbol : disassemblerClass.getSymbols())
             if (isObjectItem(symbol))
                 symbols.addElement(symbol);
@@ -228,7 +232,7 @@ private DisassemblerSymbol[] getVtables() {
 
     @Nullable
     private DisassemblerSymbol[] getMethods() {
-        Vector<DisassemblerSymbol> symbols = new Vector<DisassemblerSymbol>();
+        Vector<DisassemblerSymbol> symbols = new Vector<>();
         for (DisassemblerSymbol symbol : disassemblerClass.getSymbols())
             if (isMethodItem(symbol) && !isVtable(symbol) && hasItemInList(symbols, symbol))
                 symbols.addElement(symbol);
@@ -252,7 +256,7 @@ private boolean isVtable(DisassemblerSymbol sym) {
 
     @NotNull
     private Vector<DisassemblerSymbol> moveConOrDesToStart(@NotNull Vector<DisassemblerSymbol> syms) {
-        Vector<DisassemblerSymbol> ret = new Vector<DisassemblerSymbol>();
+        Vector<DisassemblerSymbol> ret = new Vector<>();
         for (DisassemblerSymbol sym : syms)
             if (isCon(sym))
                 ret.addElement(sym);

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
 
         // NOTE: Do not place your application dependencies here; they belong

library/build.gradle

@@ -2,10 +2,11 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion = '30.0.2'
+    buildToolsVersion = '30.0.3'
 
     defaultConfig {
         minSdkVersion 14
+        //noinspection OldTargetApi
         targetSdkVersion 29
         versionCode 13
         versionName "1.3"
@@ -24,11 +25,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
 	implementation 'androidx.cardview:cardview:1.0.0'
 
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
 
-    implementation 'org.jetbrains:annotations:19.0.0'
+    implementation 'org.jetbrains:annotations:21.0.1'
 }