Skip to content

Commit 0d6e224

Browse files
committed
Merge branch '3.x' of github.com:larsgrefer/dart-sass-java into 4.x
2 parents bd8c282 + 74fd556 commit 0d6e224

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- run: ./gradlew jacocoTestReport
4848
- name: Upload coverage report
49-
uses: codecov/codecov-action@v4.5.0
49+
uses: codecov/codecov-action@v4.6.0
5050
with:
5151
files: jacoco*.xml,*Jacoco*.xml
5252

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ allprojects {
4646
dependencies {
4747
testImplementation 'org.assertj:assertj-core:3.26.3'
4848

49-
testImplementation platform("org.junit:junit-bom:5.11.0")
49+
testImplementation platform("org.junit:junit-bom:5.11.2")
5050
testImplementation 'org.junit.jupiter:junit-jupiter-api'
5151
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
5252

sass-embedded-host/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ dependencies {
2828
api project(":sass-embedded-bundled")
2929
api "org.slf4j:slf4j-api:1.7.36"
3030

31-
compileOnly 'org.jetbrains:annotations:24.1.0'
31+
compileOnly 'org.jetbrains:annotations:25.0.0'
3232
compileOnly 'androidx.annotation:annotation-jvm:1.8.2'
3333
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
3434
compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
3535
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
36-
compileOnly 'org.apache.logging.log4j:log4j-api:2.24.0'
36+
compileOnly 'org.apache.logging.log4j:log4j-api:2.24.1'
3737
webjarsSupportImplementation "org.webjars:webjars-locator-core:0.59"
3838
compileOnly "org.jboss:jboss-vfs:3.3.2.Final"
3939

4040
springSupportApi "org.springframework:spring-core:$spring5Verison"
4141
springWebmvcSupportApi "org.springframework:spring-webmvc:$spring5Verison"
4242

43-
testCompileOnly 'org.jetbrains:annotations:24.1.0'
43+
testCompileOnly 'org.jetbrains:annotations:25.0.0'
4444

4545
testRuntimeOnly 'org.webjars:bootstrap:5.3.3'
4646
}

sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/ConnectionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static ProcessConnection fromPackageProvider(DartSassPackageProvider dart
5656
*/
5757
public static ProcessConnection ofExecutable(File executable) throws IOException {
5858
if (executable == null || !executable.isFile()) {
59-
throw new IllegalArgumentException("executable is not a file");
59+
throw new IllegalArgumentException(executable + " is not a file");
6060
}
6161

6262
List<String> cmd = new ArrayList<>();

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pluginManagement {
1111
}
1212

1313
plugins {
14-
id 'io.freefair.settings.plugin-versions' version '8.10'
14+
id 'io.freefair.settings.plugin-versions' version '8.10.2'
1515
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
1616
id "com.gradle.develocity" version "3.18.1"
1717
}

0 commit comments

Comments
 (0)