Skip to content
Snippets Groups Projects
Commit 8f0586b0 authored by Otto Visser's avatar Otto Visser
Browse files

Merge branch 'update-sass-compiler' into 'development'

Change sass compiler

See merge request !268
parents 1bc66a29 78432c72
Branches development
No related tags found
1 merge request!268Change sass compiler
...@@ -60,8 +60,7 @@ plugins { ...@@ -60,8 +60,7 @@ plugins {
id("com.diffplug.gradle.spotless").version("3.27.2") id("com.diffplug.gradle.spotless").version("3.27.2")
// Sass stylesheet plugins // Sass stylesheet plugins
id("com.github.salomonbrys.gradle.sass").version("1.2.0") id("com.unclezs.gradle.sass").version("1.0.10")
} }
sourceSets { sourceSets {
...@@ -141,24 +140,22 @@ springBoot { ...@@ -141,24 +140,22 @@ springBoot {
} }
sass { sass {
download { cssPath = "static/css"
version = "1.26.3" sassPath = "scss"
downloadBaseUrl = "https://github.com/sass/dart-sass/releases/download" }
}
} //sassCompile {
// outputDir = file("$rootDir/public/css")
sassCompile { // style = com.github.salomonbrys.gradle.sass.SassTask.Style.COMPRESSED
outputDir = file("$rootDir/public/css") //
style = com.github.salomonbrys.gradle.sass.SassTask.Style.COMPRESSED // exclude {
// !it.path.endsWith(".scss")
exclude { // }
!it.path.endsWith(".scss") //}
} //
} //tasks.named("sassCompile") {
// dependsOn("copyBootstrap")
tasks.named("sassCompile") { //}
dependsOn("copyBootstrap")
}
/////// TASKS /////// /////// TASKS ///////
val jacocoTestReport by tasks.getting(JacocoReport::class) { val jacocoTestReport by tasks.getting(JacocoReport::class) {
...@@ -269,12 +266,10 @@ tasks.withType<Test>().configureEach { ...@@ -269,12 +266,10 @@ tasks.withType<Test>().configureEach {
} }
tasks.named("processResources") { tasks.named("processResources") {
dependsOn("sassCompile")
dependsOn("copyLogo") dependsOn("copyLogo")
} }
tasks.withType<org.springframework.boot.gradle.tasks.bundling.BootJar>().configureEach { tasks.withType<org.springframework.boot.gradle.tasks.bundling.BootJar>().configureEach {
dependsOn("sassCompile")
dependsOn("copyLogo") dependsOn("copyLogo")
bootInf { bootInf {
into("classes/static/css") { into("classes/static/css") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment