Rename util to common

5 years ago · e05653cdcc
parent 8b41f6288d
commit e05653cdcc
17 changed files with 23 additions and 23 deletions
--- a/asm/pom.xml
+++ b/asm/pom.xml
@ -20,7 +20,7 @@
  <dependencies>
    <dependency>
      <groupId>dev.openrs2</groupId>
-      <artifactId>openrs2-util</artifactId>
+      <artifactId>openrs2-common</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
--- 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 com.google.common.collect.ImmutableList
 import dev.openrs2.asm.MemberDesc
 import dev.openrs2.asm.MemberRef
-import dev.openrs2.util.collect.DisjointSet
-import dev.openrs2.util.collect.ForestDisjointSet
+import dev.openrs2.common.collect.DisjointSet
+import dev.openrs2.common.collect.ForestDisjointSet
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.ClassNode

--- a/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt
+++ b/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt
@ -3,8 +3,8 @@ package dev.openrs2.asm.classpath
 import com.github.michaelbull.logging.InlineLogger
 import dev.openrs2.asm.hasCode
 import dev.openrs2.asm.remap.ClassForNameRemapper
-import dev.openrs2.util.io.DeterministicJarOutputStream
-import dev.openrs2.util.io.SkipOutputStream
+import dev.openrs2.common.io.DeterministicJarOutputStream
+import dev.openrs2.common.io.SkipOutputStream
 import org.apache.harmony.pack200.Pack200
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.ClassWriter
--- a/common/pom.xml
+++ b/common/pom.xml
@ -8,11 +8,11 @@
    <version>1.0.0-SNAPSHOT</version>
  </parent>

-  <artifactId>openrs2-util</artifactId>
+  <artifactId>openrs2-common</artifactId>
  <packaging>jar</packaging>

-  <name>OpenRS2 Utilities</name>
-  <description>Common utility code used by all modules.</description>
+  <name>OpenRS2 Common</name>
+  <description>Common code used by all modules.</description>

  <dependencies>
    <dependency>
--- 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.util
+package dev.openrs2.common

 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.util.collect
+package dev.openrs2.common.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.util.collect
+package dev.openrs2.common.collect

 import java.util.*
 import kotlin.NoSuchElementException
--- 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.util.io
+package dev.openrs2.common.io

 import java.io.OutputStream
 import java.nio.file.attribute.FileTime
--- 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.util.io
+package dev.openrs2.common.io

 import java.io.FilterOutputStream
 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.util
+package dev.openrs2.common

 import kotlin.test.Test
 import kotlin.test.assertEquals
--- a/decompiler/pom.xml
+++ b/decompiler/pom.xml
@ -20,7 +20,7 @@
  <dependencies>
    <dependency>
      <groupId>dev.openrs2</groupId>
-      <artifactId>openrs2-util</artifactId>
+      <artifactId>openrs2-common</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
--- 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.util.collect.DisjointSet
+import dev.openrs2.common.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.util.collect.DisjointSet
+import dev.openrs2.common.collect.DisjointSet

 data class SourcedIntValue(val source: DisjointSet.Partition<MemberRef>, val intValue: IntValue)
--- a/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.java
+++ b/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.java
@ -10,8 +10,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.util.StringUtilsKt;
-import dev.openrs2.util.collect.DisjointSet;
+import dev.openrs2.common.StringUtilsKt;
+import dev.openrs2.common.collect.DisjointSet;
 import kotlin.text.StringsKt;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.Remapper;
--- a/deob/src/main/java/dev/openrs2/deob/transform/DummyArgTransformer.java
+++ b/deob/src/main/java/dev/openrs2/deob/transform/DummyArgTransformer.java
@ -19,10 +19,10 @@ import dev.openrs2.asm.StackMetadataKt;
 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.ArgRef;
 import dev.openrs2.deob.analysis.IntInterpreter;
 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/UnusedArgTransformer.java
+++ b/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.java
@ -12,10 +12,10 @@ import dev.openrs2.asm.MethodNodeUtilsKt;
 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.ArgRef;
 import dev.openrs2.deob.analysis.ConstSourceInterpreter;
 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/pom.xml
+++ b/pom.xml
@ -23,12 +23,12 @@
    <module>all</module>
    <module>asm</module>
    <module>bundler</module>
+    <module>common</module>
    <module>decompiler</module>
-    <module>deob</module>
    <module>deob-annotations</module>
    <module>deob-ast</module>
+    <module>deob</module>
    <module>game</module>
-    <module>util</module>
  </modules>

  <scm>