From 4af8ba797a54b3100a1b5ffbccb90f0064d83e82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 00:37:39 +0000 Subject: [PATCH 01/29] Bump codecov/codecov-action from 5.4.2 to 5.4.3 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.4.2 to 5.4.3. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v5.4.2...v5.4.3) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 5.4.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6493109a..f18402c5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -42,7 +42,7 @@ jobs: - run: ./gradlew jacocoTestReport - name: Upload coverage report - uses: codecov/codecov-action@v5.4.2 + uses: codecov/codecov-action@v5.4.3 with: files: jacoco*.xml,*Jacoco*.xml From 7c63aa6b0150fa7af4e9f4bc621fe4c5ed963a8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 May 2025 01:01:08 +0000 Subject: [PATCH 02/29] Bump org.gradle.toolchains.foojay-resolver-convention Bumps org.gradle.toolchains.foojay-resolver-convention from 0.10.0 to 1.0.0. --- updated-dependencies: - dependency-name: org.gradle.toolchains.foojay-resolver-convention dependency-version: 1.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 91399bc6..f56c5f1c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,7 +12,7 @@ pluginManagement { plugins { id 'io.freefair.settings.plugin-versions' version '8.13.1' - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' id "com.gradle.develocity" version "4.0.1" } From afbd87ccb222987b6dafcea6b3b22e91fe0525ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 May 2025 00:52:48 +0000 Subject: [PATCH 03/29] Bump org.springframework.boot from 3.4.5 to 3.5.0 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.4.5 to 3.5.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-projects/spring-boot-resources/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-projects/spring-boot-resources/build.gradle b/test-projects/spring-boot-resources/build.gradle index d9c12d4b..b09911c0 100644 --- a/test-projects/spring-boot-resources/build.gradle +++ b/test-projects/spring-boot-resources/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.7' id 'java' } From cea46d909a458cb774a3de0660051d4f5f8aedf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 May 2025 00:49:58 +0000 Subject: [PATCH 04/29] Bump com.gradle.develocity from 4.0.1 to 4.0.2 Bumps com.gradle.develocity from 4.0.1 to 4.0.2. --- updated-dependencies: - dependency-name: com.gradle.develocity dependency-version: 4.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index f56c5f1c..fa9cdda4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,7 +13,7 @@ pluginManagement { plugins { id 'io.freefair.settings.plugin-versions' version '8.13.1' id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' - id "com.gradle.develocity" version "4.0.1" + id "com.gradle.develocity" version "4.0.2" } rootProject.name = 'dart-sass-java' From 92ddbd9cff0c3f98354099dddfe8c531543e693b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 May 2025 00:47:57 +0000 Subject: [PATCH 05/29] Bump protobufVersion from 4.31.0 to 4.31.1 Bumps `protobufVersion` from 4.31.0 to 4.31.1. Updates `com.google.protobuf:protobuf-java` from 4.31.0 to 4.31.1 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v4.31.0...v4.31.1) Updates `com.google.protobuf:protoc` from 4.31.0 to 4.31.1 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v4.31.0...v4.31.1) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-version: 4.31.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.google.protobuf:protoc dependency-version: 4.31.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sass-embedded-protocol/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass-embedded-protocol/build.gradle b/sass-embedded-protocol/build.gradle index d6a12377..9ed95061 100644 --- a/sass-embedded-protocol/build.gradle +++ b/sass-embedded-protocol/build.gradle @@ -19,7 +19,7 @@ repositories { } } -def protobufVersion = "4.31.0" +def protobufVersion = "4.31.1" tasks.withType(com.google.protobuf.gradle.ProtobufExtract).configureEach { doFirst { From d38c5ff3884d620cb80642ffc8fd70668ee2d3cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 00:27:17 +0000 Subject: [PATCH 06/29] Bump org.webjars:bootstrap from 5.3.5 to 5.3.6 Bumps [org.webjars:bootstrap](https://github.com/webjars/bootstrap) from 5.3.5 to 5.3.6. - [Commits](https://github.com/webjars/bootstrap/compare/bootstrap-5.3.5...bootstrap-5.3.6) --- updated-dependencies: - dependency-name: org.webjars:bootstrap dependency-version: 5.3.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sass-embedded-host/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass-embedded-host/build.gradle b/sass-embedded-host/build.gradle index 8c437091..77cf5eaa 100644 --- a/sass-embedded-host/build.gradle +++ b/sass-embedded-host/build.gradle @@ -31,7 +31,7 @@ dependencies { testCompileOnly 'org.jetbrains:annotations:26.0.2' - testRuntimeOnly 'org.webjars:bootstrap:5.3.5' + testRuntimeOnly 'org.webjars:bootstrap:5.3.6' } tasks.named("processResources", ProcessResources) { From b4689072e4e03d25d8ef35db6374a6690b0e140e Mon Sep 17 00:00:00 2001 From: Jonah Bauer <32650546+jbb01@users.noreply.github.com> Date: Thu, 5 Jun 2025 15:29:33 +0200 Subject: [PATCH 07/29] Add support for the Sass Deprecations API (fixes #671) --- .../sass/embedded/SassCompiler.java | 60 +++++++++++++++++++ .../sass/embedded/SassCompilerTest.java | 41 +++++++++++-- 2 files changed, 97 insertions(+), 4 deletions(-) diff --git a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/SassCompiler.java b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/SassCompiler.java index d70f271c..2fe159da 100644 --- a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/SassCompiler.java +++ b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/SassCompiler.java @@ -125,6 +125,26 @@ public class SassCompiler implements Closeable { @Setter private boolean silent = false; + /** + * This option tells Sass to treat a particular type of deprecation warning as an error. + * @see #addFatalDeprecation(String) + */ + private final List fatalDeprecations = new ArrayList<>(); + + /** + * This option tells Sass to opt in to a future type of deprecation warning early, emitting warnings even though + * the deprecation is not yet active. + * @see #addFutureDeprecation(String) + */ + private final List futureDeprecations = new ArrayList<>(); + + /** + * This option tells Sass to silence a particular type of deprecation warning if you wish to temporarily ignore + * the deprecation. + * @see #addSilenceDeprecation(String) + */ + private final List silenceDeprecations = new ArrayList<>(); + private final CompilerConnection connection; private final Random compileRequestIds = new Random(); @@ -149,6 +169,43 @@ public OutboundMessage.VersionResponse getVersion() throws IOException { return exec(inboundMessage(VersionRequest.getDefaultInstance())).getVersionResponse(); } + /** + * Adds a deprecation type to the list of fatal deprecations. Sass will treat a warning for this type of deprecation + * as an error. + *

+ * For a list of deprecation types, see the + * Sass documentation. + * @param deprecationId a deprecation ID + */ + public void addFatalDeprecation(@NonNull String deprecationId) { + fatalDeprecations.add(deprecationId); + } + + /** + * Adds a deprecation type to the list of future deprecations. Sass will opt in to this type of deprecation + * warning early, emitting warnings even though the deprecation is not yet active. This can be combined with + * {@link #addFatalDeprecation(String)} to emit errors instead of warnings for a future deprecation. + *

+ * For a list of deprecation types, see the + * Sass documentation. + * @param deprecationId a deprecation ID + */ + public void addFutureDeprecation(@NonNull String deprecationId) { + futureDeprecations.add(deprecationId); + } + + /** + * Adds a deprecation type to the list of silenced deprecations. Sass will silence warnings for this type of + * deprecation. + *

+ * For a list of deprecation types, see the + * Sass documentation. + * @param deprecationId a deprecation ID + */ + public void addSilenceDeprecation(@NonNull String deprecationId) { + silenceDeprecations.add(deprecationId); + } + public void registerFunction(@NonNull HostFunction sassFunction) { globalFunctions.put(sassFunction.getName(), sassFunction); } @@ -199,6 +256,9 @@ protected CompileRequest.Builder compileRequestBuilder() { builder.setSourceMapIncludeSources(sourceMapIncludeSources); builder.setCharset(emitCharset); builder.setSilent(silent); + builder.addAllFatalDeprecation(fatalDeprecations); + builder.addAllFutureDeprecation(futureDeprecations); + builder.addAllSilenceDeprecation(silenceDeprecations); return builder; } diff --git a/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/SassCompilerTest.java b/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/SassCompilerTest.java index ec5385fa..1c35ad6f 100644 --- a/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/SassCompilerTest.java +++ b/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/SassCompilerTest.java @@ -1,9 +1,6 @@ package de.larsgrefer.sass.embedded; -import com.sass_lang.embedded_protocol.InboundMessage; -import com.sass_lang.embedded_protocol.OutboundMessage; -import com.sass_lang.embedded_protocol.OutputStyle; -import com.sass_lang.embedded_protocol.Value; +import com.sass_lang.embedded_protocol.*; import de.larsgrefer.sass.embedded.functions.HostFunction; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; @@ -14,11 +11,13 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import static de.larsgrefer.sass.embedded.BootstrapUtil.getBoostrapVersion; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; class SassCompilerTest { @@ -154,4 +153,38 @@ void sourceMapPaths() throws SassCompilationFailedException, IOException { System.out.println(compileSuccess1.getSourceMap()); } + @Test + void silenceDeprecations() { + @Language("SCSS") String scss = ".foo { color: adjust-color(#000000, $red: 255); }"; + + InboundMessage.CompileRequest.StringInput string = InboundMessage.CompileRequest.StringInput.newBuilder() + .setSource(scss) + .build(); + + List logEvents = new ArrayList<>(); + sassCompiler.setLoggingHandler(logEvents::add); + + assertDoesNotThrow(() -> sassCompiler.compileString(string, OutputStyle.EXPANDED)); + assertThat(logEvents).anyMatch(event -> event.getType() == LogEventType.DEPRECATION_WARNING); + + logEvents.clear(); + sassCompiler.addSilenceDeprecation("global-builtin"); + assertDoesNotThrow(() -> sassCompiler.compileString(string, OutputStyle.EXPANDED)); + assertThat(logEvents).noneMatch(event -> event.getType() == LogEventType.DEPRECATION_WARNING); + } + + @Test + void fatalDeprecations() { + @Language("SCSS") String scss = ".foo { color: adjust-color(#000000, $red: 255); }"; + + InboundMessage.CompileRequest.StringInput string = InboundMessage.CompileRequest.StringInput.newBuilder() + .setSource(scss) + .build(); + + sassCompiler.addFatalDeprecation("global-builtin"); + SassCompilationFailedException ex = assertThrows(SassCompilationFailedException.class, () -> { + sassCompiler.compileString(string, OutputStyle.EXPANDED); + }); + assertThat(ex.getMessage()).contains("deprecat"); + } } \ No newline at end of file From 98b358441ec1b1752095c84f903222faf4c0c2b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 00:32:31 +0000 Subject: [PATCH 08/29] Bump androidx.appcompat:appcompat from 1.7.0 to 1.7.1 Bumps androidx.appcompat:appcompat from 1.7.0 to 1.7.1. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-version: 1.7.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-projects/android-app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-projects/android-app/build.gradle b/test-projects/android-app/build.gradle index 39619072..6c8a5232 100644 --- a/test-projects/android-app/build.gradle +++ b/test-projects/android-app/build.gradle @@ -34,7 +34,7 @@ android { dependencies { implementation 'com.google.android.material:material:1.12.0' - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.3.0' implementation project(":sass-embedded-android") From e149cd7c2504191cb252c79ed3b2684cae08e137 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 00:54:04 +0000 Subject: [PATCH 09/29] Bump org.junit:junit-bom from 5.12.2 to 5.13.1 Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.12.2 to 5.13.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.2...r5.13.1) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-version: 5.13.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e404cef4..c0cc4cb7 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ allprojects { dependencies { testImplementation 'org.assertj:assertj-core:3.26.3' - testImplementation platform("org.junit:junit-bom:5.12.2") + testImplementation platform("org.junit:junit-bom:5.13.1") testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' From b4d06d0a075dcd81a9661219e92224ce9b61c917 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Jun 2025 00:35:41 +0000 Subject: [PATCH 10/29] Bump io.freefair.settings.plugin-versions from 8.13.1 to 8.14 Bumps [io.freefair.settings.plugin-versions](https://github.com/freefair/gradle-plugins) from 8.13.1 to 8.14. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/8.13.1...8.14) --- updated-dependencies: - dependency-name: io.freefair.settings.plugin-versions dependency-version: '8.14' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index fa9cdda4..b086e1dc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ pluginManagement { } plugins { - id 'io.freefair.settings.plugin-versions' version '8.13.1' + id 'io.freefair.settings.plugin-versions' version '8.14' id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' id "com.gradle.develocity" version "4.0.2" } From 5ece27e8ddbaae0ea34669c0c85e7999f21e0d12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 00:29:44 +0000 Subject: [PATCH 11/29] Bump org.junit:junit-bom from 5.13.1 to 5.13.2 Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.1 to 5.13.2. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.1...r5.13.2) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-version: 5.13.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c0cc4cb7..c612b8c4 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ allprojects { dependencies { testImplementation 'org.assertj:assertj-core:3.26.3' - testImplementation platform("org.junit:junit-bom:5.13.1") + testImplementation platform("org.junit:junit-bom:5.13.2") testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' From 9a376f0ef61b20d5d9eece955fb45c9129cf51b7 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sun, 6 Jul 2025 23:26:12 +0200 Subject: [PATCH 12/29] Update to Gradle 8.14.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c83..d4081da4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 27e6455942be787fb17e5fa2b0f262bbab913b3b Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sun, 6 Jul 2025 23:48:22 +0200 Subject: [PATCH 13/29] Update to Spring Framework 6.2.8 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5c8d2870..f8b48463 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dartSassVersion=1.89.0 embeddedProtocolVersion=3.2.0 spring5Verison=5.3.39 -spring6Version=6.2.5 +spring6Version=6.2.8 org.gradle.caching=true org.gradle.parallel=true From 899b9ece0d3c79a3f7fe78599856eb71225bfae0 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sun, 6 Jul 2025 23:58:50 +0200 Subject: [PATCH 14/29] Update to Spring Boot 3.5.3 --- test-projects/spring-boot-resources/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-projects/spring-boot-resources/build.gradle b/test-projects/spring-boot-resources/build.gradle index b09911c0..d86a09e7 100644 --- a/test-projects/spring-boot-resources/build.gradle +++ b/test-projects/spring-boot-resources/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '3.5.0' + id 'org.springframework.boot' version '3.5.3' id 'io.spring.dependency-management' version '1.1.7' id 'java' } From 0f3b9f75cdd24b1ea37dc784b438d582110716a1 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Mon, 7 Jul 2025 00:04:31 +0200 Subject: [PATCH 15/29] Use new Gradle Feature --- test-projects/graalvm/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-projects/graalvm/build.gradle b/test-projects/graalvm/build.gradle index fa69b2d2..032291e5 100644 --- a/test-projects/graalvm/build.gradle +++ b/test-projects/graalvm/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.GRAAL_VM + nativeImageCapable = true } } @@ -25,7 +25,7 @@ graalvmNative { main { javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.GRAAL_VM + nativeImageCapable = true } } } From bcb9fe4bf2be13520772b9e1473ef8d9b5d8c25f Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Thu, 7 Aug 2025 08:39:19 +0200 Subject: [PATCH 16/29] Update to Android Gradle Plugin 8.11.0 --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index b086e1dc..a37a5e11 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,8 +5,8 @@ pluginManagement { mavenCentral() } plugins { - id "com.android.library" version "8.9.3" - id "com.android.application" version "8.9.3" + id "com.android.library" version "8.11.0" + id "com.android.application" version "8.11.0" } } From 416550c4dc7c1a43d1450273417e597eea021244 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Aug 2025 01:07:00 +0000 Subject: [PATCH 17/29] Bump org.junit:junit-bom from 5.13.2 to 5.13.4 Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.2 to 5.13.4. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.2...r5.13.4) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-version: 5.13.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c612b8c4..3e2286de 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ allprojects { dependencies { testImplementation 'org.assertj:assertj-core:3.26.3' - testImplementation platform("org.junit:junit-bom:5.13.2") + testImplementation platform("org.junit:junit-bom:5.13.4") testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' From 1404d072a24e18ad97f35ae04c3e6a1056ac9c1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 01:06:28 +0000 Subject: [PATCH 18/29] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle-publish.yml | 2 +- .github/workflows/gradle.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 06022dbd..2a033dec 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -10,7 +10,7 @@ jobs: env: ORG_GRADLE_PROJECT_larsgreferBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK 17 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f18402c5..3c2f6ec3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -24,7 +24,7 @@ jobs: java: [ 17, 21 ] os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 @@ -55,7 +55,7 @@ jobs: matrix: api-level: [ 21, 26, 30, 34 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK 17 uses: actions/setup-java@v4 From 718b8d52e5c6d0bdd313e82121b3a7e26526c8c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 11:01:06 +0000 Subject: [PATCH 19/29] Bump protobufVersion from 4.31.1 to 4.32.0 Bumps `protobufVersion` from 4.31.1 to 4.32.0. Updates `com.google.protobuf:protobuf-java` from 4.31.1 to 4.32.0 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/commits) Updates `com.google.protobuf:protoc` from 4.31.1 to 4.32.0 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/commits) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-version: 4.32.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.protobuf:protoc dependency-version: 4.32.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sass-embedded-protocol/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass-embedded-protocol/build.gradle b/sass-embedded-protocol/build.gradle index 9ed95061..d0e98535 100644 --- a/sass-embedded-protocol/build.gradle +++ b/sass-embedded-protocol/build.gradle @@ -19,7 +19,7 @@ repositories { } } -def protobufVersion = "4.31.1" +def protobufVersion = "4.32.0" tasks.withType(com.google.protobuf.gradle.ProtobufExtract).configureEach { doFirst { From 60ba3a4b45980b26667a982c07ae17b384de8bd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 01:02:58 +0000 Subject: [PATCH 20/29] Bump org.springframework.boot from 3.5.3 to 3.5.5 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.5.3 to 3.5.5. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.3...v3.5.5) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-version: 3.5.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-projects/spring-boot-resources/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-projects/spring-boot-resources/build.gradle b/test-projects/spring-boot-resources/build.gradle index d86a09e7..6fd5cfcb 100644 --- a/test-projects/spring-boot-resources/build.gradle +++ b/test-projects/spring-boot-resources/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '3.5.3' + id 'org.springframework.boot' version '3.5.5' id 'io.spring.dependency-management' version '1.1.7' id 'java' } From 5cf97d305921b8ff89d76497919f86f8ea38ac69 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sat, 23 Aug 2025 00:07:36 +0200 Subject: [PATCH 21/29] Update Gradle Plugins --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index a37a5e11..1acee13d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ pluginManagement { } plugins { - id 'io.freefair.settings.plugin-versions' version '8.14' + id 'io.freefair.settings.plugin-versions' version '8.14.2' id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' id "com.gradle.develocity" version "4.0.2" } From f677775b2000611578cff9e6cc0bf6278279dccc Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sat, 23 Aug 2025 00:22:20 +0200 Subject: [PATCH 22/29] Update to Dart Sass 1.90.0 --- gradle.properties | 2 +- sass-embedded-android/build.gradle | 2 - sass-embedded-bundled-ia32/build.gradle | 50 ------------------------- sass-embedded-bundled/build.gradle | 2 - settings.gradle | 1 - 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 sass-embedded-bundled-ia32/build.gradle diff --git a/gradle.properties b/gradle.properties index f8b48463..af0c1e8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -dartSassVersion=1.89.0 +dartSassVersion=1.90.0 embeddedProtocolVersion=3.2.0 spring5Verison=5.3.39 diff --git a/sass-embedded-android/build.gradle b/sass-embedded-android/build.gradle index 0aa72de5..55e05248 100644 --- a/sass-embedded-android/build.gradle +++ b/sass-embedded-android/build.gradle @@ -58,7 +58,6 @@ dependencies { implementation 'androidx.annotation:annotation:1.9.1' dartSass "sass:dart-sass:$dartSassVersion:android-x64@tar.gz" - dartSass "sass:dart-sass:$dartSassVersion:android-ia32@tar.gz" dartSass "sass:dart-sass:$dartSassVersion:android-arm@tar.gz" dartSass "sass:dart-sass:$dartSassVersion:android-arm64@tar.gz" dartSass "sass:dart-sass:$dartSassVersion:android-riscv64@tar.gz" @@ -73,7 +72,6 @@ def abiMap = [ "arm64": "arm64-v8a", "arm" : "armeabi-v7a", "x64" : "x86_64", - "ia32" : "x86", "riscv64" : "riscv64" ] diff --git a/sass-embedded-bundled-ia32/build.gradle b/sass-embedded-bundled-ia32/build.gradle deleted file mode 100644 index 10905c8b..00000000 --- a/sass-embedded-bundled-ia32/build.gradle +++ /dev/null @@ -1,50 +0,0 @@ -plugins { - id "java-library" - id "io.freefair.maven-publish-java" -} - -description = "SASS Embedded Bundled Compilers ia32" - -java.toolchain.languageVersion = JavaLanguageVersion.of(8) - -configurations { - sassEmbedded -} - -repositories { - ivy { - //https://github.com/sass/dart-sass/releases/download/1.63.3/dart-sass-1.63.3-linux-x64.tar.gz - url = "https://github.com" - patternLayout { - artifact "/[orgPath]/[artifact]/releases/download/[revision]/[artifact]-[revision](-[classifier])(.[ext])" - } - metadataSources { - artifact() - } - content { - includeModule("sass", "dart-sass") - } - } -} - -dependencies { - sassEmbedded "sass:dart-sass:$dartSassVersion:linux-ia32@tar.gz" - - sassEmbedded "sass:dart-sass:$dartSassVersion:linux-ia32-musl@tar.gz" - - sassEmbedded "sass:dart-sass:$dartSassVersion:windows-ia32@zip" -} - -tasks.named("processResources") { - into("de/larsgrefer/sass/embedded/bundled") { - from configurations.sassEmbedded - rename "-$dartSassVersion-", "-" - } -} - -tasks.named("jar") { - manifest { - attributes 'Specification-Vendor': "Google LLC", - 'Specification-Version': "$dartSassVersion" - } -} \ No newline at end of file diff --git a/sass-embedded-bundled/build.gradle b/sass-embedded-bundled/build.gradle index bbff5639..72ac4832 100644 --- a/sass-embedded-bundled/build.gradle +++ b/sass-embedded-bundled/build.gradle @@ -33,8 +33,6 @@ repositories { dependencies { implementation "org.slf4j:slf4j-api:1.7.36" - implementation project(":sass-embedded-bundled-ia32") - sassEmbedded "sass:dart-sass:$dartSassVersion:linux-x64@tar.gz" sassEmbedded "sass:dart-sass:$dartSassVersion:linux-arm@tar.gz" sassEmbedded "sass:dart-sass:$dartSassVersion:linux-arm64@tar.gz" diff --git a/settings.gradle b/settings.gradle index 1acee13d..2dd812f6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -42,7 +42,6 @@ buildCache { include "sass-embedded-protocol" include "sass-embedded-host" include "sass-embedded-bundled" -include "sass-embedded-bundled-ia32" include "sass-embedded-spring5" include "sass-embedded-spring6" From 2da71c749c32ad68c217a2c420262f5b9b765152 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sat, 23 Aug 2025 00:22:26 +0200 Subject: [PATCH 23/29] GitHub Actions --- .github/workflows/gradle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 3c2f6ec3..c0537a6e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -26,6 +26,13 @@ jobs: steps: - uses: actions/checkout@v5 + - uses: graalvm/setup-graalvm@v1 + with: + java-version: '21' + github-token: ${{ secrets.GITHUB_TOKEN }} + distribution: liberica + cache: gradle + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: From fc17ce97584d13b271378df13adfac9cf7eeeab7 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sat, 23 Aug 2025 00:30:46 +0200 Subject: [PATCH 24/29] GitHub Actions --- .github/workflows/gradle.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c0537a6e..8c2e65cb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,7 +22,14 @@ jobs: fail-fast: false matrix: java: [ 17, 21 ] - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest ] + include: + - java: 17 + os: windows-latest + experimental: true + - java: 21 + os: windows-latest + experimental: true steps: - uses: actions/checkout@v5 From b8c6cbeba8bc7fda397fe11b0db081045f7cb7be Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sat, 23 Aug 2025 00:32:49 +0200 Subject: [PATCH 25/29] GitHub Actions --- .github/workflows/gradle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8c2e65cb..0bc215e7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,13 +16,15 @@ on: jobs: build: runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.experimental }} env: ORG_GRADLE_PROJECT_larsgreferBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }} strategy: fail-fast: false matrix: java: [ 17, 21 ] - os: [ubuntu-latest, macos-latest ] + os: [ ubuntu-latest, macos-latest ] + experimental: [ false ] include: - java: 17 os: windows-latest From 601b85e8a4575dbdd2c7a82362bcf5aca7b7b8f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 22:43:23 +0000 Subject: [PATCH 26/29] Bump org.graalvm.buildtools.native from 0.10.6 to 0.11.0 Bumps [org.graalvm.buildtools.native](https://github.com/graalvm/native-build-tools) from 0.10.6 to 0.11.0. - [Release notes](https://github.com/graalvm/native-build-tools/releases) - [Commits](https://github.com/graalvm/native-build-tools/compare/0.10.6...0.11.0) --- updated-dependencies: - dependency-name: org.graalvm.buildtools.native dependency-version: 0.11.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-projects/graalvm/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-projects/graalvm/build.gradle b/test-projects/graalvm/build.gradle index 032291e5..f3d03f02 100644 --- a/test-projects/graalvm/build.gradle +++ b/test-projects/graalvm/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "application" - id 'org.graalvm.buildtools.native' version '0.10.6' + id 'org.graalvm.buildtools.native' version '0.11.0' } java { From 564cf5a6e2ee73baf2fa856bf862743c19efacac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Aug 2025 00:20:10 +0000 Subject: [PATCH 27/29] Bump codecov/codecov-action from 5.4.3 to 5.5.0 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.4.3 to 5.5.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v5.4.3...v5.5.0) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 5.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0bc215e7..9db4fd80 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,7 +58,7 @@ jobs: - run: ./gradlew jacocoTestReport - name: Upload coverage report - uses: codecov/codecov-action@v5.4.3 + uses: codecov/codecov-action@v5.5.0 with: files: jacoco*.xml,*Jacoco*.xml From 4786644fd5b34ad7807fc295e09a25bd6d23bec6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Aug 2025 00:20:14 +0000 Subject: [PATCH 28/29] Bump actions/setup-java from 4 to 5 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle-publish.yml | 2 +- .github/workflows/gradle.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 2a033dec..1702859c 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 17 distribution: 'temurin' diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0bc215e7..a20ed3c9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -43,7 +43,7 @@ jobs: cache: gradle - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -74,7 +74,7 @@ jobs: - uses: actions/checkout@v5 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 17 distribution: 'temurin' From cc2dbeff85b2b9612d7b39399e9be0a835aa7e04 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Wed, 3 Sep 2025 19:43:01 +0200 Subject: [PATCH 29/29] Update to dart-sass 1.92.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index af0c1e8e..91ad9319 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -dartSassVersion=1.90.0 +dartSassVersion=1.92.0 embeddedProtocolVersion=3.2.0 spring5Verison=5.3.39