From 5f8a34454a289ba4408d19bef5d5387c78ac36c2 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Sat, 26 Nov 2022 01:12:33 +0100
Subject: refactor: be more conservative w/preview features

Also test with virtual threads in we are using them in production.
---
 .../src/main/groovy/refinery-java-application.gradle     |  4 ----
 .../src/main/groovy/refinery-java-conventions.gradle     | 16 ++++------------
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'buildSrc/src')

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 {
 	id 'refinery-java-conventions'
 }
 
-application {
-	applicationDefaultJvmArgs += '--enable-preview'
-}
-
 for (taskName in ['distTar', 'distZip', 'shadowDistTar', 'shadowDistZip']) {
 	tasks.named(taskName) {
 		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 {
 	languageVersion = JavaLanguageVersion.of(19)
 }
 
+tasks.withType(JavaCompile) {
+	options.release = 17
+}
+
 def jacocoTestReport = tasks.named('jacocoTestReport')
 jacocoTestReport.configure {
 	dependsOn test
@@ -55,18 +59,6 @@ tasks.named('jar') {
 	}
 }
 
-tasks.withType(JavaCompile) {
-	options.compilerArgs += '--enable-preview'
-}
-
-tasks.withType(Test) {
-	jvmArgs += '--enable-preview'
-}
-
-tasks.withType(JavaExec) {
-	jvmArgs += '--enable-preview'
-}
-
 def generateEclipseSourceFolders = tasks.register('generateEclipseSourceFolders')
 
 tasks.register('prepareEclipse') {
-- 
cgit v1.2.3-70-g09d2