fix: Use correct module name

BREAKING CHANGE: This renames packages and the Maven package.
ReVanced · Sep 6, 2023 · 080fbe9 · 080fbe9
1 parent d372122
commit 080fbe9
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 31 deletions.
diff --git a/.../revanced-patch-annotations-processor.api → ...i/revanced-patch-annotation-processor.api b/.../revanced-patch-annotations-processor.api → ...i/revanced-patch-annotation-processor.api
@@ -1,25 +1,25 @@
-public abstract interface annotation class app/revanced/patcher/patch/annotations/CompatiblePackage : java/lang/annotation/Annotation {
+public abstract interface annotation class app/revanced/patcher/patch/annotation/CompatiblePackage : java/lang/annotation/Annotation {
 	public abstract fun name ()Ljava/lang/String;
 	public abstract fun versions ()[Ljava/lang/String;
 }
 
-public abstract interface annotation class app/revanced/patcher/patch/annotations/Patch : java/lang/annotation/Annotation {
-	public abstract fun compatiblePackages ()[Lapp/revanced/patcher/patch/annotations/CompatiblePackage;
+public abstract interface annotation class app/revanced/patcher/patch/annotation/Patch : java/lang/annotation/Annotation {
+	public abstract fun compatiblePackages ()[Lapp/revanced/patcher/patch/annotation/CompatiblePackage;
 	public abstract fun dependencies ()[Ljava/lang/Class;
 	public abstract fun description ()Ljava/lang/String;
 	public abstract fun name ()Ljava/lang/String;
 	public abstract fun requiresIntegrations ()Z
 	public abstract fun use ()Z
 }
 
-public final class app/revanced/patcher/patch/annotations/processor/PatchProcessor : com/google/devtools/ksp/processing/SymbolProcessor {
+public final class app/revanced/patcher/patch/annotation/processor/PatchProcessor : com/google/devtools/ksp/processing/SymbolProcessor {
 	public fun <init> (Lcom/google/devtools/ksp/processing/CodeGenerator;Lcom/google/devtools/ksp/processing/KSPLogger;)V
 	public fun process (Lcom/google/devtools/ksp/processing/Resolver;)Ljava/util/List;
 }
 
-public final class app/revanced/patcher/patch/annotations/processor/PatchProcessorProvider : com/google/devtools/ksp/processing/SymbolProcessorProvider {
+public final class app/revanced/patcher/patch/annotation/processor/PatchProcessorProvider : com/google/devtools/ksp/processing/SymbolProcessorProvider {
 	public fun <init> ()V
-	public fun create (Lcom/google/devtools/ksp/processing/SymbolProcessorEnvironment;)Lapp/revanced/patcher/patch/annotations/processor/PatchProcessor;
+	public fun create (Lcom/google/devtools/ksp/processing/SymbolProcessorEnvironment;)Lapp/revanced/patcher/patch/annotation/processor/PatchProcessor;
 	public synthetic fun create (Lcom/google/devtools/ksp/processing/SymbolProcessorEnvironment;)Lcom/google/devtools/ksp/processing/SymbolProcessor;
 }
 
diff --git a/...ch-annotations-processor/build.gradle.kts → ...tch-annotation-processor/build.gradle.kts b/...ch-annotations-processor/build.gradle.kts → ...tch-annotation-processor/build.gradle.kts
@@ -46,7 +46,7 @@ publishing {
             version = project.version.toString()
 
             pom {
-                name = "ReVanced Patch annotations processor"
+                name = "ReVanced patch annotation processor"
                 description = "Annotation processor for patches."
                 url = "https://revanced.app"
 

diff --git a/revanced-patch-annotation-processor/settings.gradle.kts b/revanced-patch-annotation-processor/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "revanced-patch-annotation-processor"
+
diff --git a/...her/patch/annotations/PatchAnnotations.kt → ...cher/patch/annotation/PatchAnnotations.kt b/...her/patch/annotations/PatchAnnotations.kt → ...cher/patch/annotation/PatchAnnotations.kt
@@ -1,4 +1,4 @@
-package app.revanced.patcher.patch.annotations
+package app.revanced.patcher.patch.annotation
 
 import java.lang.annotation.Inherited
 import kotlin.reflect.KClass

diff --git a/...h/annotations/processor/PatchProcessor.kt → ...ch/annotation/processor/PatchProcessor.kt b/...h/annotations/processor/PatchProcessor.kt → ...ch/annotation/processor/PatchProcessor.kt
@@ -1,10 +1,10 @@
-package app.revanced.patcher.patch.annotations.processor
+package app.revanced.patcher.patch.annotation.processor
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 import com.google.devtools.ksp.processing.*
 import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSAnnotation

diff --git a/...tions/processor/PatchProcessorProvider.kt → ...ation/processor/PatchProcessorProvider.kt b/...tions/processor/PatchProcessorProvider.kt → ...ation/processor/PatchProcessorProvider.kt
@@ -1,4 +1,4 @@
-package app.revanced.patcher.patch.annotations.processor
+package app.revanced.patcher.patch.annotation.processor
 
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
 import com.google.devtools.ksp.processing.SymbolProcessorProvider

diff --git a/...in/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/...in/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -0,0 +1 @@
+app.revanced.patcher.patch.annotation.processor.PatchProcessorProvider
diff --git a/...processor/TestPatchAnnotationProcessor.kt → ...processor/TestPatchAnnotationProcessor.kt b/...processor/TestPatchAnnotationProcessor.kt → ...processor/TestPatchAnnotationProcessor.kt
@@ -1,4 +1,4 @@
-package app.revanced.patcher.patch.annotations.processor
+package app.revanced.patcher.patch.annotation.processor
 
 import app.revanced.patcher.patch.Patch
 import com.tschuchort.compiletesting.KotlinCompilation

diff --git a/...r/samples/dependencies/DependencyPatch.kt → ...r/samples/dependencies/DependencyPatch.kt b/...r/samples/dependencies/DependencyPatch.kt → ...r/samples/dependencies/DependencyPatch.kt
@@ -1,8 +1,8 @@
-package app.revanced.patcher.patch.annotations.processor.samples.dependencies
+package app.revanced.patcher.patch.annotation.processor.samples.dependencies
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 
 @Patch(name = "Dependency patch")
 object DependencyPatch : ResourcePatch() {

diff --git a/...or/samples/dependencies/DependentPatch.kt → ...or/samples/dependencies/DependentPatch.kt b/...or/samples/dependencies/DependentPatch.kt → ...or/samples/dependencies/DependentPatch.kt
@@ -1,7 +1,7 @@
-package app.revanced.patcher.patch.annotations.processor.samples.dependencies
+package app.revanced.patcher.patch.annotation.processor.samples.dependencies
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 
 @Patch(
     name = "Dependent patch",

diff --git a/...tions/manualdependency/DependencyPatch.kt → ...tions/manualdependency/DependencyPatch.kt b/...tions/manualdependency/DependencyPatch.kt → ...tions/manualdependency/DependencyPatch.kt
@@ -1,8 +1,8 @@
-package app.revanced.patcher.patch.annotations.processor.samples.limitations.manualdependency
+package app.revanced.patcher.patch.annotation.processor.samples.limitations.manualdependency
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 
 @Patch(name = "Dependency patch")
 object DependencyPatch : ResourcePatch() {

diff --git a/...ations/manualdependency/DependentPatch.kt → ...ations/manualdependency/DependentPatch.kt b/...ations/manualdependency/DependentPatch.kt → ...ations/manualdependency/DependentPatch.kt
@@ -1,7 +1,7 @@
-package app.revanced.patcher.patch.annotations.processor.samples.limitations.manualdependency
+package app.revanced.patcher.patch.annotation.processor.samples.limitations.manualdependency
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 
 @Patch(name = "Dependent patch")
 object DependentPatch : BytecodePatch(

diff --git a/...processor/samples/options/OptionsPatch.kt → ...processor/samples/options/OptionsPatch.kt b/...processor/samples/options/OptionsPatch.kt → ...processor/samples/options/OptionsPatch.kt
@@ -1,8 +1,8 @@
-package app.revanced.patcher.patch.annotations.processor.samples.options
+package app.revanced.patcher.patch.annotation.processor.samples.options
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stringPatchOption
 
 @Patch(name = "Options patch")

diff --git a/...or/samples/processing/ProcessablePatch.kt → ...or/samples/processing/ProcessablePatch.kt b/...or/samples/processing/ProcessablePatch.kt → ...or/samples/processing/ProcessablePatch.kt
@@ -1,8 +1,8 @@
-package app.revanced.patcher.patch.annotations.processor.samples.processing
+package app.revanced.patcher.patch.annotation.processor.samples.processing
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 
 @Patch("Processable patch")
 object ProcessablePatch : BytecodePatch() {

diff --git a/revanced-patch-annotations-processor/settings.gradle.kts b/revanced-patch-annotations-processor/settings.gradle.kts
diff --git a/...in/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/...in/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
diff --git a/revanced-patcher/build.gradle.kts b/revanced-patcher/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 
     compileOnly(libs.android)
 
-    testImplementation(project(":revanced-patch-annotations-processor"))
+    testImplementation(project(":revanced-patch-annotation-processor"))
     testImplementation(libs.kotlin.test)
 }
 

diff --git a/revanced-patcher/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleBytecodePatch.kt b/revanced-patcher/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleBytecodePatch.kt
@@ -7,8 +7,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
-import app.revanced.patcher.patch.annotations.CompatiblePackage
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,4 +19,4 @@ dependencyResolutionManagement {
     }
 }
 
-include("revanced-patch-annotations-processor", "revanced-patcher")
+include("revanced-patch-annotation-processor", "revanced-patcher")