diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8efb371d..0a5efc33 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,3 +18,8 @@ updates: target-branch: "3.x" schedule: interval: "daily" + - package-ecosystem: "gradle" + directory: "/" + target-branch: "4.x" + schedule: + interval: "daily" diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index af955bc0..77511d43 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,7 +46,7 @@ jobs: - run: ./gradlew jacocoTestReport - name: Upload coverage report - uses: codecov/codecov-action@v5.1.2 + uses: codecov/codecov-action@v5.3.1 with: files: jacoco*.xml,*Jacoco*.xml diff --git a/gradle.properties b/gradle.properties index 73fff3f1..fe7b5e87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -dartSassVersion=1.83.1 +dartSassVersion=1.83.4 embeddedProtocolVersion=3.1.0 spring5Verison=5.3.39 @@ -6,6 +6,6 @@ spring6Version=6.1.13 org.gradle.caching=true org.gradle.parallel=true -org.gradle.jvmargs=-Xmx1G -XX:MaxMetaspaceSize=512M +org.gradle.jvmargs=-Xmx1G -XX:MaxMetaspaceSize=768M android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..e18bc253 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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/sass-embedded-host/build.gradle b/sass-embedded-host/build.gradle index bc203d6e..91743a60 100644 --- a/sass-embedded-host/build.gradle +++ b/sass-embedded-host/build.gradle @@ -17,7 +17,7 @@ dependencies { api project(":sass-embedded-bundled") api "org.slf4j:slf4j-api:1.7.36" - compileOnly 'org.jetbrains:annotations:26.0.1' + compileOnly 'org.jetbrains:annotations:26.0.2' compileOnly 'androidx.annotation:annotation-jvm:1.9.1' compileOnly 'com.google.code.findbugs:jsr305:3.0.2' compileOnly 'javax.servlet:javax.servlet-api:4.0.1' @@ -29,7 +29,7 @@ dependencies { optional "org.springframework:spring-core:$spring5Verison" optional "org.springframework:spring-webmvc:$spring5Verison" - testCompileOnly 'org.jetbrains:annotations:26.0.1' + testCompileOnly 'org.jetbrains:annotations:26.0.2' testRuntimeOnly 'org.webjars:bootstrap:5.3.3' } diff --git a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/util/IOUtils.java b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/util/IOUtils.java index e911cb99..e22e3a71 100644 --- a/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/util/IOUtils.java +++ b/sass-embedded-host/src/main/java/de/larsgrefer/sass/embedded/util/IOUtils.java @@ -50,7 +50,9 @@ void unzip(ZipInputStream zipInputStream, Path targetPath) throws IOException { } else { ensureDirectory(entryFile.getParentFile()); - Files.copy(zipInputStream, entryPath, StandardCopyOption.REPLACE_EXISTING); + if (Files.notExists(entryPath) || !entryFile.exists()) { + Files.copy(zipInputStream, entryPath, StandardCopyOption.REPLACE_EXISTING); + } } zipInputStream.closeEntry(); diff --git a/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/connection/BundledPackageProviderTest.java b/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/connection/BundledPackageProviderTest.java index f20c437a..3052dff8 100644 --- a/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/connection/BundledPackageProviderTest.java +++ b/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/connection/BundledPackageProviderTest.java @@ -4,7 +4,7 @@ import java.io.IOException; -import static org.junit.jupiter.api.Assertions.*; + class BundledPackageProviderTest { BundledPackageProvider bundledPackageProvider = new BundledPackageProvider(); diff --git a/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/connection/DartSassPackageProviderTest.java b/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/connection/DartSassPackageProviderTest.java new file mode 100644 index 00000000..18078f58 --- /dev/null +++ b/sass-embedded-host/src/test/java/de/larsgrefer/sass/embedded/connection/DartSassPackageProviderTest.java @@ -0,0 +1,36 @@ +package de.larsgrefer.sass.embedded.connection; + +import de.larsgrefer.sass.embedded.SassCompiler; +import de.larsgrefer.sass.embedded.SassCompilerFactory; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +class DartSassPackageProviderTest { + + DartSassPackageProvider dartSassPackageProvider; + + @BeforeEach + void setUp() { + dartSassPackageProvider = new BundledPackageProvider(); + } + + @Test + void testConcurrentAccess() throws IOException { + + try (SassCompiler compiler = SassCompilerFactory.bundled()) { + assertThat(compiler.getVersion()).isNotNull(); + + dartSassPackageProvider.extractPackage(); + assertThat(compiler.getVersion()).isNotNull(); + + dartSassPackageProvider.extractPackage(); + assertThat(compiler.getVersion()).isNotNull(); + } + + } +} \ No newline at end of file diff --git a/sass-embedded-protocol/build.gradle b/sass-embedded-protocol/build.gradle index c890a323..89cb7382 100644 --- a/sass-embedded-protocol/build.gradle +++ b/sass-embedded-protocol/build.gradle @@ -19,7 +19,7 @@ repositories { } } -def protobufVersion = "4.29.2" +def protobufVersion = "4.29.3" tasks.withType(com.google.protobuf.gradle.ProtobufExtract).configureEach { doFirst { diff --git a/settings.gradle b/settings.gradle index 4770abf6..21a93ef9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,9 +11,9 @@ pluginManagement { } plugins { - id 'io.freefair.settings.plugin-versions' version '8.11' + id 'io.freefair.settings.plugin-versions' version '8.12' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' - id "com.gradle.develocity" version "3.19" + id "com.gradle.develocity" version "3.19.1" } rootProject.name = 'dart-sass-java'