From 8f215a24e85bb91d1310147e4460f421aed607fe Mon Sep 17 00:00:00 2001
From: Denis Lochmelis <dlochmelis@gmail.com>
Date: Sun, 14 Apr 2024 23:51:05 +0200
Subject: [PATCH] Cleanup build files

---
 build.gradle.kts                  |  2 ++
 cli/build.gradle.kts              |  1 -
 codegen/build.gradle.kts          | 18 +++---------------
 core/build.gradle.kts             | 15 +++------------
 jcstress-wrapper/build.gradle.kts | 22 +++++++++++-----------
 jcstress/pom.xml                  |  2 +-
 testsuite/build.gradle.kts        |  1 -
 7 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6a659e6..38ca55b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,6 +8,8 @@ repositories {
 }
 
 subprojects {
+    group = "org.jetbrains.litmuskt"
+    version = "1.0-SNAPSHOT"
     repositories {
         mavenCentral()
         gradlePluginPortal()
diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
index f30cbc3..74e957f 100644
--- a/cli/build.gradle.kts
+++ b/cli/build.gradle.kts
@@ -19,7 +19,6 @@ kotlin {
     }
     jvm {
         withJava()
-        jvmToolchain(8)
     }
 
     sourceSets {
diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts
index f9266a7..2fff865 100644
--- a/codegen/build.gradle.kts
+++ b/codegen/build.gradle.kts
@@ -1,19 +1,7 @@
 plugins {
-    kotlin("multiplatform")
+    kotlin("jvm")
 }
 
-group = "org.jetbrains.litmuskt"
-version = "1.0-SNAPSHOT"
-
-kotlin {
-    jvm()
-    sourceSets {
-        jvmMain {
-            dependencies {
-                implementation("com.google.devtools.ksp:symbol-processing-api:1.9.10-1.0.13")
-            }
-            kotlin.srcDir("src/main/kotlin")
-            resources.srcDir("src/main/resources")
-        }
-    }
+dependencies {
+    implementation("com.google.devtools.ksp:symbol-processing-api:1.9.10-1.0.13")
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 58823fc..9986452 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -3,9 +3,6 @@ plugins {
     `java-library`
 }
 
-group = "org.jetbrains.litmuskt"
-version = "1.0-SNAPSHOT"
-
 kotlin {
     val nativeTargets = listOf(
         linuxX64(),
@@ -17,7 +14,7 @@ kotlin {
 
     jvm {
         withJava()
-        jvmToolchain(8)
+        jvmToolchain(17)
     }
 
     val hostOs = System.getProperty("os.name")
@@ -26,12 +23,12 @@ kotlin {
         target.apply {
             compilations.getByName("main") {
                 cinterops {
-                    val barrier by creating {
+                    create("barrier") {
                         defFile(project.file("src/nativeInterop/barrier.def"))
                         headers(project.file("src/nativeInterop/barrier.h"))
                     }
                     if (affinitySupported) {
-                        val affinity by creating {
+                        create("affinity") {
                             defFile(project.file("src/nativeInterop/kaffinity.def"))
                             compilerOpts.add("-D_GNU_SOURCE")
                         }
@@ -46,11 +43,5 @@ kotlin {
                 implementation(kotlin("test"))
             }
         }
-
-        jvmMain {
-            dependencies {
-                implementation(kotlin("reflect"))
-            }
-        }
     }
 }
diff --git a/jcstress-wrapper/build.gradle.kts b/jcstress-wrapper/build.gradle.kts
index 8b01aad..7875dc9 100644
--- a/jcstress-wrapper/build.gradle.kts
+++ b/jcstress-wrapper/build.gradle.kts
@@ -7,30 +7,30 @@ application {
     mainClass = "MainKt"
 }
 
-kotlin {
-    jvmToolchain(8)
-}
-
 dependencies {
     implementation(project(":core"))
     implementation(project(":testsuite"))
     implementation(kotlin("reflect"))
 }
 
-val jcsDir: File get() = File(System.getenv("JCS_DIR") ?: error("JCS_DIR envvar is not set"))
+val jcsDir = rootProject.layout.projectDirectory.dir("jcstress")
 
 tasks.register<Copy>("copyCoreToJCStress") {
     dependsOn(":core:jvmJar")
-    from(project(":core").layout.buildDirectory.file("libs/core-jvm-1.0-SNAPSHOT.jar"))
-    if (inputs.sourceFiles.isEmpty) throw BuildCancelledException("missing files to copy")
+    from(project(":core").layout.buildDirectory.file("libs/core-jvm-$version.jar"))
     rename { "litmusktJvm-1.0.jar" }
-    into(jcsDir.resolve("libs/org/jetbrains/litmuskt/litmusktJvm/1.0/"))
+    into(jcsDir.dir("libs/org/jetbrains/litmuskt/litmusktJvm/1.0/"))
+    doFirst {
+        if (inputs.sourceFiles.isEmpty) throw GradleException("missing files to copy")
+    }
 }
 
 tasks.register<Copy>("copyTestsuiteToJCStress") {
     dependsOn(":testsuite:jvmJar")
-    from(project(":testsuite").layout.buildDirectory.file("libs/testsuite-jvm.jar"))
-    if (inputs.sourceFiles.isEmpty) throw BuildCancelledException("missing files to copy")
+    from(project(":testsuite").layout.buildDirectory.file("libs/testsuite-jvm-$version.jar"))
     rename { "litmusktJvmTestsuite-1.0.jar" }
-    into(jcsDir.resolve("libs/org/jetbrains/litmuskt/litmusktJvmTestsuite/1.0/"))
+    into(jcsDir.dir("libs/org/jetbrains/litmuskt/litmusktJvmTestsuite/1.0/"))
+    doFirst {
+        if (inputs.sourceFiles.isEmpty) throw GradleException("missing files to copy")
+    }
 }
diff --git a/jcstress/pom.xml b/jcstress/pom.xml
index 316b3e8..bbc22ef 100644
--- a/jcstress/pom.xml
+++ b/jcstress/pom.xml
@@ -98,7 +98,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
         <!--
             Java source/target to use for compilation.
           -->
-        <javac.target>1.8</javac.target>
+        <javac.target>17</javac.target>
 
         <!--
             Name of the test Uber-JAR to generate.
diff --git a/testsuite/build.gradle.kts b/testsuite/build.gradle.kts
index 24e4b10..de081b9 100644
--- a/testsuite/build.gradle.kts
+++ b/testsuite/build.gradle.kts
@@ -12,7 +12,6 @@ kotlin {
     macosArm64()
     jvm {
         withJava()
-        jvmToolchain(8)
     }
 
     sourceSets {