build(deps): Back to JDK 21

ReChronoRain · Jul 30, 2024 · 65bf960 · 65bf960
1 parent d128add
commit 65bf960
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 27 deletions.
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -35,10 +35,10 @@ jobs:
           fetch-depth: 0
           submodules: true
 
-      - name: Set up JDK 22
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '22'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ local.properties
 /app/canary
 /app/debug
 signing.properties
+/.kotlin
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -200,13 +200,12 @@ android {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(22)
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
 
-    kotlin {
-        jvmToolchain(22)
-    }
+    kotlin.jvmToolchain(21)
+
 }
 
 dependencies {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -4,19 +4,15 @@
 -keep class com.sevtinge.hyperceiler.utils.blur.*
 -keep class com.sevtinge.hyperceiler.utils.Helpers { boolean isModuleActive; }
 -keep class com.sevtinge.hyperceiler.utils.Helpers { int XposedVersion; }
--keep class moralnorm.**{*;}
+-keep class moralnorm.**{ *; }
 -keep class org.luckypray.dexkit.*
 -keep class * extends com.sevtinge.hyperceiler.ui.fragment.base.*
 -keep class * extends com.sevtinge.hyperceiler.module.base.BaseHook { <init>(); }
--keep class com.sevtinge.hyperceiler.module.base.dexkit.**{*;}
+-keep class com.sevtinge.hyperceiler.module.base.dexkit.**{ *; }
 -keep class * extends com.sevtinge.hyperceiler.module.base.BaseModule
--keep class com.sevtinge.hyperceiler.module.base.BaseModule {*;}
-#-keep class com.sevtinge.hyperceiler.utils.XposedUtils {
-#    *;
-#}
--keep class com.sevtinge.hyperceiler.utils.api.miuiStringToast.res.** {
-    *;
-}
+-keep class com.sevtinge.hyperceiler.module.base.BaseModule { *; }
+#-keep class com.sevtinge.hyperceiler.utils.XposedUtils { *; }
+-keep class com.sevtinge.hyperceiler.utils.api.miuiStringToast.res.** { *; }
 
 -dontwarn android.app.ActivityTaskManager$RootTaskInfo
 -dontwarn miui.app.MiuiFreeFormManager$MiuiFreeFormStackInfo

diff --git a/hidden-api/build.gradle.kts b/hidden-api/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace = "com.android.internal"
-    compileSdk = 34
+    compileSdk = 35
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -26,12 +26,10 @@ android {
     }
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(22)
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
-    kotlin {
-        jvmToolchain(22)
-    }
+    kotlin.jvmToolchain(21)
 }
 
 dependencies {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,14 +15,8 @@ dependencyResolutionManagement {
         mavenCentral()
         maven("https://api.xposed.info")
         maven("https://jitpack.io")
-
     }
 }
 
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
-}
-
 rootProject.name = "HyperCeiler"
-include(":app")
-include(":hidden-api")
+include(":app", ":hidden-api")