Skip to content

Commit 197c3e4

Browse files
committed
adjust Gradle scripts of test projects
1 parent fda9c7e commit 197c3e4

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

test-project-groovy/greeter.startscripts/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.gradle.util.GradleVersion
12
import org.javamodularity.moduleplugin.tasks.ModularJavaExec
23
import org.javamodularity.moduleplugin.tasks.ModularCreateStartScripts
34

@@ -16,7 +17,12 @@ modularity {
1617
}
1718

1819
application {
19-
mainClassName = 'greeter.startscripts/startscripts.MainDemo'
20+
if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) < 0) {
21+
mainClassName = 'greeter.startscripts/startscripts.MainDemo'
22+
} else {
23+
mainClass = 'startscripts.MainDemo'
24+
mainModule = 'greeter.startscripts'
25+
}
2026
applicationName = 'demo'
2127
applicationDefaultJvmArgs = ['-Xmx128m']
2228
}

test-project-kotlin/greeter.startscripts/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ modularity {
2121
}
2222

2323
application {
24-
mainClassName = "$moduleName/startscripts.MainDemoKt"
24+
mainClass.set("startscripts.MainDemoKt")
25+
mainModule.set(moduleName)
2526
applicationName = "demo"
2627
applicationDefaultJvmArgs = listOf("-Xmx128m")
2728
}

test-project/greeter.startscripts/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.gradle.util.GradleVersion
12
import org.javamodularity.moduleplugin.tasks.ModularJavaExec
23
import org.javamodularity.moduleplugin.tasks.ModularCreateStartScripts
34

@@ -16,7 +17,12 @@ modularity {
1617
}
1718

1819
application {
19-
mainClassName = 'greeter.startscripts/startscripts.MainDemo'
20+
if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) < 0) {
21+
mainClassName = 'greeter.startscripts/startscripts.MainDemo'
22+
} else {
23+
mainClass = 'startscripts.MainDemo'
24+
mainModule = 'greeter.startscripts'
25+
}
2026
applicationName = 'demo'
2127
applicationDefaultJvmArgs = ['-Xmx128m']
2228
}

0 commit comments

Comments
 (0)