fix: Updated Blossom usage

MiniPlaceholders · Dec 12, 2023 · f9962ec · f9962ec
1 parent bb5a0de
commit f9962ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,10 +2,10 @@ metadata.format.version = "1.1"
 
 [versions]
 
-velocity = "3.2.0-SNAPSHOT"
-paper = "1.19.3-R0.1-SNAPSHOT"
+velocity = "3.3.0-SNAPSHOT"
+paper = "1.20.2-R0.1-SNAPSHOT"
 
-blossom = "1.3.1"
+blossom = "2.1.0"
 shadow = "8.1.1"
 runtask = "2.2.0"
 
@@ -27,3 +27,4 @@ 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 = "runtask" }
 runpaper = { id = "xyz.jpenilla.run-velocity", version.ref = "runtask" }
+idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    alias(libs.plugins.idea.ext)
     alias(libs.plugins.blossom)
 }
 
@@ -9,7 +10,12 @@ dependencies {
     implementation(projects.exampleExpansionCommon)
 }
 
-blossom {
-    replaceTokenIn("src/main/java/io/github/miniplaceholders/expansion/example/velocity/Constants.java")
-    replaceToken("{version}", project.version)
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+            }
+        }
+    }
 }
diff --git a/...expansion/example/velocity/Constants.java → ...nsion/example/velocity/Constants.java.peb b/...expansion/example/velocity/Constants.java → ...nsion/example/velocity/Constants.java.peb
@@ -1,5 +1,5 @@
 package io.github.miniplaceholders.expansion.example.velocity;
 
 public class Constants {
-    public static final String VERSION = "{version}";
+    public static final String VERSION = "{{version}}";
 }