diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index b593e63..31e3dc3 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -51,10 +51,7 @@ android { kotlinCompilerExtensionVersion = composeVersion } - sourceSets["main"].assets.srcDirs( - projects.patch.dependencyProject.projectDir.resolve("src/main/assets"), - rootProject.projectDir.resolve("out/assets") - ) + sourceSets["main"].assets.srcDirs(rootProject.projectDir.resolve("out/assets")) } afterEvaluate { diff --git a/patch/src/main/assets/android.keystore b/manager/src/main/assets/keystore similarity index 100% rename from patch/src/main/assets/android.keystore rename to manager/src/main/assets/keystore diff --git a/patch-jar/build.gradle.kts b/patch-jar/build.gradle.kts index c065ba9..4376efe 100644 --- a/patch-jar/build.gradle.kts +++ b/patch-jar/build.gradle.kts @@ -24,7 +24,7 @@ tasks.jar { from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) into("assets") { - from(projects.patch.dependencyProject.projectDir.resolve("src/main/assets")) + from("src/main/assets") from("${rootProject.projectDir}/out/assets") } diff --git a/patch/src/main/assets/keystore b/patch-jar/src/main/assets/keystore similarity index 100% rename from patch/src/main/assets/keystore rename to patch-jar/src/main/assets/keystore diff --git a/patch/build.gradle.kts b/patch/build.gradle.kts index 5ce6baa..95ef9f9 100644 --- a/patch/build.gradle.kts +++ b/patch/build.gradle.kts @@ -20,8 +20,3 @@ dependencies { implementation("com.beust:jcommander:1.82") implementation("com.google.code.gson:gson:2.8.9") } - -sourceSets["main"].resources { - srcDirs("src/main/java") - include("**/*.*") -} diff --git a/patch/src/main/java/org/lsposed/patch/LSPatch.java b/patch/src/main/java/org/lsposed/patch/LSPatch.java index cf96007..ede2343 100644 --- a/patch/src/main/java/org/lsposed/patch/LSPatch.java +++ b/patch/src/main/java/org/lsposed/patch/LSPatch.java @@ -217,7 +217,7 @@ public class LSPatch { // parse the app appComponentFactory full name from the manifest file String appComponentFactory; try (var is = manifestEntry.open()) { - var pair =ManifestParser.parseManifestFile(is); + var pair = ManifestParser.parseManifestFile(is); if (pair == null) throw new PatchError("Failed to parse AndroidManifest.xml"); appComponentFactory = pair.appComponentFactory == null ? "" : pair.appComponentFactory;