Browse Source

:adhesive_bandage: Previous workaround was causing sass plugin to fail

Signed-off-by: Alessadro Parisi <alessandro.parisi406@gmail.com>
Alessadro Parisi 2 years ago
parent
commit
8663b8c565
2 changed files with 7 additions and 4 deletions
  1. 6 3
      build.gradle
  2. 1 1
      modules/resources/build.gradle

+ 6 - 3
build.gradle

@@ -12,9 +12,12 @@ subprojects {
     apply plugin: "org.openjfx.javafxplugin"
     apply plugin: "com.vanniktech.maven.publish"
 
-    tasks.whenTaskAdded { task ->
-        if (task.name.contains("javaSourcesJar") || task.name.contains("simpleJavadocJar")) {
-            task.enabled = false
+    gradle.taskGraph.whenReady { graph ->
+        if (graph.hasTask(javaSourcesJar)) {
+            javaSourcesJar.enabled = false
+        }
+        if (graph.hasTask(simpleJavadocJar)) {
+            simpleJavadocJar.enabled = false
         }
     }
 

+ 1 - 1
modules/resources/build.gradle

@@ -21,7 +21,7 @@ java {
 
 sass {
     // dart-sass version to use:
-    version = '1.57.1'
+    version = "$sass"
 
     // Directory where to install dart-sass:
     directory = file("${rootDir}/.gradle/sass")