Replace in-project modules with upstream dependencies

Ladysnake · Sep 8, 2023 · 6a04d31 · 6a04d31
1 parent 73eca7a
commit 6a04d31
Show file tree

Hide file tree

Showing 98 changed files with 23 additions and 6,708 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -87,13 +87,15 @@ dependencies {
 	implementation(libs.kotlin.stdlib)
 	implementation(libs.kx.ser)
 	implementation(libs.graphql)
-
-	implementation(project(":module-log-parser"))
 	implementation(libs.scrimage)
-	implementation(project(":module-welcome"))
-	implementation(project(":module-user-cleanup"))
-	implementation(project(":module-tags"))
-	implementation(project(":module-moderation"))
+
+//	implementation(project(":module-log-parser"))
+//	implementation(project(":module-welcome"))
+//	implementation(project(":module-user-cleanup"))
+//	implementation(project(":module-tags"))
+//	implementation(project(":module-moderation"))
+
+	implementation(libs.bundles.cozy.modules)
 }
 
 graphql {

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -5,6 +5,7 @@ graphql = "6.5.3"
 
 autolink = "0.11.0"
 commons-text = "1.10.0"
+cozy-modules = "1.0.1-SNAPSHOT"
 editorconfig-gradle-plugin = "0.0.3"
 excelkt = "1.0.2"
 flexver = "1.1.0"
@@ -34,6 +35,11 @@ shadow-gradle-plugin = "8.1.1"
 [libraries]
 autolink = { module = "org.nibor.autolink:autolink", version.ref = "autolink" }
 commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
+cozy-log-parser = { module = "org.quiltmc.community:module-log-parser", version.ref = "cozy-modules" }
+cozy-moderation = { module = "org.quiltmc.community:module-moderation", version.ref = "cozy-modules" }
+cozy-tags = { module = "org.quiltmc.community:module-tags", version.ref = "cozy-modules" }
+cozy-user-cleanup = { module = "org.quiltmc.community:module-user-cleanup", version.ref = "cozy-modules" }
+cozy-welcome = { module = "org.quiltmc.community:module-welcome", version.ref = "cozy-modules" }
 detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 detekt-libraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }
 excelkt = { module = "io.github.evanrupert:excelkt", version.ref = "excelkt" }
@@ -68,3 +74,12 @@ moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "mosh
 rgxgen = { module = "com.github.curious-odd-man:rgxgen", version.ref = "rgxgen" }
 semver = { module = "io.github.z4kn4fein:semver", version.ref = "semver" }
 scrimage = { module = "com.sksamuel.scrimage:scrimage-core", version.ref = "scrimage" }
+
+[bundles]
+cozy-modules = [
+	"cozy-log-parser",
+	"cozy-moderation",
+	"cozy-tags",
+	"cozy-user-cleanup",
+	"cozy-welcome"
+]
diff --git a/module-log-parser/README.md b/module-log-parser/README.md
diff --git a/module-log-parser/build.gradle.kts b/module-log-parser/build.gradle.kts
diff --git a/module-log-parser/pastebins.yml b/module-log-parser/pastebins.yml
diff --git a/module-log-parser/process.drawio b/module-log-parser/process.drawio
diff --git a/module-log-parser/process.drawio.png b/module-log-parser/process.drawio.png