seperated common into modules

BLUEAMETHYST-Studios · Jun 2, 2024 · d55afb4 · d55afb4
1 parent 03de650
commit d55afb4
Show file tree

Hide file tree

Showing 24 changed files with 39 additions and 4 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -11,10 +11,6 @@ dependencies {
  implementation(project(":api"))
  implementation(libs.bundles.ktorClient)
  implementation(libs.guice)
- implementation(libs.clikt)
- implementation(libs.mordant)
- implementation(libs.mordantCoroutines)
- implementation(kotlin("reflect"))
 }
 
 tasks.test {

diff --git a/common/cli/build.gradle.kts b/common/cli/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+ alias(libs.plugins.jvm)
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation(libs.clikt)
+ implementation(libs.mordant)
+ implementation(libs.mordantCoroutines)
+}
+
+kotlin {
+ jvmToolchain(21)
+}
diff --git a/...luecloud/common/terminal/ConsoleColors.kt → ...luecloud/common/terminal/ConsoleColors.kt b/...luecloud/common/terminal/ConsoleColors.kt → ...luecloud/common/terminal/ConsoleColors.kt
diff --git a/...thyst/bluecloud/common/terminal/Logger.kt → ...thyst/bluecloud/common/terminal/Logger.kt b/...thyst/bluecloud/common/terminal/Logger.kt → ...thyst/bluecloud/common/terminal/Logger.kt
diff --git a/...yst/bluecloud/common/terminal/Terminal.kt → ...yst/bluecloud/common/terminal/Terminal.kt b/...yst/bluecloud/common/terminal/Terminal.kt → ...yst/bluecloud/common/terminal/Terminal.kt
diff --git a/...hyst/bluecloud/common/terminal/cli/CLI.kt → ...hyst/bluecloud/common/terminal/cli/CLI.kt b/...hyst/bluecloud/common/terminal/cli/CLI.kt → ...hyst/bluecloud/common/terminal/cli/CLI.kt
diff --git a/...ommon/terminal/cli/command/RootCommand.kt → ...ommon/terminal/cli/command/RootCommand.kt b/...ommon/terminal/cli/command/RootCommand.kt → ...ommon/terminal/cli/command/RootCommand.kt
diff --git a/...loud/common/terminal/prompts/IntPrompt.kt → ...loud/common/terminal/prompts/IntPrompt.kt b/...loud/common/terminal/prompts/IntPrompt.kt → ...loud/common/terminal/prompts/IntPrompt.kt
diff --git a/...d/common/terminal/prompts/MemoryPrompt.kt → ...d/common/terminal/prompts/MemoryPrompt.kt b/...d/common/terminal/prompts/MemoryPrompt.kt → ...d/common/terminal/prompts/MemoryPrompt.kt
diff --git a/common/platforms/build.gradle.kts b/common/platforms/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+ alias(libs.plugins.jvm)
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation(libs.bundles.ktorClient)
+ implementation(kotlin("reflect"))
+}
diff --git a/...loud/common/platforms/AbstractPlatform.kt → ...loud/common/platforms/AbstractPlatform.kt b/...loud/common/platforms/AbstractPlatform.kt → ...loud/common/platforms/AbstractPlatform.kt
diff --git a/...hyst/bluecloud/common/platforms/Global.kt → ...hyst/bluecloud/common/platforms/Global.kt b/...hyst/bluecloud/common/platforms/Global.kt → ...hyst/bluecloud/common/platforms/Global.kt
diff --git a/...loud/common/platforms/PlatformRegistry.kt → ...loud/common/platforms/PlatformRegistry.kt b/...loud/common/platforms/PlatformRegistry.kt → ...loud/common/platforms/PlatformRegistry.kt
diff --git a/...common/platforms/annontations/Platform.kt → ...common/platforms/annontations/Platform.kt b/...common/platforms/annontations/Platform.kt → ...common/platforms/annontations/Platform.kt
diff --git a/.../platforms/impl/proxy/VelocityPlatform.kt → .../platforms/impl/proxy/VelocityPlatform.kt b/.../platforms/impl/proxy/VelocityPlatform.kt → .../platforms/impl/proxy/VelocityPlatform.kt
diff --git a/.../platforms/impl/server/PaperMCPlatform.kt → .../platforms/impl/server/PaperMCPlatform.kt b/.../platforms/impl/server/PaperMCPlatform.kt → .../platforms/impl/server/PaperMCPlatform.kt
diff --git a/...viders/papermc/AbstractPaperMCPlatform.kt → ...viders/papermc/AbstractPaperMCPlatform.kt b/...viders/papermc/AbstractPaperMCPlatform.kt → ...viders/papermc/AbstractPaperMCPlatform.kt
diff --git a/...viders/papermc/objects/ProjectResponse.kt → ...viders/papermc/objects/ProjectResponse.kt b/...viders/papermc/objects/ProjectResponse.kt → ...viders/papermc/objects/ProjectResponse.kt
diff --git a/...apermc/objects/ProjectVersionsResponse.kt → ...apermc/objects/ProjectVersionsResponse.kt b/...apermc/objects/ProjectVersionsResponse.kt → ...apermc/objects/ProjectVersionsResponse.kt
diff --git a/...ommon/platforms/types/PlatformLanguage.kt → ...ommon/platforms/types/PlatformLanguage.kt b/...ommon/platforms/types/PlatformLanguage.kt → ...ommon/platforms/types/PlatformLanguage.kt
diff --git a/...ud/common/platforms/types/PlatformType.kt → ...ud/common/platforms/types/PlatformType.kt b/...ud/common/platforms/types/PlatformType.kt → ...ud/common/platforms/types/PlatformType.kt
diff --git a/node/build.gradle.kts b/node/build.gradle.kts
@@ -13,6 +13,7 @@ repositories {
 dependencies {
  implementation(project(":api"))
  implementation(project(":common"))
+ implementation(project(":common:cli"))
  implementation(project(":wrapper")) // TODO
  implementation(libs.kotlinxSerializationJson)
  implementation(libs.guice)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,3 +9,11 @@ include("api")
 include("common")
 include("wrapper")
 include("node")
+
+val commonModulesExclude = listOf("build", "src")
+
+File("common/").listFiles()
+ ?.filter { !commonModulesExclude.contains(it.name) && !it.isFile}
+ ?.forEach {
+ include(":${it.path.replace("/", ":")}")
+ }
diff --git a/wrapper/build.gradle.kts b/wrapper/build.gradle.kts
@@ -10,6 +10,7 @@ repositories {
 dependencies {
  implementation(project(":api"))
  implementation(project(":common"))
+ implementation(project(":common:cli"))
  implementation(project(":runner"))
  implementation(libs.kotlinxSerializationJson)
  implementation(libs.guice)