Fix build

waicool20 · Dec 4, 2023 · 807eecc · 807eecc
1 parent aaf3ea4
commit 807eecc
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 10 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/deps/CVAuto b/deps/CVAuto
diff --git a/modules/assets/build.gradle.kts b/modules/assets/build.gradle.kts
@@ -21,7 +21,7 @@ tasks {
     withType<AbstractArchiveTask>().configureEach {
         isPreserveFileTimestamps = false
         isReproducibleFileOrder = true
-        destinationDirectory.set(file("$buildDir/artifacts/"))
+        destinationDirectory.set(file("${layout.buildDirectory.asFile.get()}/artifacts/"))
         from(projectDir)
         into("assets")
 

diff --git a/modules/core/build.gradle.kts b/modules/core/build.gradle.kts
@@ -115,7 +115,7 @@ tasks {
         archiveFileName.set("${rootProject.name}-${project.name.capitalized()}.jar")
         archiveClassifier.set("")
         archiveVersion.set("")
-        destinationDirectory.set(file("${layout.buildDirectory}/artifacts/"))
+        destinationDirectory.set(file("${layout.buildDirectory.asFile.get()}/artifacts/"))
         manifest { attributes(mapOf("Main-Class" to "com.waicool20.wai2k.Wai2kKt")) }
         dependencies { include { it.moduleGroup.startsWith("com.waicool20") } }
     }
@@ -131,7 +131,7 @@ tasks {
 
 task<Zip>("packLibs") {
     archiveFileName.set("libs.zip")
-    destinationDirectory.set(file("${layout.buildDirectory}/artifacts/"))
+    destinationDirectory.set(file("${layout.buildDirectory.asFile.get()}/artifacts/"))
     from(project.configurations.filter { it.isCanBeResolved })
     exclude { f -> gradle.includedBuilds.any { b -> f.name.contains(b.name, true) } }
     into("libs")

diff --git a/modules/core/src/main/kotlin/com/waicool20/wai2k/game/Echelon.kt b/modules/core/src/main/kotlin/com/waicool20/wai2k/game/Echelon.kt
@@ -20,7 +20,6 @@
 package com.waicool20.wai2k.game
 
 import com.waicool20.cvauto.core.template.FT
-import com.waicool20.cvauto.core.template.FileTemplate
 import com.waicool20.wai2k.script.ScriptComponent
 import com.waicool20.wai2k.util.digitsOnly
 import com.waicool20.wai2k.util.loggerFor

diff --git a/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/FactoryModule.kt b/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/FactoryModule.kt
@@ -35,7 +35,6 @@ import com.waicool20.wai2k.util.useCharFilter
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.yield
-import java.awt.Color
 import java.awt.Point
 import kotlin.coroutines.coroutineContext
 import kotlin.random.Random

diff --git a/...les/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/HomographyMapRunner.kt b/...les/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/HomographyMapRunner.kt
@@ -46,7 +46,6 @@ import org.opencv.core.Core
 import org.opencv.core.Mat
 import org.opencv.core.MatOfPoint2f
 import org.opencv.core.Point
-import tornadofx.*
 import java.awt.Rectangle
 import kotlin.io.path.exists
 import kotlin.io.path.notExists

diff --git a/modules/launcher/build.gradle.kts b/modules/launcher/build.gradle.kts
@@ -52,7 +52,7 @@ tasks {
         archiveFileName.set("${rootProject.name}-${project.name.capitalized()}.jar")
         archiveClassifier.set("")
         archiveVersion.set("")
-        destinationDirectory.set(file("$${layout.buildDirectory}/artifacts/"))
+        destinationDirectory.set(file("$${layout.buildDirectory.asFile.get()}/artifacts/"))
         manifest { attributes(mapOf("Main-Class" to "com.waicool20.wai2k.launcher.Main")) }
     }
 }