Skip to content

Commit 0559404

Browse files
committed
added correct setting of VERSION string for armored output.
1 parent ac32a41 commit 0559404

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

pg/build.gradle

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ plugins {
44
}
55

66
sourceSets {
7+
main {
8+
java {
9+
srcDirs = ["$buildDir/generated-src"]
10+
}
11+
}
712
java9 {
813
java {
914
srcDirs = ['src/main/jdk1.9']
@@ -26,7 +31,16 @@ dependencies {
2631
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
2732
}
2833

34+
task generateSources(type: Copy) {
35+
from 'src/main/java'
36+
into "$buildDir/generated-src"
37+
filter { line -> line.replaceAll('@RELEASE_NAME@', "${version}") }
38+
}
39+
40+
compileJava.dependsOn generateSources
41+
2942
compileJava {
43+
3044
javaCompiler = javaToolchains.compilerFor {
3145
languageVersion = JavaLanguageVersion.of(17)
3246
}
@@ -36,6 +50,7 @@ compileJava {
3650

3751

3852
compileJava9Java {
53+
3954
javaCompiler = javaToolchains.compilerFor {
4055
languageVersion = JavaLanguageVersion.of(17)
4156
}
@@ -45,14 +60,17 @@ compileJava9Java {
4560
'--module-path', "${bc_prov}${File.pathSeparator}${bc_util}"
4661
]
4762

48-
options.sourcepath = files(['src/main/java', 'src/main/jdk1.9'])
63+
options.sourcepath = files(["$buildDir/generated-src", 'src/main/jdk1.9'])
4964
}
5065

5166

5267
jar.archiveBaseName = "bcpg-$vmrange"
5368

5469

70+
5571
task sourcesJar(type: Jar) {
72+
dependsOn generateSources
73+
5674
archiveBaseName = jar.archiveBaseName
5775
archiveClassifier = 'sources'
5876
from sourceSets.main.allSource

0 commit comments

Comments
 (0)