From c052c99434fe2bf26175d130e78e20c2393ef27d Mon Sep 17 00:00:00 2001
From: AndnixSH <40742924+AndnixSH@users.noreply.github.com>
Date: Fri, 1 Sep 2023 10:43:46 +0200
Subject: [PATCH 1/2] Update .gitignore and remove .idea

---
 .gitignore                | 46 +++++++++++++++++++++++++++------------
 .idea/.gitignore          |  3 ---
 .idea/.name               |  1 -
 .idea/compiler.xml        |  6 -----
 .idea/gradle.xml          | 24 --------------------
 .idea/jarRepositories.xml | 30 -------------------------
 .idea/misc.xml            | 23 --------------------
 .idea/vcs.xml             |  6 -----
 8 files changed, 32 insertions(+), 107 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index aa724b7..16dcd12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,33 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 96666d1..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-SignatureKill
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index aec0c0d..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/apksigner" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/dx" />
-            <option value="$PROJECT_DIR$/filepicker" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index e34606c..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index a45a4e8..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/layout/activity_main.xml" value="0.36666666666666664" />
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/layout/activity_settings.xml" value="0.36666666666666664" />
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/layout/dialog_content_circle.xml" value="0.36666666666666664" />
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/layout/dialog_content_donate_circle.xml" value="0.36666666666666664" />
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/layout/main.xml" value="0.36666666666666664" />
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/layout/preference_category.xml" value="0.36666666666666664" />
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/layout/toolbar.xml" value="0.36666666666666664" />
-        <entry key="..\:/AppProjects/ApkSignatureKill/app/src/main/res/menu/menu_main.xml" value="0.36666666666666664" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From fbe70e0147101b57418418fb888c8e63f0c0a392 Mon Sep 17 00:00:00 2001
From: AndnixSH <40742924+AndnixSH@users.noreply.github.com>
Date: Fri, 1 Sep 2023 10:56:25 +0200
Subject: [PATCH 2/2] Upgrade gradle to 8.1.1

---
 apksigner/build.gradle                   | 1 +
 apksigner/src/main/AndroidManifest.xml   | 1 -
 app/build.gradle                         | 1 +
 app/src/main/AndroidManifest.xml         | 3 +--
 build.gradle                             | 2 +-
 dx/build.gradle                          | 1 +
 dx/src/main/AndroidManifest.xml          | 2 +-
 filepicker/build.gradle                  | 1 +
 filepicker/src/main/AndroidManifest.xml  | 3 +--
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 11 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apksigner/build.gradle b/apksigner/build.gradle
index d91027f..0461f70 100644
--- a/apksigner/build.gradle
+++ b/apksigner/build.gradle
@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.mcal.apksigner'
 }
 
 dependencies {
diff --git a/apksigner/src/main/AndroidManifest.xml b/apksigner/src/main/AndroidManifest.xml
index 5f6aa42..67e937a 100644
--- a/apksigner/src/main/AndroidManifest.xml
+++ b/apksigner/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mcal.apksigner"
     android:versionCode="1"
     android:versionName="1.0" >
 
diff --git a/app/build.gradle b/app/build.gradle
index ebac569..78e2401 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,6 +39,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.mcal.apksignkill'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index daf45d1..121203a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mcal.apksignkill">
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- Изменение/удаление данных на USB-накопителе -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/build.gradle b/build.gradle
index ab85c7b..e4cc5d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         //}
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         //classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
     }
 }
diff --git a/dx/build.gradle b/dx/build.gradle
index 5a37715..40feffc 100644
--- a/dx/build.gradle
+++ b/dx/build.gradle
@@ -17,6 +17,7 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+    namespace 'com.mcal.dx'
 }
 
 dependencies {
diff --git a/dx/src/main/AndroidManifest.xml b/dx/src/main/AndroidManifest.xml
index 08b0957..cc947c5 100644
--- a/dx/src/main/AndroidManifest.xml
+++ b/dx/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.mcal.dx" />
+<manifest />
diff --git a/filepicker/build.gradle b/filepicker/build.gradle
index bb6053f..d6a9202 100644
--- a/filepicker/build.gradle
+++ b/filepicker/build.gradle
@@ -20,6 +20,7 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+    namespace 'com.developer.filepicker'
 }
 
 dependencies {
diff --git a/filepicker/src/main/AndroidManifest.xml b/filepicker/src/main/AndroidManifest.xml
index ee89054..010a56a 100644
--- a/filepicker/src/main/AndroidManifest.xml
+++ b/filepicker/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.developer.filepicker">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
diff --git a/gradle.properties b/gradle.properties
index d25b052..df5612e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,6 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5b1aeaa..fb86bf7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip