Skip to content

Commit 2968d82

Browse files
Use general Exec task type
1 parent 2d0995d commit 2968d82

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

build.gradle

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import com.github.stickerifier.stickerify.JlinkJavaLauncher
22
import com.github.stickerifier.stickerify.JlinkTask
3-
import org.apache.tools.ant.taskdefs.condition.Os
43

54
plugins {
65
id('java')
@@ -85,20 +84,14 @@ jacocoTestReport {
8584
}
8685
}
8786

88-
def generateCohArchive = tasks.register('generateCohArchive', JavaExec) {
87+
def generateCohArchive = tasks.register('generateCohArchive', Exec) {
8988
inputs.dir(jlink.map { it.outputDirectory.get().asFile })
90-
def dir = Os.isFamily(Os.FAMILY_WINDOWS) ? 'bin' : 'lib'
91-
outputs.file(jlink.map { it.outputDirectory.file("$dir/server/classes_coh.jsa").get().asFile })
9289

93-
javaLauncher = providers.provider { new JlinkJavaLauncher(jlink.get()) }
94-
jvmArgs('-XX:+UseCompactObjectHeaders', '-Xshare:dump')
95-
mainClass = '' // needed to use JavaExec task
96-
}
97-
98-
jlink.configure {
99-
finalizedBy(generateCohArchive)
90+
def java = jlink.map { it.outputDirectory.file('jre/bin/java').get().asFile.absolutePath }
91+
doFirst { commandLine(java.get(), '-XX:+UseCompactObjectHeaders', '-Xshare:dump') }
10092
}
10193

94+
jlink.configure { finalizedBy(generateCohArchive) }
10295
test.mustRunAfter(generateCohArchive)
10396
installDist.mustRunAfter(generateCohArchive)
10497

0 commit comments

Comments
 (0)