Rename common module to util again

As I'm splitting it up into smaller modules (e.g. compress and crypto) I think util is a more appropriate name for the remainder. Signed-off-by: Graham <gpe@openrs2.dev>
4 years ago · 465078256f
parent 177326221f
commit 465078256f
25 changed files with 31 additions and 31 deletions
--- a/asm/build.gradle.kts
+++ b/asm/build.gradle.kts
@ -4,7 +4,7 @@ plugins {
 }

 dependencies {
-    api(project(":common"))
+    api(project(":util"))
    api("org.ow2.asm:asm:${Versions.asm}")
    api("org.ow2.asm:asm-commons:${Versions.asm}")
    api("org.ow2.asm:asm-tree:${Versions.asm}")
--- a/asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.kt
+++ b/asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.kt
@ -3,8 +3,8 @@ package dev.openrs2.asm.classpath
 import dev.openrs2.asm.MemberDesc
 import dev.openrs2.asm.MemberRef
 import dev.openrs2.asm.toBinaryClassName
-import dev.openrs2.common.collect.DisjointSet
-import dev.openrs2.common.collect.ForestDisjointSet
+import dev.openrs2.util.collect.DisjointSet
+import dev.openrs2.util.collect.ForestDisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt
+++ b/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt
@ -3,9 +3,9 @@ package dev.openrs2.asm.classpath
 import com.github.michaelbull.logging.InlineLogger
 import dev.openrs2.asm.NopClassVisitor
 import dev.openrs2.asm.remap
-import dev.openrs2.crypto.Pkcs12KeyStore
-import dev.openrs2.common.io.DeterministicJarOutputStream
 import dev.openrs2.compress.gzip.Gzip
+import dev.openrs2.crypto.Pkcs12KeyStore
+import dev.openrs2.util.io.DeterministicJarOutputStream
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.ClassNode
--- a/compress/build.gradle.kts
+++ b/compress/build.gradle.kts
@ -4,7 +4,7 @@ plugins {
 }

 dependencies {
-    implementation(project(":common"))
+    implementation(project(":util"))
    implementation("org.apache.commons:commons-compress:${Versions.commonsCompress}")
 }

--- a/compress/src/main/java/dev/openrs2/compress/bzip2/Bzip2.kt
+++ b/compress/src/main/java/dev/openrs2/compress/bzip2/Bzip2.kt
@ -1,6 +1,6 @@
 package dev.openrs2.compress.bzip2

-import dev.openrs2.common.io.SkipOutputStream
+import dev.openrs2.util.io.SkipOutputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream
 import java.io.ByteArrayInputStream
--- a/compress/src/main/java/dev/openrs2/compress/gzip/Gzip.kt
+++ b/compress/src/main/java/dev/openrs2/compress/gzip/Gzip.kt
@ -1,6 +1,6 @@
 package dev.openrs2.compress.gzip

-import dev.openrs2.common.io.SkipOutputStream
+import dev.openrs2.util.io.SkipOutputStream
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.io.OutputStream
--- a/decompiler/build.gradle.kts
+++ b/decompiler/build.gradle.kts
@ -12,7 +12,7 @@ application {
 dependencies {
    api("com.github.ajalt:clikt:${Versions.clikt}")

-    implementation(project(":common"))
+    implementation(project(":util"))
    implementation("dev.openrs2:fernflower:${Versions.fernflower}")
 }

--- a/deob-ast/build.gradle.kts
+++ b/deob-ast/build.gradle.kts
@ -11,7 +11,7 @@ application {
 dependencies {
    api("com.github.ajalt:clikt:${Versions.clikt}")

-    implementation(project(":common"))
+    implementation(project(":util"))
    implementation("com.github.javaparser:javaparser-symbol-solver-core:${Versions.javaParser}")
    implementation("org.jdom:jdom2:${Versions.jdom}")
 }
--- a/deob/src/main/java/dev/openrs2/deob/ArgRef.kt
+++ b/deob/src/main/java/dev/openrs2/deob/ArgRef.kt
@ -1,6 +1,6 @@
 package dev.openrs2.deob

 import dev.openrs2.asm.MemberRef
-import dev.openrs2.common.collect.DisjointSet
+import dev.openrs2.util.collect.DisjointSet

 data class ArgRef(val method: DisjointSet.Partition<MemberRef>, val arg: Int)
--- a/deob/src/main/java/dev/openrs2/deob/analysis/SourcedIntValue.kt
+++ b/deob/src/main/java/dev/openrs2/deob/analysis/SourcedIntValue.kt
@ -1,6 +1,6 @@
 package dev.openrs2.deob.analysis

 import dev.openrs2.asm.MemberRef
-import dev.openrs2.common.collect.DisjointSet
+import dev.openrs2.util.collect.DisjointSet

 data class SourcedIntValue(val source: DisjointSet.Partition<MemberRef>, val intValue: IntValue)
--- a/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt
+++ b/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt
@ -5,8 +5,8 @@ import dev.openrs2.asm.MemberDesc
 import dev.openrs2.asm.MemberRef
 import dev.openrs2.asm.classpath.ClassMetadata
 import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.common.collect.DisjointSet
-import dev.openrs2.common.indefiniteArticle
+import dev.openrs2.util.collect.DisjointSet
+import dev.openrs2.util.indefiniteArticle
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.commons.Remapper
--- a/deob/src/main/java/dev/openrs2/deob/transform/DummyArgTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/DummyArgTransformer.kt
@ -15,11 +15,11 @@ import dev.openrs2.asm.pure
 import dev.openrs2.asm.replaceExpression
 import dev.openrs2.asm.stackMetadata
 import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.common.collect.DisjointSet
 import dev.openrs2.deob.ArgRef
 import dev.openrs2.deob.analysis.IntInterpreter
 import dev.openrs2.deob.analysis.IntValue
 import dev.openrs2.deob.analysis.SourcedIntValue
+import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/deob/src/main/java/dev/openrs2/deob/transform/StaticScramblingTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/StaticScramblingTransformer.kt
@ -6,8 +6,8 @@ import dev.openrs2.asm.MemberRef
 import dev.openrs2.asm.classpath.ClassPath
 import dev.openrs2.asm.classpath.Library
 import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.common.collect.DisjointSet
 import dev.openrs2.deob.remap.TypedRemapper
+import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
--- a/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt
@ -7,11 +7,11 @@ import dev.openrs2.asm.classpath.Library
 import dev.openrs2.asm.hasCode
 import dev.openrs2.asm.removeArgument
 import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.common.collect.DisjointSet
 import dev.openrs2.deob.ArgRef
 import dev.openrs2.deob.analysis.ConstSourceInterpreter
 import dev.openrs2.deob.analysis.ConstSourceValue
 import dev.openrs2.deob.remap.TypedRemapper
+import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/deob/src/main/java/dev/openrs2/deob/transform/UnusedMethodTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/UnusedMethodTransformer.kt
@ -7,9 +7,9 @@ import dev.openrs2.asm.MemberRef
 import dev.openrs2.asm.classpath.ClassPath
 import dev.openrs2.asm.classpath.Library
 import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.common.collect.DisjointSet
-import dev.openrs2.common.collect.removeFirst
 import dev.openrs2.deob.remap.TypedRemapper
+import dev.openrs2.util.collect.DisjointSet
+import dev.openrs2.util.collect.removeFirst
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodInsnNode
--- a/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt
@ -9,7 +9,7 @@ import dev.openrs2.asm.MemberRef
 import dev.openrs2.asm.classpath.ClassPath
 import dev.openrs2.asm.classpath.Library
 import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.common.collect.DisjointSet
+import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -7,7 +7,6 @@ include(
    "asm",
    "bundler",
    "cli",
-    "common",
    "compress",
    "compress-cli",
    "crc32",
@ -16,7 +15,8 @@ include(
    "deob",
    "deob-annotations",
    "deob-ast",
-    "game"
+    "game",
+    "util"
 )

 if (Files.exists(rootProject.projectDir.toPath().resolve("nonfree/build.gradle.kts"))) {
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@ -9,10 +9,10 @@ publishing {

        pom {
            packaging = "jar"
-            name.set("OpenRS2 Common")
+            name.set("OpenRS2 Utilities")
            description.set(
                """
-                Common code used by all modules.
+                Common utility code used by all modules.
            """.trimIndent()
            )
        }
--- a/common/src/main/java/dev/openrs2/common/StringUtils.kt
+++ b/common/src/main/java/dev/openrs2/common/StringUtils.kt
@ -1,4 +1,4 @@
-package dev.openrs2.common
+package dev.openrs2.util

 fun CharSequence.indefiniteArticle(): String {
    require(isNotEmpty())
--- a/common/src/main/java/dev/openrs2/common/collect/DisjointSet.kt
+++ b/common/src/main/java/dev/openrs2/common/collect/DisjointSet.kt
@ -1,4 +1,4 @@
-package dev.openrs2.common.collect
+package dev.openrs2.util.collect

 interface DisjointSet<T> : Iterable<DisjointSet.Partition<T>> {
    interface Partition<T> : Iterable<T>
--- a/common/src/main/java/dev/openrs2/common/collect/ForestDisjointSet.kt
+++ b/common/src/main/java/dev/openrs2/common/collect/ForestDisjointSet.kt
@ -1,4 +1,4 @@
-package dev.openrs2.common.collect
+package dev.openrs2.util.collect

 import java.util.ArrayDeque

--- a/common/src/main/java/dev/openrs2/common/collect/IterableUtils.kt
+++ b/common/src/main/java/dev/openrs2/common/collect/IterableUtils.kt
@ -1,4 +1,4 @@
-package dev.openrs2.common.collect
+package dev.openrs2.util.collect

 inline fun <T> MutableIterable<T>.removeFirst(predicate: (T) -> Boolean): Boolean {
    val iterator = iterator()
--- a/common/src/main/java/dev/openrs2/common/io/DeterministicJarOutputStream.kt
+++ b/common/src/main/java/dev/openrs2/common/io/DeterministicJarOutputStream.kt
@ -1,4 +1,4 @@
-package dev.openrs2.common.io
+package dev.openrs2.util.io

 import java.io.OutputStream
 import java.nio.file.Files
--- a/common/src/main/java/dev/openrs2/common/io/SkipOutputStream.kt
+++ b/common/src/main/java/dev/openrs2/common/io/SkipOutputStream.kt
@ -1,4 +1,4 @@
-package dev.openrs2.common.io
+package dev.openrs2.util.io

 import java.io.OutputStream

--- a/common/src/test/java/dev/openrs2/common/StringUtilsTest.kt
+++ b/common/src/test/java/dev/openrs2/common/StringUtilsTest.kt
@ -1,4 +1,4 @@
-package dev.openrs2.common
+package dev.openrs2.util

 import kotlin.test.Test
 import kotlin.test.assertEquals