refactor: Move files to simplify package structure

BREAKING CHANGE: Classes and members have changed packages.
ReVanced · Oct 22, 2023 · 124a2e9 · 124a2e9
1 parent f77624b
commit 124a2e9
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 59 deletions.
diff --git a/api/revanced-patcher.api b/api/revanced-patcher.api
diff --git a/src/main/kotlin/app/revanced/patcher/Patcher.kt b/src/main/kotlin/app/revanced/patcher/Patcher.kt
@@ -2,8 +2,8 @@ package app.revanced.patcher
 
 import app.revanced.patcher.PatchBundleLoader.Utils.getInstance
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolveUsingLookupMap
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint.Companion.resolveUsingLookupMap
 import app.revanced.patcher.patch.*
 import kotlinx.coroutines.flow.flow
 import java.io.Closeable

diff --git a/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt b/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt
@@ -1,8 +1,8 @@
 package app.revanced.patcher.extensions
 
 import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object MethodFingerprintExtensions {
     // TODO: Make this a property.

diff --git a/src/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt b/src/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt
@@ -1,7 +1,5 @@
 package app.revanced.patcher.fingerprint
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
 /**
  * A ReVanced fingerprint.
  * Can be a [MethodFingerprint].

diff --git a/...gerprint/method/impl/MethodFingerprint.kt → .../patcher/fingerprint/MethodFingerprint.kt b/...gerprint/method/impl/MethodFingerprint.kt → .../patcher/fingerprint/MethodFingerprint.kt
@@ -1,9 +1,8 @@
-package app.revanced.patcher.fingerprint.method.impl
+package app.revanced.patcher.fingerprint
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.fuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.Fingerprint
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.ClassProxy
 import com.android.tools.smali.dexlib2.AccessFlags

diff --git a/...d/annotation/MethodFingerprintMetadata.kt → ...nnotation/MethodFingerprintAnnotations.kt b/...d/annotation/MethodFingerprintMetadata.kt → ...nnotation/MethodFingerprintAnnotations.kt
@@ -1,6 +1,6 @@
-package app.revanced.patcher.fingerprint.method.annotation
+package app.revanced.patcher.fingerprint.annotation
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 /**
  * Annotations to scan a pattern [MethodFingerprint] with fuzzy algorithm.

diff --git a/src/main/kotlin/app/revanced/patcher/patch/BytecodePatch.kt b/src/main/kotlin/app/revanced/patcher/patch/BytecodePatch.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.patch
 
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 /**
  * A ReVanced [Patch] that works on [BytecodeContext].

diff --git a/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleFingerprint.kt b/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.patch.usage
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode