refactor: project structure

Cubxity · Jul 27, 2021 · 416c124 · 416c124
1 parent e17244e
commit 416c124
Show file tree

Hide file tree

Showing 49 changed files with 24 additions and 25 deletions.
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -28,7 +28,4 @@ jobs:
           title: "Development Build"
           files: |
             api/build/libs/*.jar
-            bukkit/build/libs/*.jar
-            minestom/build/libs/*.jar
-            velocity/build/libs/*.jar
-            bungee/build/libs/*.jar
+            platforms/*/build/libs/*.jar
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,4 @@ jobs:
           prerelease: false
           files: |
             api/build/libs/*.jar
-            bukkit/build/libs/*.jar
-            minestom/build/libs/*.jar
-            velocity/build/libs/*.jar
-            bungee/build/libs/*.jar
+            platforms/*/build/libs/*.jar
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ $ ./gradlew shadowJar
 To build a specific subproject, you can prefix it with the subproject path. For example:
 
 ```bash
-$ ./gradlew :bukkit:shadowJar
+$ `./gradlew :unifiedmetrics-platform-bukkit:shadowJar`
 ```
 
 The output artifacts can be found in `subproject/build/libs`.

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -17,6 +17,6 @@
 
 dependencies {
     api(project(":unifiedmetrics-common"))
-    implementation(project(":unifiedmetrics-influx-driver"))
-    implementation(project(":unifiedmetrics-prometheus-driver"))
+    implementation(project(":unifiedmetrics-driver-influx"))
+    implementation(project(":unifiedmetrics-driver-prometheus"))
 }
diff --git a/bukkit/build.gradle.kts → platforms/bukkit/build.gradle.kts b/bukkit/build.gradle.kts → platforms/bukkit/build.gradle.kts
diff --git a/...lugins/metrics/bukkit/BukkitDispatcher.kt → ...lugins/metrics/bukkit/BukkitDispatcher.kt b/...lugins/metrics/bukkit/BukkitDispatcher.kt → ...lugins/metrics/bukkit/BukkitDispatcher.kt
diff --git a/...rics/bukkit/UnifiedMetricsBukkitPlugin.kt → ...rics/bukkit/UnifiedMetricsBukkitPlugin.kt b/...rics/bukkit/UnifiedMetricsBukkitPlugin.kt → ...rics/bukkit/UnifiedMetricsBukkitPlugin.kt
diff --git a/...ootstrap/UnifiedMetricsBukkitBootstrap.kt → ...ootstrap/UnifiedMetricsBukkitBootstrap.kt b/...ootstrap/UnifiedMetricsBukkitBootstrap.kt → ...ootstrap/UnifiedMetricsBukkitBootstrap.kt
diff --git a/.../bukkit/metric/events/EventsCollection.kt → .../bukkit/metric/events/EventsCollection.kt b/.../bukkit/metric/events/EventsCollection.kt → .../bukkit/metric/events/EventsCollection.kt
diff --git a/.../bukkit/metric/server/ServerCollection.kt → .../bukkit/metric/server/ServerCollection.kt b/.../bukkit/metric/server/ServerCollection.kt → .../bukkit/metric/server/ServerCollection.kt
diff --git a/...s/bukkit/metric/server/ServerCollector.kt → ...s/bukkit/metric/server/ServerCollector.kt b/...s/bukkit/metric/server/ServerCollector.kt → ...s/bukkit/metric/server/ServerCollector.kt
diff --git a/.../bukkit/metric/tick/BukkitTickReporter.kt → .../bukkit/metric/tick/BukkitTickReporter.kt b/.../bukkit/metric/tick/BukkitTickReporter.kt → .../bukkit/metric/tick/BukkitTickReporter.kt
diff --git a/...s/bukkit/metric/tick/PaperTickReporter.kt → ...s/bukkit/metric/tick/PaperTickReporter.kt b/...s/bukkit/metric/tick/PaperTickReporter.kt → ...s/bukkit/metric/tick/PaperTickReporter.kt
diff --git a/...rics/bukkit/metric/tick/TickCollection.kt → ...rics/bukkit/metric/tick/TickCollection.kt b/...rics/bukkit/metric/tick/TickCollection.kt → ...rics/bukkit/metric/tick/TickCollection.kt
diff --git a/...etrics/bukkit/metric/tick/TickReporter.kt → ...etrics/bukkit/metric/tick/TickReporter.kt b/...etrics/bukkit/metric/tick/TickReporter.kt → ...etrics/bukkit/metric/tick/TickReporter.kt
diff --git a/...kkit/metric/world/BukkitWorldCollector.kt → ...kkit/metric/world/BukkitWorldCollector.kt b/...kkit/metric/world/BukkitWorldCollector.kt → ...kkit/metric/world/BukkitWorldCollector.kt
diff --git a/...ukkit/metric/world/PaperWorldCollector.kt → ...ukkit/metric/world/PaperWorldCollector.kt b/...ukkit/metric/world/PaperWorldCollector.kt → ...ukkit/metric/world/PaperWorldCollector.kt
diff --git a/...cs/bukkit/metric/world/WorldCollection.kt → ...cs/bukkit/metric/world/WorldCollection.kt b/...cs/bukkit/metric/world/WorldCollection.kt → ...cs/bukkit/metric/world/WorldCollection.kt
diff --git a/...plugins/metrics/bukkit/util/ClassUtils.kt → ...plugins/metrics/bukkit/util/ClassUtils.kt b/...plugins/metrics/bukkit/util/ClassUtils.kt → ...plugins/metrics/bukkit/util/ClassUtils.kt
diff --git a/bukkit/src/main/resources/plugin.yml → ...orms/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml → ...orms/bukkit/src/main/resources/plugin.yml
diff --git a/bungee/build.gradle.kts → platforms/bungee/build.gradle.kts b/bungee/build.gradle.kts → platforms/bungee/build.gradle.kts
diff --git a/...rics/bungee/UnifiedMetricsBungeePlugin.kt → ...rics/bungee/UnifiedMetricsBungeePlugin.kt b/...rics/bungee/UnifiedMetricsBungeePlugin.kt → ...rics/bungee/UnifiedMetricsBungeePlugin.kt
diff --git a/...ootstrap/UnifiedMetricsBungeeBootstrap.kt → ...ootstrap/UnifiedMetricsBungeeBootstrap.kt b/...ootstrap/UnifiedMetricsBungeeBootstrap.kt → ...ootstrap/UnifiedMetricsBungeeBootstrap.kt
diff --git a/.../bungee/metric/events/EventsCollection.kt → .../bungee/metric/events/EventsCollection.kt b/.../bungee/metric/events/EventsCollection.kt → .../bungee/metric/events/EventsCollection.kt
diff --git a/.../bungee/metric/server/ServerCollection.kt → .../bungee/metric/server/ServerCollection.kt b/.../bungee/metric/server/ServerCollection.kt → .../bungee/metric/server/ServerCollection.kt
diff --git a/...s/bungee/metric/server/ServerCollector.kt → ...s/bungee/metric/server/ServerCollector.kt b/...s/bungee/metric/server/ServerCollector.kt → ...s/bungee/metric/server/ServerCollector.kt
diff --git a/bungee/src/main/resources/plugin.yml → ...orms/bungee/src/main/resources/plugin.yml b/bungee/src/main/resources/plugin.yml → ...orms/bungee/src/main/resources/plugin.yml
diff --git a/minestom/build.gradle.kts → platforms/minestom/build.gradle.kts b/minestom/build.gradle.kts → platforms/minestom/build.gradle.kts
@@ -38,8 +38,8 @@ tasks {
         dependencies {
             include(dependency(":unifiedmetrics-api"))
             include(dependency(":unifiedmetrics-common"))
-            include(dependency(":unifiedmetrics-influx-driver"))
-            include(dependency(":unifiedmetrics-prometheus-driver"))
+            include(dependency(":unifiedmetrics-driver-influx"))
+            include(dependency(":unifiedmetrics-driver-prometheus"))
             include(dependency(":unifiedmetrics-core"))
         }
     }

diff --git a/.../minestom/UnifiedMetricsMinestomPlugin.kt → .../minestom/UnifiedMetricsMinestomPlugin.kt b/.../minestom/UnifiedMetricsMinestomPlugin.kt → .../minestom/UnifiedMetricsMinestomPlugin.kt
diff --git a/...tstrap/UnifiedMetricsMinestomBootstrap.kt → ...tstrap/UnifiedMetricsMinestomBootstrap.kt b/...tstrap/UnifiedMetricsMinestomBootstrap.kt → ...tstrap/UnifiedMetricsMinestomBootstrap.kt
diff --git a/...tstrap/UnifiedMetricsMinestomExtension.kt → ...tstrap/UnifiedMetricsMinestomExtension.kt b/...tstrap/UnifiedMetricsMinestomExtension.kt → ...tstrap/UnifiedMetricsMinestomExtension.kt
diff --git a/...ns/metrics/minestom/logger/Slf4jLogger.kt → ...ns/metrics/minestom/logger/Slf4jLogger.kt b/...ns/metrics/minestom/logger/Slf4jLogger.kt → ...ns/metrics/minestom/logger/Slf4jLogger.kt
diff --git a/...inestom/metric/events/EventsCollection.kt → ...inestom/metric/events/EventsCollection.kt b/...inestom/metric/events/EventsCollection.kt → ...inestom/metric/events/EventsCollection.kt
diff --git a/...inestom/metric/server/ServerCollection.kt → ...inestom/metric/server/ServerCollection.kt b/...inestom/metric/server/ServerCollection.kt → ...inestom/metric/server/ServerCollection.kt
diff --git a/...minestom/metric/server/ServerCollector.kt → ...minestom/metric/server/ServerCollector.kt b/...minestom/metric/server/ServerCollector.kt → ...minestom/metric/server/ServerCollector.kt
diff --git a/...cs/minestom/metric/tick/TickCollection.kt → ...cs/minestom/metric/tick/TickCollection.kt b/...cs/minestom/metric/tick/TickCollection.kt → ...cs/minestom/metric/tick/TickCollection.kt
diff --git a/.../minestom/metric/world/WorldCollection.kt → .../minestom/metric/world/WorldCollection.kt b/.../minestom/metric/world/WorldCollection.kt → .../minestom/metric/world/WorldCollection.kt
diff --git a/...s/minestom/metric/world/WorldCollector.kt → ...s/minestom/metric/world/WorldCollector.kt b/...s/minestom/metric/world/WorldCollector.kt → ...s/minestom/metric/world/WorldCollector.kt
diff --git a/minestom/src/main/resources/extension.json → ...inestom/src/main/resources/extension.json b/minestom/src/main/resources/extension.json → ...inestom/src/main/resources/extension.json
diff --git a/...inestom/UnifiedMetricsMinestomLauncher.kt → ...inestom/UnifiedMetricsMinestomLauncher.kt b/...inestom/UnifiedMetricsMinestomLauncher.kt → ...inestom/UnifiedMetricsMinestomLauncher.kt
diff --git a/.../minestom/UnifiedMetricsMinestomServer.kt → .../minestom/UnifiedMetricsMinestomServer.kt b/.../minestom/UnifiedMetricsMinestomServer.kt → .../minestom/UnifiedMetricsMinestomServer.kt
diff --git a/velocity/build.gradle.kts → platforms/velocity/build.gradle.kts b/velocity/build.gradle.kts → platforms/velocity/build.gradle.kts
diff --git a/.../velocity/UnifiedMetricsVelocityPlugin.kt → .../velocity/UnifiedMetricsVelocityPlugin.kt b/.../velocity/UnifiedMetricsVelocityPlugin.kt → .../velocity/UnifiedMetricsVelocityPlugin.kt
diff --git a/...tstrap/UnifiedMetricsVelocityBootstrap.kt → ...tstrap/UnifiedMetricsVelocityBootstrap.kt b/...tstrap/UnifiedMetricsVelocityBootstrap.kt → ...tstrap/UnifiedMetricsVelocityBootstrap.kt
diff --git a/...ns/metrics/velocity/logger/Slf4jLogger.kt → ...ns/metrics/velocity/logger/Slf4jLogger.kt b/...ns/metrics/velocity/logger/Slf4jLogger.kt → ...ns/metrics/velocity/logger/Slf4jLogger.kt
diff --git a/...elocity/metric/events/EventsCollection.kt → ...elocity/metric/events/EventsCollection.kt b/...elocity/metric/events/EventsCollection.kt → ...elocity/metric/events/EventsCollection.kt
diff --git a/...elocity/metric/server/ServerCollection.kt → ...elocity/metric/server/ServerCollection.kt b/...elocity/metric/server/ServerCollection.kt → ...elocity/metric/server/ServerCollection.kt
diff --git a/...velocity/metric/server/ServerCollector.kt → ...velocity/metric/server/ServerCollector.kt b/...velocity/metric/server/ServerCollector.kt → ...velocity/metric/server/ServerCollector.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,26 +18,31 @@
 rootProject.name = "UnifiedMetrics"
 
 val modulePrefix = ":unifiedmetrics-"
+val platformPrefix = "platform-"
+val driverPrefix = "driver-"
 
 include(modulePrefix + "api")
 include(modulePrefix + "common")
 include(modulePrefix + "core")
-include(modulePrefix + "bukkit")
-include(modulePrefix + "velocity")
-include(modulePrefix + "bungee")
-include(modulePrefix + "minestom")
 
-include(modulePrefix + "influx-driver")
-include(modulePrefix + "prometheus-driver")
+include(modulePrefix + platformPrefix + "bukkit")
+include(modulePrefix + platformPrefix + "minestom")
+include(modulePrefix + platformPrefix + "velocity")
+include(modulePrefix + platformPrefix + "bungee")
+
+include(modulePrefix + driverPrefix + "influx")
+include(modulePrefix + driverPrefix + "prometheus")
 
 project(modulePrefix + "api").projectDir = File(rootDir, "api")
 project(modulePrefix + "common").projectDir = File(rootDir, "common")
 project(modulePrefix + "core").projectDir = File(rootDir, "core")
-project(modulePrefix + "bukkit").projectDir = File(rootDir, "bukkit")
-project(modulePrefix + "velocity").projectDir = File(rootDir, "velocity")
-project(modulePrefix + "bungee").projectDir = File(rootDir, "bungee")
-project(modulePrefix + "minestom").projectDir = File(rootDir, "minestom")
+
+val platformsDir = File(rootDir, "platforms")
+project(modulePrefix + platformPrefix + "bukkit").projectDir = File(platformsDir, "bukkit")
+project(modulePrefix + platformPrefix + "minestom").projectDir = File(platformsDir, "minestom")
+project(modulePrefix + platformPrefix + "velocity").projectDir = File(platformsDir, "velocity")
+project(modulePrefix + platformPrefix + "bungee").projectDir = File(platformsDir, "bungee")
 
 val driversDir = File(rootDir, "drivers")
-project(modulePrefix + "influx-driver").projectDir = File(driversDir, "influx")
-project(modulePrefix + "prometheus-driver").projectDir = File(driversDir, "prometheus")
+project(modulePrefix + driverPrefix + "influx").projectDir = File(driversDir, "influx")
+project(modulePrefix + driverPrefix + "prometheus").projectDir = File(driversDir, "prometheus")