diff --git a/Dockerfile b/Dockerfile index cec5254..535e812 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN chown -R $APPLICATION_USER /app USER $APPLICATION_USER COPY --from=jdkbuilder /myjdk /myjdk -COPY simplenotes-app/build/libs/app-*-all.jar /app/simplenotes.jar +COPY simplenotes-app/build/libs/simplenotes-app-with-dependencies*.jar /app/simplenotes.jar WORKDIR /app CMD [ \ diff --git a/build.gradle.properties b/build.gradle.properties index 1608900..aec0a55 100644 --- a/build.gradle.properties +++ b/build.gradle.properties @@ -1 +1,2 @@ org.gradle.caching=true +org.gradle.parallel=true diff --git a/buildSrc/src/main/kotlin/be/simplenotes/app-shadow.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/app-shadow.gradle.kts index 04b2f19..f9466cf 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/app-shadow.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/app-shadow.gradle.kts @@ -8,20 +8,11 @@ plugins { tasks.withType { - archiveBaseName.set("app") + archiveAppendix.set("with-dependencies") manifest.attributes["Main-Class"] = "be.simplenotes.app.SimpleNotesKt" mergeServiceFiles() - // minimize() - - // include("org.mariadb.jdbc:mariadb-java-client") - // include("com.h2database:h2") - // include("org.jetbrains.kotlin:kotlin-reflect") - // include("org.eclipse.jetty:*") - // include("org.apache.lucene:*") - // include("org.ocpsoft.prettytime:prettytime") - File(rootProject.projectDir, "buildSrc/src/main/resources/exclusions") .listFiles()!! .flatMap { @@ -36,7 +27,7 @@ tasks.withType { } tasks.create("package") { - rootProject.subprojects.forEach { dependsOn(":${it.name}:test") } + tasks.getByName("build").dependsOn("package") dependsOn("shadowJar") dependsOn("css")