MainComponent in kotlin

[cavedroid.git] / desktop / build.gradle

diff --git a/desktop/build.gradle b/desktop/build.gradle
index 04317e4a995c6299132e0aa0225ce17e69d005de..f909ef108038f25ce939a04c8e745a2784fa193a 100644 (file)
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -8,12 +8,12 @@ java.targetCompatibility = JavaVersion.VERSION_17
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 sourceSets.main.java.srcDirs = ["src/"]
-sourceSets.main.resources.srcDirs = ["../android/assets"]
+sourceSets.main.resources.srcDirs = ["assets/"]
 
 project.ext.mainClassName = "ru.deadsoftware.cavedroid.desktop.DesktopLauncher"
-project.ext.assetsDir = new File("../android/assets")
+project.ext.assetsDir = new File("assets/")
 
-task run(dependsOn: classes, type: JavaExec) {
+task run(dependsOn: build, type: JavaExec) {
     main = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
@@ -22,7 +22,7 @@ task run(dependsOn: classes, type: JavaExec) {
     args "--debug"
 }
 
-task runTouch(dependsOn: classes, type: JavaExec) {
+task runTouch(dependsOn: build, type: JavaExec) {
     main = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
@@ -31,28 +31,17 @@ task runTouch(dependsOn: classes, type: JavaExec) {
     args "--touch", "--debug"
 }
 
-task debug(dependsOn: classes, type: JavaExec) {
-    main = project.mainClassName
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = project.assetsDir
-    ignoreExitValue = true as JavaExecSpec
-    debug = true
-}
-
-task dist(type: Jar) {
+task dist(dependsOn: build, type: Jar) {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes 'Main-Class': project.mainClassName
     }
     from {
-        configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
     with jar
 }
 
-dist.dependsOn classes
-
 dependencies {
     implementation project(":core")
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion"