Merge pull request #6 from benwoo1110/ben/fix-version

dumptruckman · web-flow · commit 80bc6024b384 · 2025-02-25T09:53:10.000-05:00
Fix version not applying to processResources
diff --git a/src/main/groovy/org.mvplugins.bukkit-plugin.gradle b/src/main/groovy/org.mvplugins.bukkit-plugin.gradle
@@ -3,6 +3,8 @@ plugins {
     id 'com.gradleup.shadow'
 }
 
+version = System.getenv('GITHUB_VERSION') ?: 'local'
+
 compileJava {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
diff --git a/src/main/groovy/org.mvplugins.multiverse-plugin.gradle b/src/main/groovy/org.mvplugins.multiverse-plugin.gradle
@@ -4,8 +4,6 @@ plugins {
     id 'org.mvplugins.multiverse-maven-publish'
 }
 
-version = System.getenv('GITHUB_VERSION') ?: 'local'
-
 repositories {
     mavenLocal()
     mavenCentral()

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ plugins {`
`3`	`3`	`id 'com.gradleup.shadow'`
`4`	`4`	`}`
`5`	`5`
	`6`	`+version = System.getenv('GITHUB_VERSION') ?: 'local'`
	`7`	`+`
`6`	`8`	`compileJava {`
`7`	`9`	`sourceCompatibility = JavaVersion.VERSION_17`
`8`	`10`	`targetCompatibility = JavaVersion.VERSION_17`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ plugins {`
`4`	`4`	`id 'org.mvplugins.multiverse-maven-publish'`
`5`	`5`	`}`
`6`	`6`
`7`		`-version = System.getenv('GITHUB_VERSION') ?: 'local'`
`8`		`-`
`9`	`7`	`repositories {`
`10`	`8`	`mavenLocal()`
`11`	`9`	`mavenCentral()`