Fixed version to 2.1.1. and fixed Gradle build file

TobiasDeBruijn · Oct 7, 2020 · fcbf43e · fcbf43e
1 parent e10e863
commit fcbf43e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,13 +25,22 @@ allprojects {
 
     }
 
+    print(pluginVersion)
+
+	//processResources {
+    //	from(sourceSets.main.resources.srcDirs) {
+    //		filesMatching('plugin.yml') {
+    //    		filter ReplaceTokens, tokens: [version: "2.1.1"]
+     //   	}
+	//	}
+    //}
+
 	processResources {
-    	from(sourceSets.main.resources.srcDirs) {
-    		filesMatching('plugin.yml') {
-        		filter ReplaceTokens, tokens: [version: pluginVersion]
-        	}
+    	from (sourceSets.main.resources) {
+     	   include 'plugin.yml'
+    	    filter(ReplaceTokens, tokens: ['version' : project.version])
 		}
-    }
+	}
 }
 
 dependencies {
@@ -61,4 +70,5 @@ task releaseJar(type: ShadowJar) {
 	from sourceSets.main.output
 	configurations = [project.configurations.runtime]
 	destinationDirectory = file("$rootDir/releases")
+
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-pluginVersion = 2.1
+pluginVersion = 2.1.1
 pluginGroup = nl.thedutchmc.harotorch
 pluginName = HaroTorch