From 733b0179368f304e5fa9c20b7f8bc46b5caa1da4 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 20 May 2021 19:51:32 +0430 Subject: [PATCH] fix webUI not being copied --- server/build.gradle.kts | 2 +- webUI/build.gradle.kts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 35d9605..6b9bce2 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -22,7 +22,7 @@ repositories { dependencies { // okhttp - val okhttpVersion = "4.9.1" // version is locked by extensions + val okhttpVersion = "4.9.1" // version is locked by Tachiyomi extensions implementation("com.squareup.okhttp3:okhttp:$okhttpVersion") implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion") implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion") diff --git a/webUI/build.gradle.kts b/webUI/build.gradle.kts index 286c891..3a3897d 100644 --- a/webUI/build.gradle.kts +++ b/webUI/build.gradle.kts @@ -2,13 +2,14 @@ plugins { id("com.github.node-gradle.node") version "3.0.1" } +val nodeRoot = "${project.projectDir}/react" node { - nodeProjectDir.set(file("${project.projectDir}/react/")) + nodeProjectDir.set(file(nodeRoot)) } tasks { register("copyBuild") { - from(file("${node.nodeProjectDir}/build")) + from(file("$nodeRoot/build")) into(file("$rootDir/server/src/main/resources/react")) dependsOn("yarn_build")