Merge branch 'dev/0.3.x'

Cubxity · Apr 19, 2022 · 4a6e0d0 · 4a6e0d0
2 parents 633e634 + 143ea92
commit 4a6e0d0
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -81,13 +81,6 @@ and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
       width="200"
     />
   </a>
-  <a href="https://octanemc.net">
-    <img
-      src="https://octanemc.net/assets/images/logo-large.png"
-      alt="OctaneMC"
-      width="200"
-    />
-  </a>
 </p>
 
 > **Pssst!** You can add your server here by submitting a *Pull Request*!
@@ -168,4 +161,4 @@ import dev.cubxity.plugins.metrics.api.UnifiedMetricsProvider
 val api = UnifiedMetricsProvider.get()
 ```
 
-</details>
+</details>
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 dependencies {
+    api(platform(kotlin("bom")))
     api(kotlin("stdlib"))
     api("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.6.0")
     api("org.jetbrains.kotlinx", "kotlinx-serialization-core", "1.3.2")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,17 +18,17 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.6.10" apply false
-    kotlin("kapt") version "1.6.10" apply false
-    kotlin("plugin.serialization") version "1.6.10" apply false
+    kotlin("jvm") version "1.6.20" apply false
+    kotlin("kapt") version "1.6.20" apply false
+    kotlin("plugin.serialization") version "1.6.20" apply false
     id("com.github.johnrengelman.shadow") version "7.1.2" apply false
     id("net.kyori.blossom") version "1.3.0" apply false
 }
 
 allprojects {
     group = "dev.cubxity.plugins"
     description = "Fully featured metrics collector agent for Minecraft servers."
-    version = "0.3.5"
+    version = "0.3.6"
 
     repositories {
         mavenCentral()

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -19,5 +19,5 @@ apply(plugin = "kotlinx-serialization")
 
 dependencies {
     api(project(":unifiedmetrics-api"))
-    implementation("com.charleskorn.kaml", "kaml", "0.40.0")
+    implementation("com.charleskorn.kaml", "kaml", "0.43.0")
 }
diff --git a/drivers/influx/build.gradle.kts b/drivers/influx/build.gradle.kts
@@ -19,5 +19,5 @@ apply(plugin = "kotlinx-serialization")
 
 dependencies {
     compileOnly(project(":unifiedmetrics-api"))
-    api("com.influxdb", "influxdb-client-java", "4.2.0")
+    api("com.influxdb", "influxdb-client-java", "5.0.0")
 }
diff --git a/drivers/prometheus/build.gradle.kts b/drivers/prometheus/build.gradle.kts
@@ -19,6 +19,6 @@ apply(plugin = "kotlinx-serialization")
 
 dependencies {
     compileOnly(project(":unifiedmetrics-api"))
-    api("io.prometheus", "simpleclient_httpserver", "0.14.1")
-    api("io.prometheus", "simpleclient_pushgateway", "0.14.1")
+    api("io.prometheus", "simpleclient_httpserver", "0.15.0")
+    api("io.prometheus", "simpleclient_pushgateway", "0.15.0")
 }
diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts
@@ -31,6 +31,12 @@ dependencies {
 tasks {
     shadowJar {
         archiveClassifier.set("")
+        relocate("retrofit2", "dev.cubxity.plugins.metrics.libs.retrofit2")
+        relocate("com.charleskorn", "dev.cubxity.plugins.metrics.libs.com.charleskorn")
+        relocate("com.influxdb", "dev.cubxity.plugins.metrics.libs.com.influxdb")
+        relocate("okhttp", "dev.cubxity.plugins.metrics.libs.okhttp")
+        relocate("okio", "dev.cubxity.plugins.metrics.libs.okio")
+        relocate("io.prometheus", "dev.cubxity.plugins.metrics.libs.io.prometheus")
     }
     processResources {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE

diff --git a/platforms/bungee/build.gradle.kts b/platforms/bungee/build.gradle.kts
@@ -32,6 +32,12 @@ dependencies {
 tasks {
     shadowJar {
         archiveClassifier.set("")
+        relocate("retrofit2", "dev.cubxity.plugins.metrics.libs.retrofit2")
+        relocate("com.charleskorn", "dev.cubxity.plugins.metrics.libs.com.charleskorn")
+        relocate("com.influxdb", "dev.cubxity.plugins.metrics.libs.com.influxdb")
+        relocate("okhttp", "dev.cubxity.plugins.metrics.libs.okhttp")
+        relocate("okio", "dev.cubxity.plugins.metrics.libs.okio")
+        relocate("io.prometheus", "dev.cubxity.plugins.metrics.libs.io.prometheus")
     }
     processResources {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE

diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts
@@ -33,14 +33,14 @@ dependencies {
 
     include(project(":unifiedmetrics-core"))
     include(project(":unifiedmetrics-common"))
-    include("com.charleskorn.kaml:kaml:0.40.0")
-    include("com.charleskorn.kaml:kaml-jvm:0.40.0")
+    include("com.charleskorn.kaml:kaml:0.43.0")
+    include("com.charleskorn.kaml:kaml-jvm:0.43.0")
     include("org.snakeyaml:snakeyaml-engine:2.3")
     include(project(":unifiedmetrics-api"))
     include(project(":unifiedmetrics-driver-influx"))
-    include("com.influxdb:influxdb-client-java:4.1.0")
-    include("com.influxdb:influxdb-client-core:4.1.0")
-    include("com.influxdb:influxdb-client-utils:4.1.0")
+    include("com.influxdb:influxdb-client-java:5.0.0")
+    include("com.influxdb:influxdb-client-core:5.0.0")
+    include("com.influxdb:influxdb-client-utils:5.0.0")
     include("com.google.code.findbugs:jsr305:3.0.2")
     include("com.squareup.retrofit2:retrofit:2.9.0")
     include("com.squareup.okhttp3:okhttp:4.7.2")
@@ -54,13 +54,13 @@ dependencies {
     include("com.squareup.retrofit2:converter-scalars:2.9.0")
     include("com.squareup.retrofit2:converter-gson:2.9.0")
     include(project(":unifiedmetrics-driver-prometheus"))
-    include("io.prometheus:simpleclient_httpserver:0.14.1")
+    include("io.prometheus:simpleclient_httpserver:0.15.0")
     include("io.prometheus:simpleclient:0.14.1")
-    include("io.prometheus:simpleclient_tracer_otel:0.14.1")
-    include("io.prometheus:simpleclient_tracer_common:0.14.1")
-    include("io.prometheus:simpleclient_tracer_otel_agent:0.14.1")
-    include("io.prometheus:simpleclient_common:0.14.1")
-    include("io.prometheus:simpleclient_pushgateway:0.14.1")
+    include("io.prometheus:simpleclient_tracer_otel:0.15.0")
+    include("io.prometheus:simpleclient_tracer_common:0.15.0")
+    include("io.prometheus:simpleclient_tracer_otel_agent:0.15.0")
+    include("io.prometheus:simpleclient_common:0.15.0")
+    include("io.prometheus:simpleclient_pushgateway:0.15.0")
 }
 
 loom {

diff --git a/platforms/minestom/build.gradle.kts b/platforms/minestom/build.gradle.kts
@@ -38,6 +38,12 @@ java {
 tasks {
     shadowJar {
         archiveClassifier.set("")
+        relocate("retrofit2", "dev.cubxity.plugins.metrics.libs.retrofit2")
+        relocate("com.charleskorn", "dev.cubxity.plugins.metrics.libs.com.charleskorn")
+        relocate("com.influxdb", "dev.cubxity.plugins.metrics.libs.com.influxdb")
+        relocate("okhttp", "dev.cubxity.plugins.metrics.libs.okhttp")
+        relocate("okio", "dev.cubxity.plugins.metrics.libs.okio")
+        relocate("io.prometheus", "dev.cubxity.plugins.metrics.libs.io.prometheus")
     }
     compileKotlin {
         kotlinOptions {

diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts
@@ -28,13 +28,19 @@ repositories {
 dependencies {
     api(project(":unifiedmetrics-core"))
 
-    compileOnly("com.velocitypowered:velocity-api:3.0.1")
-    kapt("com.velocitypowered:velocity-api:3.0.1")
+    compileOnly("com.velocitypowered:velocity-api:3.1.0")
+    kapt("com.velocitypowered:velocity-api:3.1.0")
 }
 
 tasks {
     shadowJar {
         archiveClassifier.set("")
+        relocate("retrofit2", "dev.cubxity.plugins.metrics.libs.retrofit2")
+        relocate("com.charleskorn", "dev.cubxity.plugins.metrics.libs.com.charleskorn")
+        relocate("com.influxdb", "dev.cubxity.plugins.metrics.libs.com.influxdb")
+        relocate("okhttp", "dev.cubxity.plugins.metrics.libs.okhttp")
+        relocate("okio", "dev.cubxity.plugins.metrics.libs.okio")
+        relocate("io.prometheus", "dev.cubxity.plugins.metrics.libs.io.prometheus")
     }
 }