fix(deps): Updated Blossom usage

4drian3d · Sep 14, 2023 · a661608 · a661608
1 parent 21a554e
commit a661608
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/ChatRegulatorBuild.yml b/.github/workflows/ChatRegulatorBuild.yml
@@ -26,7 +26,7 @@ jobs:
       with:
         timeout_minutes: 4
         max_attempts: 2
-        command: gradle build
+        command: ./gradlew build
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v3

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ miniplaceholders = "2.2.1"
 hexlogger = "1.0.2"
 bstats = "3.0.2"
 
-blossom = "1.3.1"
+blossom = "2.0.1"
 shadow = "8.1.1"
 runvelocity = "2.1.0"
 
@@ -36,4 +36,5 @@ futures = { group = "com.spotify", name = "completable-futures", version.ref = "
 
 blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
-runvelocity = { id = "xyz.jpenilla.run-velocity", version.ref = "runvelocity" }
+runvelocity = { id = "xyz.jpenilla.run-velocity", version.ref = "runvelocity" }
+idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     java
     alias(libs.plugins.blossom)
     alias(libs.plugins.shadow)
+    alias(libs.plugins.idea.ext)
 }
 
 java {
@@ -28,9 +29,14 @@ dependencies {
     testImplementation(libs.velocity)
 }
 
-blossom {
-    replaceTokenIn("src/main/java/io/github/_4drian3d/chatregulator/plugin/utils/Constants.java")
-    replaceToken("{version}", version)
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+            }
+        }
+    }
 }
 
 tasks {

diff --git a/...chatregulator/plugin/utils/Constants.java → ...3d/chatregulator/utils/Constants.java.peb b/...chatregulator/plugin/utils/Constants.java → ...3d/chatregulator/utils/Constants.java.peb
@@ -10,7 +10,7 @@ public final class Constants {
     /**
      * ChatRegulator Version
      */
-    public static final String VERSION = "{version}";
+    public static final String VERSION = "{{ version }}";
 
     private Constants() {}
 }
diff --git a/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/ChatRegulator.java b/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/ChatRegulator.java
@@ -44,6 +44,10 @@
                 @Dependency(
                         id = "unsignedvelocity",
                         optional = true
+                ),
+                @Dependency(
+                        id = "signedvelocity",
+                        optional = true
                 )
         }
 )