diff --git a/build.sh b/build.sh index 0603450..c09df08 100755 --- a/build.sh +++ b/build.sh @@ -15,7 +15,7 @@ fi $HOME/code/android/sdk/ndk/21.4.7075529/ndk-build -j48 NDK_DEBUG=$debug_mode popd -pushd java_module +pushd java # Must always be release due to R8 requirement ./gradlew assembleRelease popd @@ -29,6 +29,6 @@ done pushd magisk version="$(grep '^version=' module.prop | cut -d= -f2)" rm -f "../safetynet-fix-$version.zip" classes.dex -unzip "../java_module/app/build/outputs/apk/release/app-release.apk" "classes.dex" +unzip "../java/app/build/outputs/apk/release/app-release.apk" "classes.dex" zip -r9 "../safetynet-fix-$version.zip" . popd diff --git a/java_module/.gitignore b/java/.gitignore similarity index 100% rename from java_module/.gitignore rename to java/.gitignore diff --git a/java_module/app/.gitignore b/java/app/.gitignore similarity index 100% rename from java_module/app/.gitignore rename to java/app/.gitignore diff --git a/java_module/app/build.gradle b/java/app/build.gradle similarity index 100% rename from java_module/app/build.gradle rename to java/app/build.gradle diff --git a/java_module/app/proguard-rules.pro b/java/app/proguard-rules.pro similarity index 100% rename from java_module/app/proguard-rules.pro rename to java/app/proguard-rules.pro diff --git a/java_module/app/src/main/AndroidManifest.xml b/java/app/src/main/AndroidManifest.xml similarity index 100% rename from java_module/app/src/main/AndroidManifest.xml rename to java/app/src/main/AndroidManifest.xml diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/BuildHooks.kt b/java/app/src/main/java/dev/kdrag0n/safetynetriru/BuildHooks.kt similarity index 100% rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/BuildHooks.kt rename to java/app/src/main/java/dev/kdrag0n/safetynetriru/BuildHooks.kt diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/EntryPoint.kt b/java/app/src/main/java/dev/kdrag0n/safetynetriru/EntryPoint.kt similarity index 100% rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/EntryPoint.kt rename to java/app/src/main/java/dev/kdrag0n/safetynetriru/EntryPoint.kt diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt b/java/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt similarity index 100% rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt rename to java/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyKeyStoreSpi.kt b/java/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyKeyStoreSpi.kt similarity index 100% rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyKeyStoreSpi.kt rename to java/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyKeyStoreSpi.kt diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyProvider.kt b/java/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyProvider.kt similarity index 100% rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyProvider.kt rename to java/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyProvider.kt diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/util/Utils.kt b/java/app/src/main/java/dev/kdrag0n/safetynetriru/util/Utils.kt similarity index 100% rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/util/Utils.kt rename to java/app/src/main/java/dev/kdrag0n/safetynetriru/util/Utils.kt diff --git a/java_module/app/src/main/res/values/strings.xml b/java/app/src/main/res/values/strings.xml similarity index 100% rename from java_module/app/src/main/res/values/strings.xml rename to java/app/src/main/res/values/strings.xml diff --git a/java_module/build.gradle b/java/build.gradle similarity index 100% rename from java_module/build.gradle rename to java/build.gradle diff --git a/java_module/gradle.properties b/java/gradle.properties similarity index 100% rename from java_module/gradle.properties rename to java/gradle.properties diff --git a/java_module/gradle/wrapper/gradle-wrapper.jar b/java/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from java_module/gradle/wrapper/gradle-wrapper.jar rename to java/gradle/wrapper/gradle-wrapper.jar diff --git a/java_module/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from java_module/gradle/wrapper/gradle-wrapper.properties rename to java/gradle/wrapper/gradle-wrapper.properties diff --git a/java_module/gradlew b/java/gradlew similarity index 100% rename from java_module/gradlew rename to java/gradlew diff --git a/java_module/gradlew.bat b/java/gradlew.bat similarity index 100% rename from java_module/gradlew.bat rename to java/gradlew.bat diff --git a/java_module/settings.gradle b/java/settings.gradle similarity index 100% rename from java_module/settings.gradle rename to java/settings.gradle