From 3ab42a932c8d5027d554106dfe8e1299ebc1ac7f Mon Sep 17 00:00:00 2001 From: Lucaskyy Date: Mon, 21 Mar 2022 21:54:16 +0100 Subject: [PATCH] refactor: Rename `net.revanced` to `app.revanced` BREAKING CHANGE: Package name was changed from "net.revanced" to "app.revanced" --- build.gradle.kts | 2 +- .../{net => app}/revanced/patcher/Patcher.kt | 14 ++++++------- .../revanced/patcher/cache/Cache.kt | 2 +- .../revanced/patcher/cache/PatchData.kt | 6 +++--- .../revanced/patcher/patch/Patch.kt | 4 ++-- .../revanced/patcher/patch/PatchResult.kt | 2 +- .../patcher/resolver/MethodResolver.kt | 12 +++++------ .../revanced/patcher/resolver/ScanResult.kt | 2 +- .../revanced/patcher/signature/Signature.kt | 2 +- .../revanced/patcher/util/ExtraTypes.kt | 2 +- .../{net => app}/revanced/patcher/util/Io.kt | 2 +- .../revanced/patcher/writer/ASMWriter.kt | 2 +- .../revanced/patcher/PatcherTest.kt | 20 +++++++++---------- .../revanced/patcher/ReaderTest.kt | 2 +- .../revanced/patcher/util/TestUtil.kt | 2 +- 15 files changed, 38 insertions(+), 38 deletions(-) rename src/main/kotlin/{net => app}/revanced/patcher/Patcher.kt (86%) rename src/main/kotlin/{net => app}/revanced/patcher/cache/Cache.kt (91%) rename src/main/kotlin/{net => app}/revanced/patcher/cache/PatchData.kt (79%) rename src/main/kotlin/{net => app}/revanced/patcher/patch/Patch.kt (57%) rename src/main/kotlin/{net => app}/revanced/patcher/patch/PatchResult.kt (89%) rename src/main/kotlin/{net => app}/revanced/patcher/resolver/MethodResolver.kt (95%) rename src/main/kotlin/{net => app}/revanced/patcher/resolver/ScanResult.kt (75%) rename src/main/kotlin/{net => app}/revanced/patcher/signature/Signature.kt (96%) rename src/main/kotlin/{net => app}/revanced/patcher/util/ExtraTypes.kt (88%) rename src/main/kotlin/{net => app}/revanced/patcher/util/Io.kt (99%) rename src/main/kotlin/{net => app}/revanced/patcher/writer/ASMWriter.kt (93%) rename src/test/kotlin/{net => app}/revanced/patcher/PatcherTest.kt (93%) rename src/test/kotlin/{net => app}/revanced/patcher/ReaderTest.kt (92%) rename src/test/kotlin/{net => app}/revanced/patcher/util/TestUtil.kt (97%) diff --git a/build.gradle.kts b/build.gradle.kts index 405b51de..f295c2df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { `maven-publish` } -group = "net.revanced" +group = "app.revanced" repositories { mavenCentral() diff --git a/src/main/kotlin/net/revanced/patcher/Patcher.kt b/src/main/kotlin/app/revanced/patcher/Patcher.kt similarity index 86% rename from src/main/kotlin/net/revanced/patcher/Patcher.kt rename to src/main/kotlin/app/revanced/patcher/Patcher.kt index 71159617..618dbdd0 100644 --- a/src/main/kotlin/net/revanced/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt @@ -1,10 +1,10 @@ -package net.revanced.patcher +package app.revanced.patcher -import net.revanced.patcher.cache.Cache -import net.revanced.patcher.patch.Patch -import net.revanced.patcher.resolver.MethodResolver -import net.revanced.patcher.signature.Signature -import net.revanced.patcher.util.Io +import app.revanced.patcher.cache.Cache +import app.revanced.patcher.patch.Patch +import app.revanced.patcher.resolver.MethodResolver +import app.revanced.patcher.signature.Signature +import app.revanced.patcher.util.Io import org.objectweb.asm.tree.ClassNode import java.io.IOException import java.io.InputStream @@ -17,7 +17,7 @@ import java.io.OutputStream * @param input the input stream to read from, must be a JAR * @param output the output stream to write to * @param signatures the signatures - * @sample net.revanced.patcher.PatcherTest + * @sample app.revanced.patcher.PatcherTest * @throws IOException if one of the streams are closed */ class Patcher( diff --git a/src/main/kotlin/net/revanced/patcher/cache/Cache.kt b/src/main/kotlin/app/revanced/patcher/cache/Cache.kt similarity index 91% rename from src/main/kotlin/net/revanced/patcher/cache/Cache.kt rename to src/main/kotlin/app/revanced/patcher/cache/Cache.kt index 050cec3d..3a1d1a95 100644 --- a/src/main/kotlin/net/revanced/patcher/cache/Cache.kt +++ b/src/main/kotlin/app/revanced/patcher/cache/Cache.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.cache +package app.revanced.patcher.cache import org.objectweb.asm.tree.ClassNode diff --git a/src/main/kotlin/net/revanced/patcher/cache/PatchData.kt b/src/main/kotlin/app/revanced/patcher/cache/PatchData.kt similarity index 79% rename from src/main/kotlin/net/revanced/patcher/cache/PatchData.kt rename to src/main/kotlin/app/revanced/patcher/cache/PatchData.kt index c2ddbb95..033e4977 100644 --- a/src/main/kotlin/net/revanced/patcher/cache/PatchData.kt +++ b/src/main/kotlin/app/revanced/patcher/cache/PatchData.kt @@ -1,7 +1,7 @@ -package net.revanced.patcher.cache +package app.revanced.patcher.cache -import net.revanced.patcher.resolver.MethodResolver -import net.revanced.patcher.signature.Signature +import app.revanced.patcher.resolver.MethodResolver +import app.revanced.patcher.signature.Signature import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.MethodNode diff --git a/src/main/kotlin/net/revanced/patcher/patch/Patch.kt b/src/main/kotlin/app/revanced/patcher/patch/Patch.kt similarity index 57% rename from src/main/kotlin/net/revanced/patcher/patch/Patch.kt rename to src/main/kotlin/app/revanced/patcher/patch/Patch.kt index f062a74c..e2e14ac2 100644 --- a/src/main/kotlin/net/revanced/patcher/patch/Patch.kt +++ b/src/main/kotlin/app/revanced/patcher/patch/Patch.kt @@ -1,6 +1,6 @@ -package net.revanced.patcher.patch +package app.revanced.patcher.patch -import net.revanced.patcher.cache.Cache +import app.revanced.patcher.cache.Cache abstract class Patch(val patchName: String) { abstract fun execute(cache: Cache): PatchResult diff --git a/src/main/kotlin/net/revanced/patcher/patch/PatchResult.kt b/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt similarity index 89% rename from src/main/kotlin/net/revanced/patcher/patch/PatchResult.kt rename to src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt index 73c93b4d..02e1ac60 100644 --- a/src/main/kotlin/net/revanced/patcher/patch/PatchResult.kt +++ b/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.patch +package app.revanced.patcher.patch interface PatchResult { fun error(): PatchResultError? { diff --git a/src/main/kotlin/net/revanced/patcher/resolver/MethodResolver.kt b/src/main/kotlin/app/revanced/patcher/resolver/MethodResolver.kt similarity index 95% rename from src/main/kotlin/net/revanced/patcher/resolver/MethodResolver.kt rename to src/main/kotlin/app/revanced/patcher/resolver/MethodResolver.kt index fdefe298..31f21b52 100644 --- a/src/main/kotlin/net/revanced/patcher/resolver/MethodResolver.kt +++ b/src/main/kotlin/app/revanced/patcher/resolver/MethodResolver.kt @@ -1,11 +1,11 @@ -package net.revanced.patcher.resolver +package app.revanced.patcher.resolver import mu.KotlinLogging -import net.revanced.patcher.cache.MethodMap -import net.revanced.patcher.cache.PatchData -import net.revanced.patcher.cache.PatternScanData -import net.revanced.patcher.signature.Signature -import net.revanced.patcher.util.ExtraTypes +import app.revanced.patcher.cache.MethodMap +import app.revanced.patcher.cache.PatchData +import app.revanced.patcher.cache.PatternScanData +import app.revanced.patcher.signature.Signature +import app.revanced.patcher.util.ExtraTypes import org.objectweb.asm.Type import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.InsnList diff --git a/src/main/kotlin/net/revanced/patcher/resolver/ScanResult.kt b/src/main/kotlin/app/revanced/patcher/resolver/ScanResult.kt similarity index 75% rename from src/main/kotlin/net/revanced/patcher/resolver/ScanResult.kt rename to src/main/kotlin/app/revanced/patcher/resolver/ScanResult.kt index 4d31f98b..135b0caf 100644 --- a/src/main/kotlin/net/revanced/patcher/resolver/ScanResult.kt +++ b/src/main/kotlin/app/revanced/patcher/resolver/ScanResult.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.resolver +package app.revanced.patcher.resolver internal data class ScanResult( val found: Boolean, diff --git a/src/main/kotlin/net/revanced/patcher/signature/Signature.kt b/src/main/kotlin/app/revanced/patcher/signature/Signature.kt similarity index 96% rename from src/main/kotlin/net/revanced/patcher/signature/Signature.kt rename to src/main/kotlin/app/revanced/patcher/signature/Signature.kt index 50f9cf00..885f7713 100644 --- a/src/main/kotlin/net/revanced/patcher/signature/Signature.kt +++ b/src/main/kotlin/app/revanced/patcher/signature/Signature.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.signature +package app.revanced.patcher.signature import org.objectweb.asm.Type diff --git a/src/main/kotlin/net/revanced/patcher/util/ExtraTypes.kt b/src/main/kotlin/app/revanced/patcher/util/ExtraTypes.kt similarity index 88% rename from src/main/kotlin/net/revanced/patcher/util/ExtraTypes.kt rename to src/main/kotlin/app/revanced/patcher/util/ExtraTypes.kt index 6137c163..430a4bec 100644 --- a/src/main/kotlin/net/revanced/patcher/util/ExtraTypes.kt +++ b/src/main/kotlin/app/revanced/patcher/util/ExtraTypes.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.util +package app.revanced.patcher.util import org.objectweb.asm.Type diff --git a/src/main/kotlin/net/revanced/patcher/util/Io.kt b/src/main/kotlin/app/revanced/patcher/util/Io.kt similarity index 99% rename from src/main/kotlin/net/revanced/patcher/util/Io.kt rename to src/main/kotlin/app/revanced/patcher/util/Io.kt index 1fa4affb..e200c79d 100644 --- a/src/main/kotlin/net/revanced/patcher/util/Io.kt +++ b/src/main/kotlin/app/revanced/patcher/util/Io.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.util +package app.revanced.patcher.util import org.objectweb.asm.ClassReader import org.objectweb.asm.ClassWriter diff --git a/src/main/kotlin/net/revanced/patcher/writer/ASMWriter.kt b/src/main/kotlin/app/revanced/patcher/writer/ASMWriter.kt similarity index 93% rename from src/main/kotlin/net/revanced/patcher/writer/ASMWriter.kt rename to src/main/kotlin/app/revanced/patcher/writer/ASMWriter.kt index ce601c49..1a8a014f 100644 --- a/src/main/kotlin/net/revanced/patcher/writer/ASMWriter.kt +++ b/src/main/kotlin/app/revanced/patcher/writer/ASMWriter.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.writer +package app.revanced.patcher.writer import org.objectweb.asm.tree.AbstractInsnNode import org.objectweb.asm.tree.InsnList diff --git a/src/test/kotlin/net/revanced/patcher/PatcherTest.kt b/src/test/kotlin/app/revanced/patcher/PatcherTest.kt similarity index 93% rename from src/test/kotlin/net/revanced/patcher/PatcherTest.kt rename to src/test/kotlin/app/revanced/patcher/PatcherTest.kt index 519cf309..db8b2aed 100644 --- a/src/test/kotlin/net/revanced/patcher/PatcherTest.kt +++ b/src/test/kotlin/app/revanced/patcher/PatcherTest.kt @@ -1,14 +1,14 @@ -package net.revanced.patcher +package app.revanced.patcher -import net.revanced.patcher.cache.Cache -import net.revanced.patcher.patch.Patch -import net.revanced.patcher.patch.PatchResult -import net.revanced.patcher.patch.PatchResultSuccess -import net.revanced.patcher.signature.Signature -import net.revanced.patcher.util.ExtraTypes -import net.revanced.patcher.util.TestUtil -import net.revanced.patcher.writer.ASMWriter.insertAt -import net.revanced.patcher.writer.ASMWriter.setAt +import app.revanced.patcher.cache.Cache +import app.revanced.patcher.patch.Patch +import app.revanced.patcher.patch.PatchResult +import app.revanced.patcher.patch.PatchResultSuccess +import app.revanced.patcher.signature.Signature +import app.revanced.patcher.util.ExtraTypes +import app.revanced.patcher.util.TestUtil +import app.revanced.patcher.writer.ASMWriter.insertAt +import app.revanced.patcher.writer.ASMWriter.setAt import org.junit.jupiter.api.assertDoesNotThrow import org.objectweb.asm.Opcodes.* import org.objectweb.asm.Type diff --git a/src/test/kotlin/net/revanced/patcher/ReaderTest.kt b/src/test/kotlin/app/revanced/patcher/ReaderTest.kt similarity index 92% rename from src/test/kotlin/net/revanced/patcher/ReaderTest.kt rename to src/test/kotlin/app/revanced/patcher/ReaderTest.kt index 6ecf11b7..4087d892 100644 --- a/src/test/kotlin/net/revanced/patcher/ReaderTest.kt +++ b/src/test/kotlin/app/revanced/patcher/ReaderTest.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher +package app.revanced.patcher import java.io.ByteArrayOutputStream import kotlin.test.Test diff --git a/src/test/kotlin/net/revanced/patcher/util/TestUtil.kt b/src/test/kotlin/app/revanced/patcher/util/TestUtil.kt similarity index 97% rename from src/test/kotlin/net/revanced/patcher/util/TestUtil.kt rename to src/test/kotlin/app/revanced/patcher/util/TestUtil.kt index a0a9fea7..de9c831d 100644 --- a/src/test/kotlin/net/revanced/patcher/util/TestUtil.kt +++ b/src/test/kotlin/app/revanced/patcher/util/TestUtil.kt @@ -1,4 +1,4 @@ -package net.revanced.patcher.util +package app.revanced.patcher.util import org.objectweb.asm.tree.AbstractInsnNode import org.objectweb.asm.tree.FieldInsnNode