move more stuff to :util

Author: binarynoise

api/client/build.gradle.kts

@@ -12,8 +12,8 @@ dependencies {
     implementation(libs.okhttp.urlconnection)
 
     testImplementation(projects.api.server)
-    testImplementation(projects.fileDB)
-    testImplementation(projects.logger)
+    testImplementation(projects.util.fileDB)
+    testImplementation(projects.util.logger)
     testImplementation(kotlin("test"))
     testImplementation(platform(libs.ktor.bom))
     testImplementation(libs.ktor.server.core.jvm)

api/server/build.gradle.kts

@@ -9,8 +9,8 @@ plugins {
 
 dependencies {
     implementation(projects.api)
-    implementation(projects.fileDB)
-    implementation(projects.logger)
+    implementation(projects.util.fileDB)
+    implementation(projects.util.logger)
 
     implementation(platform(libs.ktor.bom))
     implementation(libs.ktor.server.core.jvm)

app/build.gradle.kts

@@ -95,10 +95,10 @@ android {
 }
 
 dependencies {
-    implementation(projects.logger)
-    implementation(projects.liberator)
     implementation(projects.api.client)
-    implementation(projects.fileDB)
+    implementation(projects.liberator)
+    implementation(projects.util.fileDB)
+    implementation(projects.util.logger)
 
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.core.ktx)

liberator/build.gradle.kts

@@ -4,8 +4,9 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.logger)
+    implementation(projects.util.logger)
     implementation(projects.util.okhttpKts)
+    implementation(projects.util.rhino)
 
     implementation(libs.jsoup)
     implementation(libs.okhttp)

linux/build.gradle.kts

@@ -7,9 +7,9 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.logger)
-    implementation(projects.liberator)
     implementation(projects.api.client)
+    implementation(projects.liberator)
+    implementation(projects.util.logger)
     compileOnly(libs.okhttp)
 }
 

modules.gradle.kts

@@ -2,10 +2,10 @@ include(":api")
 include(":api:client")
 include(":api:server")
 include(":app")
-include(":fileDB")
 include(":liberator")
 include(":liberator:processor")
 include(":linux")
-include(":logger")
 include(":portalProxy")
+include(":util:fileDB")
+include(":util:logger")
 include(":util:okhttp-kts")

portalProxy/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.logger)
+    implementation(projects.util.logger)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.kotlinx.html)
     implementation(libs.slf4j.simple)

fileDB/.gitignore util/fileDB/.gitignorefileDB/.gitignore renamed to util/fileDB/.gitignore

@@ -4,8 +4,8 @@ plugins {
 }
 
 dependencies {
+    implementation(projects.util.logger)
     implementation(libs.kotlinx.serialization.json)
-    implementation(projects.logger)
 
     testImplementation(kotlin("test"))
     testImplementation(libs.kotlinx.datetime)