Skip to content

Commit

Permalink
Gradle games finished (runs now from intellij-IDE again)
Browse files Browse the repository at this point in the history
  • Loading branch information
kreinhard committed Dec 7, 2024
1 parent bc9d583 commit fbc67b6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
9 changes: 9 additions & 0 deletions projectforge-application/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.projectforge.BuildPropertiesGenerator
import org.springframework.boot.gradle.tasks.bundling.BootJar
import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
id("org.springframework.boot") version "3.1.4"
Expand Down Expand Up @@ -211,6 +212,14 @@ dependencies {
implementation(libs.se.sawano.java.alphanumeric.comparator)
}

sourceSets {
named("main") {
resources {
srcDir(project(":projectforge-webapp").layout.buildDirectory.dir("resources/main"))
}
}
}

val kotlinCompilerDependencyFiles = kotlinCompilerDependency.map { it.name }
tasks.named<BootJar>("bootJar") {
dependsOn(":projectforge-webapp:webAppJar")
Expand Down
4 changes: 4 additions & 0 deletions projectforge-webapp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ tasks {
exclude("libs")
exclude("tmp")
}
// Include additional files (e.g., src/index.html)
from(layout.projectDirectory.file("src/index.html")) {
into("static") // Copy index.html to /static
}
dependsOn("copyReactBuild") // Ensure React build and copy are done first
}

Expand Down

0 comments on commit fbc67b6

Please sign in to comment.