diff --git a/build.gradle b/build.gradle index be6944bf..7c7cd6c5 100644 --- a/build.gradle +++ b/build.gradle @@ -46,11 +46,11 @@ allprojects { dependencies { testImplementation 'org.assertj:assertj-core:3.26.3' - testImplementation platform("org.junit:junit-bom:5.11.2") + testImplementation platform("org.junit:junit-bom:5.11.3") testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testImplementation 'ch.qos.logback:logback-classic:1.5.9' + testImplementation 'ch.qos.logback:logback-classic:1.5.11' } tasks.withType(Test).configureEach { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b..94113f20 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.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/sass-embedded-android/build.gradle b/sass-embedded-android/build.gradle index fbec42a6..886fc98d 100644 --- a/sass-embedded-android/build.gradle +++ b/sass-embedded-android/build.gradle @@ -55,7 +55,7 @@ dependencies { } implementation 'org.slf4j:slf4j-android:1.7.36' - implementation 'androidx.annotation:annotation:1.8.2' + 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" diff --git a/sass-embedded-host/build.gradle b/sass-embedded-host/build.gradle index ed42f903..48b537eb 100644 --- a/sass-embedded-host/build.gradle +++ b/sass-embedded-host/build.gradle @@ -28,7 +28,7 @@ dependencies { api project(":sass-embedded-bundled") api "org.slf4j:slf4j-api:1.7.36" - compileOnly 'org.jetbrains:annotations:26.0.0' + compileOnly 'org.jetbrains:annotations:26.0.1' compileOnly 'androidx.annotation:annotation-jvm:1.8.2' compileOnly 'com.google.code.findbugs:jsr305:3.0.2' compileOnly 'javax.servlet:javax.servlet-api:4.0.1' @@ -40,7 +40,7 @@ dependencies { springSupportApi "org.springframework:spring-core:$spring5Verison" springWebmvcSupportApi "org.springframework:spring-webmvc:$spring5Verison" - testCompileOnly 'org.jetbrains:annotations:26.0.0' + testCompileOnly 'org.jetbrains:annotations:26.0.1' testRuntimeOnly 'org.webjars:bootstrap:5.3.3' } diff --git a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/BundledPackageProvider.java b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/BundledPackageProvider.java index ad67c642..2a69bb45 100644 --- a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/BundledPackageProvider.java +++ b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/BundledPackageProvider.java @@ -15,7 +15,13 @@ protected URL getPackageUrl() { String resourcePath = String.format("/de/larsgrefer/sass/embedded/bundled/dart-sass-%s", dartSassPackageSuffix); - return this.getClass().getResource(resourcePath); + URL bundledResource = this.getClass().getResource(resourcePath); + + if (bundledResource == null) { + throw new IllegalStateException("Could not find resource: " + resourcePath); + } + + return bundledResource; } diff --git a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/ConnectionFactory.java b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/ConnectionFactory.java index da40b730..a05efe39 100644 --- a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/ConnectionFactory.java +++ b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/connection/ConnectionFactory.java @@ -55,7 +55,11 @@ public static ProcessConnection fromPackageProvider(DartSassPackageProvider dart * @throws IOException if the subprocess can not be started. */ public static ProcessConnection ofExecutable(File executable) throws IOException { - if (executable == null || !executable.isFile()) { + if (executable == null) { + throw new IllegalArgumentException("executable must not be null"); + } + + if (!executable.isFile()) { throw new IllegalArgumentException(executable + " is not a file"); } diff --git a/settings.gradle b/settings.gradle index 196db896..df251d4a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,15 +5,15 @@ pluginManagement { mavenCentral() } plugins { - id "com.android.library" version "8.5.2" - id "com.android.application" version "8.5.2" + id "com.android.library" version "8.7.2" + id "com.android.application" version "8.7.2" } } plugins { id 'io.freefair.settings.plugin-versions' version '8.10.2' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' - id "com.gradle.develocity" version "3.18.1" + id "com.gradle.develocity" version "3.18.2" } rootProject.name = 'dart-sass-java'