opt: 项目文件整理

lingqiqi5211 · Jan 19, 2025 · cf5af27 · cf5af27
1 parent 6fec459
commit cf5af27
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 84 deletions.
diff --git 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 → app/hidden-api/.gitignore b/hidden-api/.gitignore → app/hidden-api/.gitignore
diff --git a/hidden-api/build.gradle.kts → app/hidden-api/build.gradle.kts b/hidden-api/build.gradle.kts → app/hidden-api/build.gradle.kts
diff --git a/hidden-api/proguard-rules.pro → app/hidden-api/proguard-rules.pro b/hidden-api/proguard-rules.pro → app/hidden-api/proguard-rules.pro
diff --git a/.../main/java/android/view/ViewRootImpl.java → .../main/java/android/view/ViewRootImpl.java b/.../main/java/android/view/ViewRootImpl.java → .../main/java/android/view/ViewRootImpl.java
diff --git a/...hics/drawable/BackgroundBlurDrawable.java → ...hics/drawable/BackgroundBlurDrawable.java b/...hics/drawable/BackgroundBlurDrawable.java → ...hics/drawable/BackgroundBlurDrawable.java
diff --git a/...in/java/miui/app/MiuiFreeFormManager.java → ...in/java/miui/app/MiuiFreeFormManager.java b/...in/java/miui/app/MiuiFreeFormManager.java → ...in/java/miui/app/MiuiFreeFormManager.java
diff --git a/...-api/src/main/java/miui/drm/DrmManager.kt → ...-api/src/main/java/miui/drm/DrmManager.kt b/...-api/src/main/java/miui/drm/DrmManager.kt → ...-api/src/main/java/miui/drm/DrmManager.kt
diff --git a/...i/src/main/java/miui/drm/ThemeReceiver.kt → ...i/src/main/java/miui/drm/ThemeReceiver.kt b/...i/src/main/java/miui/drm/ThemeReceiver.kt → ...i/src/main/java/miui/drm/ThemeReceiver.kt
diff --git a/app/processor/build.gradle b/app/processor/build.gradle
diff --git a/app/processor/build.gradle.kts 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)
+}
diff --git a/app/proguard-log.pro b/app/proguard-log.pro
diff --git a/app/provision/build.gradle.kts b/app/provision/build.gradle.kts
@@ -7,24 +7,33 @@ android {
     compileSdk = 35
 
     defaultConfig {
-        minSdk = 33
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
 
     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"))
+        )
+    )
 }
diff --git a/app/provision/src/main/AndroidManifest.xml b/app/provision/src/main/AndroidManifest.xml
diff --git 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")
+include(":app", ":app:provision", ":app:processor", ":app:hidden-api")