From 4dd04975d931970daf6fad8a00ab07cf29376fbe Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 4 Sep 2023 05:37:13 +0200 Subject: [PATCH] refactor: Move ReVanced Patcher to sub-project This allows other sub-projects to exist. --- build.gradle.kts | 56 +----------------- .../api}/revanced-patcher.api | 0 revanced-patcher/build.gradle.kts | 57 +++++++++++++++++++ revanced-patcher/settings.gradle.kts | 1 + .../revanced/patcher/IntegrationsConsumer.kt | 0 .../app/revanced/patcher/PackageMetadata.kt | 0 .../app/revanced/patcher/PatchBundleLoader.kt | 0 .../revanced/patcher/PatchExecutorFunction.kt | 0 .../kotlin/app/revanced/patcher/Patcher.kt | 0 .../app/revanced/patcher/PatcherContext.kt | 0 .../app/revanced/patcher/PatcherException.kt | 0 .../app/revanced/patcher/PatcherOptions.kt | 0 .../app/revanced/patcher/PatcherResult.kt | 0 .../app/revanced/patcher/PatchesConsumer.kt | 0 .../revanced/patcher/data/BytecodeContext.kt | 0 .../app/revanced/patcher/data/Context.kt | 0 .../revanced/patcher/data/ResourceContext.kt | 0 .../extensions/AnnotationExtensions.kt | 0 .../revanced/patcher/extensions/Extensions.kt | 0 .../extensions/InstructionExtensions.kt | 0 .../extensions/MethodFingerprintExtensions.kt | 0 .../patcher/fingerprint/Fingerprint.kt | 0 .../annotation/MethodFingerprintMetadata.kt | 0 .../method/impl/MethodFingerprint.kt | 0 .../app/revanced/patcher/logging/Logger.kt | 0 .../patcher/logging/impl/NopLogger.kt | 0 .../patcher/patch/OptionsContainer.kt | 0 .../app/revanced/patcher/patch/Patch.kt | 0 .../revanced/patcher/patch/PatchException.kt | 0 .../app/revanced/patcher/patch/PatchOption.kt | 0 .../app/revanced/patcher/patch/PatchResult.kt | 0 .../patcher/patch/annotations/Patch.kt | 0 .../app/revanced/patcher/util/ClassMerger.kt | 0 .../revanced/patcher/util/DomFileEditor.kt | 0 .../revanced/patcher/util/ProxyClassList.kt | 0 .../patcher/util/method/MethodWalker.kt | 0 .../revanced/patcher/util/proxy/ClassProxy.kt | 0 .../proxy/mutableTypes/MutableAnnotation.kt | 0 .../mutableTypes/MutableAnnotationElement.kt | 0 .../util/proxy/mutableTypes/MutableClass.kt | 0 .../util/proxy/mutableTypes/MutableField.kt | 0 .../util/proxy/mutableTypes/MutableMethod.kt | 0 .../mutableTypes/MutableMethodParameter.kt | 0 .../MutableAnnotationEncodedValue.kt | 0 .../encodedValue/MutableArrayEncodedValue.kt | 0 .../MutableBooleanEncodedValue.kt | 0 .../encodedValue/MutableByteEncodedValue.kt | 0 .../encodedValue/MutableCharEncodedValue.kt | 0 .../encodedValue/MutableDoubleEncodedValue.kt | 0 .../encodedValue/MutableEncodedValue.kt | 0 .../encodedValue/MutableEnumEncodedValue.kt | 0 .../encodedValue/MutableFieldEncodedValue.kt | 0 .../encodedValue/MutableFloatEncodedValue.kt | 0 .../encodedValue/MutableIntEncodedValue.kt | 0 .../encodedValue/MutableLongEncodedValue.kt | 0 .../encodedValue/MutableMethodEncodedValue.kt | 0 .../MutableMethodHandleEncodedValue.kt | 0 .../MutableMethodTypeEncodedValue.kt | 0 .../encodedValue/MutableNullEncodedValue.kt | 0 .../encodedValue/MutableShortEncodedValue.kt | 0 .../encodedValue/MutableStringEncodedValue.kt | 0 .../encodedValue/MutableTypeEncodedValue.kt | 0 .../patcher/util/smali/ExternalLabel.kt | 0 .../patcher/util/smali/InlineSmaliCompiler.kt | 0 .../app/revanced/patcher/version.properties | 0 .../extensions/InstructionExtensionsTest.kt | 0 .../app/revanced/patcher/issues/Issue98.kt | 0 .../patcher/patch/PatchOptionsTest.kt | 0 .../usage/bytecode/ExampleBytecodePatch.kt | 20 ++++--- .../usage/bytecode/ExampleFingerprint.kt | 0 .../resource/patch/ExampleResourcePatch.kt | 10 +--- .../util/smali/InlineSmaliCompilerTest.kt | 0 settings.gradle.kts | 2 +- .../bytecode/ExampleBytecodeCompatibility.kt | 13 ----- .../ExampleResourceCompatibility.kt | 13 ----- 75 files changed, 72 insertions(+), 100 deletions(-) rename {api => revanced-patcher/api}/revanced-patcher.api (100%) create mode 100644 revanced-patcher/build.gradle.kts create mode 100644 revanced-patcher/settings.gradle.kts rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PackageMetadata.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/Patcher.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PatcherContext.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PatcherException.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PatcherOptions.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PatcherResult.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/PatchesConsumer.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/data/Context.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/data/ResourceContext.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/extensions/Extensions.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/fingerprint/method/annotation/MethodFingerprintMetadata.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/logging/Logger.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/patch/Patch.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/patch/PatchException.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/patch/PatchOption.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/patch/PatchResult.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/patch/annotations/Patch.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/ClassMerger.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/smali/ExternalLabel.kt (100%) rename {src => revanced-patcher/src}/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt (100%) rename {src => revanced-patcher/src}/main/resources/app/revanced/patcher/version.properties (100%) rename {src => revanced-patcher/src}/test/kotlin/app/revanced/patcher/extensions/InstructionExtensionsTest.kt (100%) rename {src => revanced-patcher/src}/test/kotlin/app/revanced/patcher/issues/Issue98.kt (100%) rename {src => revanced-patcher/src}/test/kotlin/app/revanced/patcher/patch/PatchOptionsTest.kt (100%) rename {src => revanced-patcher/src}/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt (94%) rename {src => revanced-patcher/src}/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleFingerprint.kt (100%) rename {src => revanced-patcher/src}/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt (60%) rename {src => revanced-patcher/src}/test/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompilerTest.kt (100%) delete mode 100644 src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodeCompatibility.kt delete mode 100644 src/test/kotlin/app/revanced/patcher/usage/resource/annotation/ExampleResourceCompatibility.kt diff --git a/build.gradle.kts b/build.gradle.kts index 402fc71..dc5e76f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,58 +1,4 @@ plugins { - kotlin("jvm") version "1.8.20" - `maven-publish` + kotlin("jvm") version "1.9.0" apply false alias(libs.plugins.binary.compatibility.validator) } - -group = "app.revanced" - -dependencies { - implementation(libs.kotlinx.coroutines.core) - implementation(libs.xpp3) - implementation(libs.smali) - implementation(libs.multidexlib2) - implementation(libs.apktool.lib) - implementation(libs.kotlin.reflect) - - compileOnly(libs.android) - - testImplementation(libs.kotlin.test) -} - -tasks { - test { - useJUnitPlatform() - testLogging { - events("PASSED", "SKIPPED", "FAILED") - } - } - - processResources { - expand("projectVersion" to project.version) - } -} - -kotlin { jvmToolchain(11) } - -java { - withSourcesJar() -} - -publishing { - repositories { - mavenLocal() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - publications { - create("gpr") { - from(components["java"]) - } - } -} diff --git a/api/revanced-patcher.api b/revanced-patcher/api/revanced-patcher.api similarity index 100% rename from api/revanced-patcher.api rename to revanced-patcher/api/revanced-patcher.api diff --git a/revanced-patcher/build.gradle.kts b/revanced-patcher/build.gradle.kts new file mode 100644 index 0000000..e9fcb12 --- /dev/null +++ b/revanced-patcher/build.gradle.kts @@ -0,0 +1,57 @@ +plugins { + kotlin("jvm") version "1.9.0" + `maven-publish` +} + +group = "app.revanced" + +dependencies { + implementation(libs.kotlinx.coroutines.core) + implementation(libs.xpp3) + implementation(libs.smali) + implementation(libs.multidexlib2) + implementation(libs.apktool.lib) + implementation(libs.kotlin.reflect) + + compileOnly(libs.android) + + testImplementation(libs.kotlin.test) +} + +tasks { + test { + useJUnitPlatform() + testLogging { + events("PASSED", "SKIPPED", "FAILED") + } + } + + processResources { + expand("projectVersion" to project.version) + } +} + +kotlin { jvmToolchain(11) } + +java { + withSourcesJar() +} + +publishing { + repositories { + mavenLocal() + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } + publications { + create("gpr") { + from(components["java"]) + } + } +} diff --git a/revanced-patcher/settings.gradle.kts b/revanced-patcher/settings.gradle.kts new file mode 100644 index 0000000..2a8c853 --- /dev/null +++ b/revanced-patcher/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "revanced-patcher" \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt diff --git a/src/main/kotlin/app/revanced/patcher/PackageMetadata.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PackageMetadata.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PackageMetadata.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PackageMetadata.kt diff --git a/src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt diff --git a/src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt diff --git a/src/main/kotlin/app/revanced/patcher/Patcher.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/Patcher.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/Patcher.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/Patcher.kt diff --git a/src/main/kotlin/app/revanced/patcher/PatcherContext.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherContext.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PatcherContext.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherContext.kt diff --git a/src/main/kotlin/app/revanced/patcher/PatcherException.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherException.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PatcherException.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherException.kt diff --git a/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PatcherOptions.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt diff --git a/src/main/kotlin/app/revanced/patcher/PatcherResult.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherResult.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PatcherResult.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherResult.kt diff --git a/src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt diff --git a/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt diff --git a/src/main/kotlin/app/revanced/patcher/data/Context.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/Context.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/data/Context.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/data/Context.kt diff --git a/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt diff --git a/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt diff --git a/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt diff --git a/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt diff --git a/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt diff --git a/src/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt diff --git a/src/main/kotlin/app/revanced/patcher/fingerprint/method/annotation/MethodFingerprintMetadata.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/method/annotation/MethodFingerprintMetadata.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/fingerprint/method/annotation/MethodFingerprintMetadata.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/method/annotation/MethodFingerprintMetadata.kt diff --git a/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt diff --git a/src/main/kotlin/app/revanced/patcher/logging/Logger.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/Logger.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/logging/Logger.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/Logger.kt diff --git a/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt diff --git a/src/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt diff --git a/src/main/kotlin/app/revanced/patcher/patch/Patch.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/Patch.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/patch/Patch.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/Patch.kt diff --git a/src/main/kotlin/app/revanced/patcher/patch/PatchException.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchException.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/patch/PatchException.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchException.kt diff --git a/src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt diff --git a/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt diff --git a/src/main/kotlin/app/revanced/patcher/patch/annotations/Patch.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/annotations/Patch.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/patch/annotations/Patch.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/annotations/Patch.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/smali/ExternalLabel.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/smali/ExternalLabel.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/smali/ExternalLabel.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/smali/ExternalLabel.kt diff --git a/src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt similarity index 100% rename from src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt rename to revanced-patcher/src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt diff --git a/src/main/resources/app/revanced/patcher/version.properties b/revanced-patcher/src/main/resources/app/revanced/patcher/version.properties similarity index 100% rename from src/main/resources/app/revanced/patcher/version.properties rename to revanced-patcher/src/main/resources/app/revanced/patcher/version.properties diff --git a/src/test/kotlin/app/revanced/patcher/extensions/InstructionExtensionsTest.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/extensions/InstructionExtensionsTest.kt similarity index 100% rename from src/test/kotlin/app/revanced/patcher/extensions/InstructionExtensionsTest.kt rename to revanced-patcher/src/test/kotlin/app/revanced/patcher/extensions/InstructionExtensionsTest.kt diff --git a/src/test/kotlin/app/revanced/patcher/issues/Issue98.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/issues/Issue98.kt similarity index 100% rename from src/test/kotlin/app/revanced/patcher/issues/Issue98.kt rename to revanced-patcher/src/test/kotlin/app/revanced/patcher/issues/Issue98.kt diff --git a/src/test/kotlin/app/revanced/patcher/patch/PatchOptionsTest.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/patch/PatchOptionsTest.kt similarity index 100% rename from src/test/kotlin/app/revanced/patcher/patch/PatchOptionsTest.kt rename to revanced-patcher/src/test/kotlin/app/revanced/patcher/patch/PatchOptionsTest.kt diff --git a/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt similarity index 94% rename from src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt rename to revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt index f41a682..e6aa88a 100644 --- a/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt +++ b/revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodePatch.kt @@ -1,7 +1,5 @@ package app.revanced.patcher.usage.bytecode -import app.revanced.patcher.annotation.Description -import app.revanced.patcher.annotation.Name import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction @@ -9,9 +7,7 @@ import app.revanced.patcher.extensions.or import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.OptionsContainer import app.revanced.patcher.patch.PatchOption -import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patcher.usage.resource.annotation.ExampleResourceCompatibility import app.revanced.patcher.usage.resource.patch.ExampleResourcePatch import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable @@ -32,11 +28,17 @@ import com.android.tools.smali.dexlib2.util.Preconditions import com.google.common.collect.ImmutableList @Patch -@Name("example-bytecode-patch") -@Description("Example demonstration of a bytecode patch.") -@ExampleResourceCompatibility -@DependsOn([ExampleResourcePatch::class]) -class ExampleBytecodePatch : BytecodePatch(listOf(ExampleFingerprint)) { +class ExampleBytecodePatch : BytecodePatch( + Manifest( + "Example patch", + "Example demonstration of a bytecode patch.", + dependencies = setOf(ExampleResourcePatch::class), + compatiblePackages = setOf( + Manifest.CompatiblePackage("com.example.examplePackage", setOf("0.0.1", "0.0.2")) + ) + ), + ExampleFingerprint +) { // This function will be executed by the patcher. // You can treat it as a constructor override fun execute(context: BytecodeContext) { diff --git a/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleFingerprint.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleFingerprint.kt similarity index 100% rename from src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleFingerprint.kt rename to revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleFingerprint.kt diff --git a/src/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt similarity index 60% rename from src/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt rename to revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt index 6c45b0a..974d885 100644 --- a/src/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt +++ b/revanced-patcher/src/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt @@ -1,18 +1,10 @@ package app.revanced.patcher.usage.resource.patch -import app.revanced.patcher.annotation.Description -import app.revanced.patcher.annotation.Name import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.ResourcePatch -import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patcher.usage.resource.annotation.ExampleResourceCompatibility import org.w3c.dom.Element -@Patch -@Name("example-resource-patch") -@Description("Example demonstration of a resource patch.") -@ExampleResourceCompatibility -class ExampleResourcePatch : ResourcePatch { +class ExampleResourcePatch : ResourcePatch(Manifest("Example name", "Example description")) { override fun execute(context: ResourceContext) { context.xmlEditor["AndroidManifest.xml"].use { editor -> val element = editor // regular DomFileEditor diff --git a/src/test/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompilerTest.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompilerTest.kt similarity index 100% rename from src/test/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompilerTest.kt rename to revanced-patcher/src/test/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompilerTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index d398cc6..1f9503f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,4 +19,4 @@ dependencyResolutionManagement { } } -rootProject.name = "revanced-patcher" +include("revanced-patcher") \ No newline at end of file diff --git a/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodeCompatibility.kt b/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodeCompatibility.kt deleted file mode 100644 index 85f0a32..0000000 --- a/src/test/kotlin/app/revanced/patcher/usage/bytecode/ExampleBytecodeCompatibility.kt +++ /dev/null @@ -1,13 +0,0 @@ -package app.revanced.patcher.usage.bytecode - -import app.revanced.patcher.annotation.Compatibility -import app.revanced.patcher.annotation.Package - -@Compatibility( - [Package( - "com.example.examplePackage", arrayOf("0.0.1", "0.0.2") - )] -) -@Target(AnnotationTarget.CLASS) -internal annotation class ExampleBytecodeCompatibility - diff --git a/src/test/kotlin/app/revanced/patcher/usage/resource/annotation/ExampleResourceCompatibility.kt b/src/test/kotlin/app/revanced/patcher/usage/resource/annotation/ExampleResourceCompatibility.kt deleted file mode 100644 index 059649e..0000000 --- a/src/test/kotlin/app/revanced/patcher/usage/resource/annotation/ExampleResourceCompatibility.kt +++ /dev/null @@ -1,13 +0,0 @@ -package app.revanced.patcher.usage.resource.annotation - -import app.revanced.patcher.annotation.Compatibility -import app.revanced.patcher.annotation.Package - -@Compatibility( - [Package( - "com.example.examplePackage", arrayOf("0.0.1", "0.0.2") - )] -) -@Target(AnnotationTarget.CLASS) -internal annotation class ExampleResourceCompatibility -