Skip to content

Commit 792fdfa

Browse files
authored
Merge pull request #9 from mfl28/feature/switch-to-sass-gradle-plugin
Switch to sass-gradle-plugin.
2 parents 4577ca0 + fbfa0da commit 792fdfa

File tree

3 files changed

+11
-1098
lines changed

3 files changed

+11
-1098
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ docker container cp bbeditor:/artifacts .
133133
* [TestFX](https://github.com/TestFX/TestFX) (used for the tests)
134134
* [JUnit 5](https://junit.org/junit5/) (used for the tests)
135135
* [Jacoco](https://www.jacoco.org/jacoco/) (used for creating code coverage results)
136-
* [LibSass Gradle Plugin](https://github.com/fgiannesini/LibSassGradlePlugin) (used to compile .scss style-files into [JavaFX supported] .css files)
136+
* [sass-gradle-plugin](https://github.com/EtienneMiret/sass-gradle-plugin) (used to compile .scss style-files into [JavaFX supported] .css files)
137137
* [Badass JLink Plugin](https://github.com/beryx/badass-jlink-plugin) (used to create modular runtime images of the application)
138138
* [Gradle Modules Plugin](https://github.com/java9-moduqlarity/gradle-modules-plugin) (used to run the tests on the classpath)
139139
* [Feather Icons](https://feathericons.com/)

build.gradle

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
* You should have received a copy of the GNU General Public License
1717
* along with Bounding Box Editor. If not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
buildscript {
20-
dependencies {
21-
classpath 'com.github.fgiannesini.libsass.gradle.plugin:libsass-gradle-plugin:+'
22-
}
23-
}
24-
2519
plugins {
2620
id 'application'
2721
id 'org.openjfx.javafxplugin' version '0.0.10'
@@ -32,10 +26,9 @@ plugins {
3226
id 'org.sonarqube' version '3.3'
3327
id 'org.ysb33r.cloudci' version '3.0.0'
3428
id 'com.github.hierynomus.license' version '0.15.0'
29+
id 'io.miret.etienne.sass' version '1.4.1'
3530
}
3631

37-
apply plugin: 'com.github.fgiannesini.libsass.gradle.plugin'
38-
3932
group 'com.github.mfl28'
4033
version '2.3.0'
4134

@@ -145,18 +138,21 @@ jacocoTestReport {
145138
}
146139
}
147140

148-
libSassParameters {
149-
inputFilePath = "${projectDir}/src/main/resources/stylesheets/scss/styles.scss"
150-
outputFilePath = "${projectDir}/src/main/resources/stylesheets/css/styles.css"
151-
watchedDirectoryPath = "scss"
152-
sourceComments = true
141+
compileSass {
142+
outputDir = project.file ("${buildDir}/resources/main/stylesheets/css")
143+
destPath = "."
144+
sourceDir = project.file ("${projectDir}/src/main/resources/stylesheets/scss")
145+
style = expanded
146+
noCharset ()
147+
noErrorCss ()
148+
sourceMap = none
153149
}
154150

155151
compileJava {
156152
options.compilerArgs.addAll(['-Xlint:all', '-Xlint:-requires-automatic'])
157153
}
158154

159-
compileJava.finalizedBy('compileLibSass')
155+
compileJava.finalizedBy('compileSass')
160156

161157
application {
162158
mainModule = "com.github.mfl28.boundingboxeditor"

0 commit comments

Comments
 (0)