diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-11-26 01:12:33 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-12-09 00:07:38 +0100 |
commit | 5f8a34454a289ba4408d19bef5d5387c78ac36c2 (patch) | |
tree | 41dc5a121c822589cfba0db3caad99a53f006c2d /buildSrc/src | |
parent | refactor(frontend): simplify diagnostic tracking (diff) | |
download | refinery-5f8a34454a289ba4408d19bef5d5387c78ac36c2.tar.gz refinery-5f8a34454a289ba4408d19bef5d5387c78ac36c2.tar.zst refinery-5f8a34454a289ba4408d19bef5d5387c78ac36c2.zip |
refactor: be more conservative w/preview features
Also test with virtual threads in we are using them in production.
Diffstat (limited to 'buildSrc/src')
-rw-r--r-- | buildSrc/src/main/groovy/refinery-java-application.gradle | 4 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-java-conventions.gradle | 16 |
2 files changed, 4 insertions, 16 deletions
diff --git a/buildSrc/src/main/groovy/refinery-java-application.gradle b/buildSrc/src/main/groovy/refinery-java-application.gradle index 9abfc2b3..c38ccdb3 100644 --- a/buildSrc/src/main/groovy/refinery-java-application.gradle +++ b/buildSrc/src/main/groovy/refinery-java-application.gradle | |||
@@ -4,10 +4,6 @@ plugins { | |||
4 | id 'refinery-java-conventions' | 4 | id 'refinery-java-conventions' |
5 | } | 5 | } |
6 | 6 | ||
7 | application { | ||
8 | applicationDefaultJvmArgs += '--enable-preview' | ||
9 | } | ||
10 | |||
11 | for (taskName in ['distTar', 'distZip', 'shadowDistTar', 'shadowDistZip']) { | 7 | for (taskName in ['distTar', 'distZip', 'shadowDistTar', 'shadowDistZip']) { |
12 | tasks.named(taskName) { | 8 | tasks.named(taskName) { |
13 | enabled = false | 9 | enabled = false |
diff --git a/buildSrc/src/main/groovy/refinery-java-conventions.gradle b/buildSrc/src/main/groovy/refinery-java-conventions.gradle index 3e59353e..f25be620 100644 --- a/buildSrc/src/main/groovy/refinery-java-conventions.gradle +++ b/buildSrc/src/main/groovy/refinery-java-conventions.gradle | |||
@@ -26,6 +26,10 @@ java.toolchain { | |||
26 | languageVersion = JavaLanguageVersion.of(19) | 26 | languageVersion = JavaLanguageVersion.of(19) |
27 | } | 27 | } |
28 | 28 | ||
29 | tasks.withType(JavaCompile) { | ||
30 | options.release = 17 | ||
31 | } | ||
32 | |||
29 | def jacocoTestReport = tasks.named('jacocoTestReport') | 33 | def jacocoTestReport = tasks.named('jacocoTestReport') |
30 | jacocoTestReport.configure { | 34 | jacocoTestReport.configure { |
31 | dependsOn test | 35 | dependsOn test |
@@ -55,18 +59,6 @@ tasks.named('jar') { | |||
55 | } | 59 | } |
56 | } | 60 | } |
57 | 61 | ||
58 | tasks.withType(JavaCompile) { | ||
59 | options.compilerArgs += '--enable-preview' | ||
60 | } | ||
61 | |||
62 | tasks.withType(Test) { | ||
63 | jvmArgs += '--enable-preview' | ||
64 | } | ||
65 | |||
66 | tasks.withType(JavaExec) { | ||
67 | jvmArgs += '--enable-preview' | ||
68 | } | ||
69 | |||
70 | def generateEclipseSourceFolders = tasks.register('generateEclipseSourceFolders') | 62 | def generateEclipseSourceFolders = tasks.register('generateEclipseSourceFolders') |
71 | 63 | ||
72 | tasks.register('prepareEclipse') { | 64 | tasks.register('prepareEclipse') { |