Merge pull request #133 from hakanai/mainclassname-fix

siordache · web-flow · commit 3e07c603a8b4 · 2022-12-25T11:17:22.000+01:00
Removes usage of mainClassName if running Gradle 7 or later.
diff --git a/src/main/groovy/org/beryx/runtime/RuntimeTask.groovy b/src/main/groovy/org/beryx/runtime/RuntimeTask.groovy
@@ -98,7 +98,7 @@ class RuntimeTask extends BaseTask {
             }
             // workaround for shadow bug https://github.com/johnrengelman/shadow/issues/572
             if(GradleVersion.current() >= GradleVersion.version('6.4')) {
-                if(!startScriptTask.mainClass.present) {
+                if(!startScriptTask.mainClass.present && GradleVersion.current() < GradleVersion.version('7.0')) {
                     startScriptTask.mainClass.set(startScriptTask.mainClassName)
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class RuntimeTask extends BaseTask {`
`98`	`98`	`}`
`99`	`99`	`// workaround for shadow bug https://github.com/johnrengelman/shadow/issues/572`
`100`	`100`	`if(GradleVersion.current() >= GradleVersion.version('6.4')) {`
`101`		`- if(!startScriptTask.mainClass.present) {`
	`101`	`+ if(!startScriptTask.mainClass.present && GradleVersion.current() < GradleVersion.version('7.0')) {`
`102`	`102`	`startScriptTask.mainClass.set(startScriptTask.mainClassName)`
`103`	`103`	`}`
`104`	`104`	`}`