feat: upgrade dependencies, improved build system

Cubxity · Jun 13, 2021 · efe13db · efe13db
1 parent 51554b0
commit efe13db
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 22 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -17,6 +17,6 @@
  */
 
 dependencies {
-    api(kotlin("stdlib-jdk8"))
-    api("com.uchuhimo", "konf-toml", "1.0.0")
+    api(kotlin("stdlib"))
+    api("com.uchuhimo", "konf-toml", "1.1.2")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,19 +16,19 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.31"
-    kotlin("kapt") version "1.4.31"
-    id("com.github.johnrengelman.shadow") version "6.1.0" apply false
+    kotlin("jvm") version "1.5.10" apply false
+    kotlin("kapt") version "1.5.10" apply false
+    id("com.github.johnrengelman.shadow") version "7.0.0" 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.2.1"
+    version = "0.3.0-SNAPSHOT"
 
     repositories {
         mavenCentral()
@@ -38,15 +38,10 @@ allprojects {
 subprojects {
     apply(plugin = "java")
     apply(plugin = "kotlin")
-    apply(plugin = "kotlin-kapt")
-    apply(plugin = "com.github.johnrengelman.shadow")
 
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             jvmTarget = "1.8"
         }
     }
-    tasks.withType<ShadowJar> {
-        archiveClassifier.set("")
-    }
 }
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -16,7 +16,9 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import org.apache.tools.ant.filters.ReplaceTokens
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
 
 repositories {
     maven("https://papermc.io/repo/repository/maven-public")
@@ -28,9 +30,15 @@ dependencies {
 }
 
 tasks {
+    shadowJar {
+        archiveClassifier.set("")
+    }
     processResources {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
         from("src/main/resources") {
-            filter(ReplaceTokens::class, "tokens" to mapOf("version" to version))
+            expand("version" to version)
+            include("plugin.yml")
         }
     }
-}
+}
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
@@ -3,5 +3,5 @@ main: dev.cubxity.plugins.metrics.bukkit.bootstrap.UnifiedMetricsBukkitBootstrap
 description: "Fully-featured metrics plugin for Minecraft servers"
 api-version: 1.16
 author: Cubxity
-version: @version@
+version: ${version}
 load: STARTUP
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -18,5 +18,4 @@
 
 dependencies {
     api(project(":unifiedmetrics-api"))
-    api("com.uchuhimo:konf-toml:1.0.0")
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -18,6 +18,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -16,6 +16,12 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+plugins {
+    kotlin("kapt")
+    id("com.github.johnrengelman.shadow")
+    id("net.kyori.blossom")
+}
+
 repositories {
     maven("https://nexus.velocitypowered.com/repository/maven-public/")
 }
@@ -29,6 +35,12 @@ dependencies {
 
 tasks {
     shadowJar {
+        archiveClassifier.set("")
         relocate("com.moandjiezana.toml", "dev.cubxity.plugins.metrics.lib.toml")
     }
-}
+}
+
+blossom {
+    replaceTokenIn("src/main/kotlin/dev/cubxity/plugins/metrics/velocity/bootstrap/UnifiedMetricsVelocityBootstrap.kt")
+    replaceToken("@version@", version)
+}
diff --git a/.../kotlin/dev/cubxity/plugins/metrics/velocity/bootstrap/UnifiedMetricsVelocityBootstrap.kt b/.../kotlin/dev/cubxity/plugins/metrics/velocity/bootstrap/UnifiedMetricsVelocityBootstrap.kt
@@ -33,8 +33,7 @@ import dev.cubxity.plugins.metrics.velocity.VelocitySchedulerAdapter
 import dev.cubxity.plugins.metrics.velocity.logger.Slf4jLogger
 import java.nio.file.Path
 
-// TODO: Automatically replace this at build
-private const val pluginVersion = "0.2.1"
+private const val pluginVersion = "@version@"
 
 @Plugin(
     id = "unifiedmetrics",