diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 96f74dd8b2..3289de54b1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -220,7 +220,7 @@ android { } dependencies { - compileOnly(project(":hidden-api")) + compileOnly(project(":app:hidden-api")) compileOnly(libs.xposed.api) implementation(libs.dexkit) diff --git a/hidden-api/.gitignore b/app/hidden-api/.gitignore similarity index 100% rename from hidden-api/.gitignore rename to app/hidden-api/.gitignore diff --git a/hidden-api/build.gradle.kts b/app/hidden-api/build.gradle.kts similarity index 100% rename from hidden-api/build.gradle.kts rename to app/hidden-api/build.gradle.kts diff --git a/hidden-api/proguard-rules.pro b/app/hidden-api/proguard-rules.pro similarity index 100% rename from hidden-api/proguard-rules.pro rename to app/hidden-api/proguard-rules.pro diff --git a/hidden-api/src/main/java/android/view/ViewRootImpl.java b/app/hidden-api/src/main/java/android/view/ViewRootImpl.java similarity index 100% rename from hidden-api/src/main/java/android/view/ViewRootImpl.java rename to app/hidden-api/src/main/java/android/view/ViewRootImpl.java diff --git a/hidden-api/src/main/java/com/android/internal/graphics/drawable/BackgroundBlurDrawable.java b/app/hidden-api/src/main/java/com/android/internal/graphics/drawable/BackgroundBlurDrawable.java similarity index 100% rename from hidden-api/src/main/java/com/android/internal/graphics/drawable/BackgroundBlurDrawable.java rename to app/hidden-api/src/main/java/com/android/internal/graphics/drawable/BackgroundBlurDrawable.java diff --git a/hidden-api/src/main/java/miui/app/MiuiFreeFormManager.java b/app/hidden-api/src/main/java/miui/app/MiuiFreeFormManager.java similarity index 100% rename from hidden-api/src/main/java/miui/app/MiuiFreeFormManager.java rename to app/hidden-api/src/main/java/miui/app/MiuiFreeFormManager.java diff --git a/hidden-api/src/main/java/miui/drm/DrmManager.kt b/app/hidden-api/src/main/java/miui/drm/DrmManager.kt similarity index 100% rename from hidden-api/src/main/java/miui/drm/DrmManager.kt rename to app/hidden-api/src/main/java/miui/drm/DrmManager.kt diff --git a/hidden-api/src/main/java/miui/drm/ThemeReceiver.kt b/app/hidden-api/src/main/java/miui/drm/ThemeReceiver.kt similarity index 100% rename from hidden-api/src/main/java/miui/drm/ThemeReceiver.kt rename to app/hidden-api/src/main/java/miui/drm/ThemeReceiver.kt diff --git a/app/processor/build.gradle b/app/processor/build.gradle deleted file mode 100644 index faad1d7160..0000000000 --- a/app/processor/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id 'java-library' -} - -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - -dependencies { - implementation libs.auto.service - annotationProcessor libs.auto.service -} \ No newline at end of file diff --git a/app/processor/build.gradle.kts b/app/processor/build.gradle.kts new file mode 100644 index 0000000000..c8c483dc16 --- /dev/null +++ b/app/processor/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + id("java-library") +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +dependencies { + implementation(libs.auto.service) + annotationProcessor(libs.auto.service) +} \ No newline at end of file diff --git a/app/proguard-log.pro b/app/proguard-log.pro deleted file mode 100644 index 151518a3d5..0000000000 --- a/app/proguard-log.pro +++ /dev/null @@ -1,54 +0,0 @@ -########################################################################################################## -# 作者：Sollyu -# 日期：2020-11-02 -# 内容：发布版本移除日志，kotlin编译时带的而外信息，增强反调试难度 -# 使用：proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'proguard-log.pro' -########################################################################################################## - -########################################################################################################## -# 删除安卓日志 --assumenosideeffects class android.util.Log { - public static *** d(...); - public static *** v(...); - public static *** w(...); - public static *** e(...); -} - -########################################################################################################## -# 删除Kotlin编译时可能生成显示变量的方法 --assumenosideeffects class kotlin.jvm.internal.Intrinsics { - public static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String); - public static void checkFieldIsNotNull(java.lang.Object, java.lang.String); - public static void checkFieldIsNotNull(java.lang.Object, java.lang.String, java.lang.String); - public static void checkNotNull(java.lang.Object); - public static void checkNotNull(java.lang.Object, java.lang.String); - public static void checkNotNullExpressionValue(java.lang.Object, java.lang.String); - public static void checkNotNullParameter(java.lang.Object, java.lang.String); - public static void checkParameterIsNotNull(java.lang.Object, java.lang.String); - public static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String); - public static void throwUninitializedPropertyAccessException(java.lang.String); -} - -########################################################################################################## -# 会暴露变量名称 --assumenosideeffects class java.util.Objects { - public static java.lang.Object requireNonNull(java.lang.Object, java.lang.String); -} - -########################################################################################################## -# 删除slf4j的日志输出 --assumenosideeffects interface org.slf4j.Logger { - public void trace(...); - public void debug(...); - public void info(...); - public void warn(...); - public void error(...); - - public boolean isTraceEnabled(...); - public boolean isDebugEnabled(...); - public boolean isWarnEnabled(...); -} - --assumenosideeffects class org.slf4j.LoggerFactory { - public static ** getLogger(...); -} diff --git a/app/provision/build.gradle.kts b/app/provision/build.gradle.kts index 499983d09b..f9f57fb02b 100644 --- a/app/provision/build.gradle.kts +++ b/app/provision/build.gradle.kts @@ -7,8 +7,6 @@ android { compileSdk = 35 defaultConfig { - minSdk = 33 - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } @@ -16,15 +14,26 @@ android { buildTypes { release { isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")) + } + create("beta") { + isMinifyEnabled = false + setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")) + } + create("canary") { + isMinifyEnabled = false + setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")) + } + debug { + isMinifyEnabled = false + setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")) } } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_22 - targetCompatibility = JavaVersion.VERSION_22 + + java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } } @@ -41,5 +50,9 @@ dependencies { exclude("androidx.appcompat", "appcompat") } - api(fileTree(mapOf("dir" to "../libs", "include" to listOf("*-${buildTypes}.aar")))) + api( + fileTree( + mapOf("dir" to "../libs", "include" to listOf("*-${buildTypes}.aar")) + ) + ) } \ No newline at end of file diff --git a/app/provision/src/main/AndroidManifest.xml b/app/provision/src/main/AndroidManifest.xml deleted file mode 100644 index a5918e68ab..0000000000 --- a/app/provision/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 1e1719cf3f..d7d1dda5c3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,5 +22,4 @@ dependencyResolutionManagement { } rootProject.name = "HyperCeiler" -include(":app", ":hidden-api", ":app:processor") -include(":app:provision") \ No newline at end of file +include(":app", ":app:provision", ":app:processor", ":app:hidden-api") \ No newline at end of file