Refactor some gradle (#1752)

app/build.gradle.kts

@@ -165,7 +165,7 @@ tasks.whenTaskAdded {
 
 dependencies {
     val glideVersion = "4.13.1"
-    val navVersion: String by rootProject.extra
+    val navVersion: String by project
     annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
     implementation("androidx.activity:activity:1.4.0")
     implementation("androidx.browser:browser:1.4.0")

build.gradle.kts

@@ -24,13 +24,8 @@ buildscript {
         google()
         mavenCentral()
     }
-    val navVersion by extra("2.5.0-alpha02")
-    val agpVersion by extra("7.1.2")
     dependencies {
-        classpath("com.android.tools.build:gradle:$agpVersion")
-        classpath("dev.rikka.tools.autoresconfig:gradle-plugin:1.0.0")
         classpath("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r")
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
     }
 }
 

core/build.gradle.kts

@@ -164,8 +164,8 @@ dependencies {
     implementation("org.apache.commons:commons-lang3:3.12.0")
     implementation("de.upb.cs.swt:axml:2.1.2")
     compileOnly("androidx.annotation:annotation:1.3.0")
-    compileOnly(project(":hiddenapi-stubs"))
-    implementation(project(":hiddenapi-bridge"))
+    compileOnly(project(":hiddenapi:stubs"))
+    implementation(project(":hiddenapi:bridge"))
     implementation(project(":manager-service"))
     implementation(project(":daemon-service"))
 }

daemon-service/build.gradle.kts

@@ -53,6 +53,5 @@ android {
 }
 
 dependencies {
-
-    compileOnly(project(":hiddenapi-stubs"))
+    compileOnly(project(":hiddenapi:stubs"))
 }

daemon/build.gradle.kts

@@ -24,6 +24,8 @@ import java.util.*
 
 plugins {
     id("com.android.application")
+    id("androidx.navigation.safeargs")
+    id("dev.rikka.tools.autoresconfig")
 }
 
 val daemonName = "LSPosed"
@@ -31,7 +33,7 @@ val daemonName = "LSPosed"
 val injectedPackageName: String by rootProject.extra
 val injectedPackageUid: Int by rootProject.extra
 
-val agpVersion: String by rootProject.extra
+val agpVersion : String by project
 
 val defaultManagerPackageName: String by rootProject.extra
 val apiCode: Int by rootProject.extra
@@ -167,8 +169,8 @@ dependencies {
     implementation("com.android.tools.build:apksig:$agpVersion")
     implementation("org.apache.commons:commons-lang3:3.12.0")
     compileOnly("androidx.annotation:annotation:1.3.0")
-    compileOnly(project(":hiddenapi-stubs"))
-    implementation(project(":hiddenapi-bridge"))
+    compileOnly(project(":hiddenapi:stubs"))
+    implementation(project(":hiddenapi:bridge"))
     implementation(project(":daemon-service"))
     implementation(project(":manager-service"))
 }

gradle.properties

@@ -17,3 +17,6 @@ android.enableAppCompileTimeRClass=true
 android.nonTransitiveRClass=true
 android.enableR8.fullMode=true
 android.useAndroidX=true
+
+agpVersion=7.1.2
+navVersion=2.5.0-alpha03

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

hiddenapi/bridge/build.gradle.kts

@@ -22,5 +22,5 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":hiddenapi-stubs"))
-}
+    compileOnly(project(":hiddenapi:stubs"))
+}