add copy script

.github/workflows/gradle.yaml

@@ -37,12 +37,6 @@ jobs:
       - run: mkdir ./gui/dist
         shell: bash
 
-      - if: matrix.os == 'windows-latest'
-        run: |
-          del .\server\android\src\main\resources\web-gui
-          mkdir server\android\src\main\resources\web-gui
-        shell: cmd
-
       - name: Check code formatting
         run: ./gradlew spotlessCheck
 

gradle.properties

@@ -13,7 +13,7 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 org.gradle.unsafe.configuration-cache=false
 
-kotlinVersion=1.8.21
+kotlinVersion=1.9.0-RC
 spotlessVersion=6.12.0
 shadowJarVersion=8.1.1
 buildconfigVersion=3.1.0

server/android/.gitignore

@@ -1 +1,2 @@
 /build
+/src/main/resources/web-gui

server/android/build.gradle.kts

@@ -26,6 +26,18 @@ java {
 		languageVersion.set(JavaLanguageVersion.of(17))
 	}
 }
+
+tasks.register<Copy>("copyGuiAssets") {
+	from(rootProject.layout.projectDirectory.dir("gui/dist"))
+	into(layout.projectDirectory.dir("src/main/resources/web-gui"))
+	if (inputs.sourceFiles.isEmpty) {
+		throw GradleException("You need to run \"npm run build\" on the gui folder first!")
+	}
+}
+tasks.preBuild {
+	dependsOn(":server:android:copyGuiAssets")
+}
+
 tasks.withType<KotlinCompile> {
 	kotlinOptions.jvmTarget = "17"
 }
@@ -41,16 +53,6 @@ tasks.withType<Javadoc> {
 	options.encoding = "UTF-8"
 }
 
-tasks
-	.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask<*>>()
-	.configureEach {
-		compilerOptions
-			.languageVersion
-			.set(
-				org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
-			)
-	}
-
 allprojects {
 	repositories {
 		google()

server/android/src/main/resources/web-gui

@@ -1 +0,0 @@
-../../../../../gui/dist/

server/core/build.gradle.kts

@@ -40,16 +40,6 @@ tasks.withType<Javadoc> {
 	options.encoding = "UTF-8"
 }
 
-tasks
-	.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask<*>>()
-	.configureEach {
-		compilerOptions
-			.languageVersion
-			.set(
-				org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
-			)
-	}
-
 allprojects {
 	repositories {
 		// Use jcenter for resolving dependencies.

server/desktop/build.gradle.kts

@@ -41,16 +41,6 @@ tasks.withType<Javadoc> {
 	options.encoding = "UTF-8"
 }
 
-tasks
-	.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask<*>>()
-	.configureEach {
-		compilerOptions
-			.languageVersion
-			.set(
-				org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
-			)
-	}
-
 allprojects {
 	repositories {
 		// Use jcenter for resolving dependencies.