Collapse into top-level module

.idea/compiler.xml

@@ -6,10 +6,11 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="common" />
+        <module name="documents" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="common" target="1.8" />
       <module name="sqlite" target="1.8" />
     </bytecodeTargetLevel>
   </component>

.idea/encodings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/common/src/main/kotlin" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/kotlin" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/sqlite/src/main/kotlin" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/sqlite/src/main/resources" charset="UTF-8" />
   </component>

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.1.10" />
+    <option name="version" value="2.1.0" />
   </component>
 </project>

.idea/misc.xml

@@ -10,6 +10,7 @@
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/src/common/pom.xml" />
         <option value="$PROJECT_DIR$/src/sqlite/pom.xml" />
       </set>
     </option>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/solutions.bitbadger.documents.iml" filepath="$PROJECT_DIR$/.idea/solutions.bitbadger.documents.iml" />
-    </modules>
-  </component>
-</project>

.idea/solutions.bitbadger.documents.iml

@@ -2,7 +2,10 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />

pom.xml

@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>solutions.bitbadger.documents</groupId>
-    <artifactId>common</artifactId>
+    <groupId>solutions.bitbadger</groupId>
+    <artifactId>documents</artifactId>
     <version>4.0-ALPHA</version>
 
     <properties>

src/main/kotlin/AutoId.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import kotlin.reflect.full.*
 

src/main/kotlin/Comparison.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A comparison against a field in a JSON document

src/main/kotlin/Configuration.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import kotlinx.serialization.json.Json
 import java.sql.Connection

src/main/kotlin/ConnectionExtensions.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.Connection
 import java.sql.ResultSet

src/main/kotlin/Dialect.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The SQL dialect to use when building queries

src/main/kotlin/DocumentException.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * An exception caused by invalid operations in the document library

src/main/kotlin/Field.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A field and its comparison

src/main/kotlin/FieldFormat.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The data format for a document field retrieval

src/main/kotlin/FieldMatch.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * How fields should be matched in by-field queries

src/main/kotlin/Op.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A comparison operator used for fields

src/main/kotlin/Parameter.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A parameter to use for a query

src/main/kotlin/ParameterName.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * Derive parameter names; each instance wraps a counter to provide names for anonymous fields

src/main/kotlin/ParameterType.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The types of parameters supported by the document library

src/main/kotlin/Parameters.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.Connection
 import java.sql.PreparedStatement

src/main/kotlin/Query.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 object Query {
 

src/main/kotlin/Results.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.PreparedStatement
 import java.sql.ResultSet

src/test/kotlin/AutoIdTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/ConfigurationTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/FieldMatchTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/FieldTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/OpTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/ParameterNameTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/ParameterTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows

src/test/kotlin/ParametersTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import kotlin.test.Test

src/test/kotlin/QueryTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test