Update to dart-sass-embedded 1.49.10

larsgrefer · Apr 1, 2022 · c1d48fb · c1d48fb
1 parent 3365087
commit c1d48fb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -26,6 +26,7 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
+      - run: java -XshowSettings -version
       - name: Build with Gradle
         run: ./gradlew build
 

diff --git a/sass-embedded-host/build.gradle b/sass-embedded-host/build.gradle
@@ -23,7 +23,7 @@ repositories {
     }
 }
 
-def dartSassVersion = "1.49.9"
+def dartSassVersion = "1.49.10"
 def slf4jVersion = '1.7.36'
 def springVersion = '5.3.17'
 def webjarsVersion = '0.50'
@@ -40,7 +40,9 @@ dependencies {
 
     sassEmbedded "sass:sass_embedded:$dartSassVersion:linux-ia32@tar.gz"
     sassEmbedded "sass:sass_embedded:$dartSassVersion:linux-x64@tar.gz"
+    sassEmbedded "sass:sass_embedded:$dartSassVersion:linux-arm64@tar.gz"
     sassEmbedded "sass:sass_embedded:$dartSassVersion:macos-x64@tar.gz"
+    sassEmbedded "sass:sass_embedded:$dartSassVersion:macos-arm64@tar.gz"
     sassEmbedded "sass:sass_embedded:$dartSassVersion:windows-ia32@zip"
     sassEmbedded "sass:sass_embedded:$dartSassVersion:windows-x64@zip"
 

diff --git a/...embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/ConnectionFactory.java b/...embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/ConnectionFactory.java
@@ -64,14 +64,27 @@ private static String getBundledCompilerDistPath() {
         String archiveExtension = "tar.gz";
 
         if (osName.contains("mac")) {
-            classifier = "macos-x64";
+            if (osArch.equals("aarch64")) {
+                classifier = "macos-arm64";
+            }
+            else {
+                classifier = "macos-x64";
+            }
         }
         else if (osName.contains("win")) {
             archiveExtension = "zip";
             classifier = osArch.contains("64") ? "windows-x64" : "windows-ia32";
         }
         else {
-            classifier = osArch.contains("64") ? "linux-x64" : "linux-ia32";
+            if (osArch.equals("aarch64")) {
+                classifier = "linux-arm64";
+            }
+            else if (osArch.contains("64")) {
+                classifier = "linux-x64";
+            }
+            else {
+                classifier = "linux-ia32";
+            }
         }
 
         return String.format("/de/larsgrefer/sass/embedded/sass_embedded-%s.%s", classifier, archiveExtension);