diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0a5efc33..4b37efa9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,11 +13,6 @@ updates: interval: "weekly" # Maintain dependencies for Gradle - - package-ecosystem: "gradle" - directory: "/" - target-branch: "3.x" - schedule: - interval: "daily" - package-ecosystem: "gradle" directory: "/" target-branch: "4.x" diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 77511d43..ba3e7f26 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.3.1 + uses: codecov/codecov-action@v5.4.0 with: files: jacoco*.xml,*Jacoco*.xml diff --git a/build.gradle b/build.gradle index 6f664191..68d6fb30 100644 --- a/build.gradle +++ b/build.gradle @@ -46,11 +46,12 @@ allprojects { dependencies { testImplementation 'org.assertj:assertj-core:3.26.3' - testImplementation platform("org.junit:junit-bom:5.11.4") + testImplementation platform("org.junit:junit-bom:5.12.1") testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - testImplementation 'ch.qos.logback:logback-classic:1.5.16' + testImplementation 'ch.qos.logback:logback-classic:1.5.18' } tasks.withType(Test).configureEach { diff --git a/gradle.properties b/gradle.properties index fe7b5e87..e3df1f0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ -dartSassVersion=1.83.4 +dartSassVersion=1.86.0 embeddedProtocolVersion=3.1.0 spring5Verison=5.3.39 -spring6Version=6.1.13 +spring6Version=6.2.5 org.gradle.caching=true org.gradle.parallel=true -org.gradle.jvmargs=-Xmx1G -XX:MaxMetaspaceSize=768M +org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=768M -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..9bbc975c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc253..37f853b1 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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b..faf93008 100755 --- a/gradlew +++ b/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/sass-embedded-protocol/build.gradle b/sass-embedded-protocol/build.gradle index 89cb7382..940b5b8b 100644 --- a/sass-embedded-protocol/build.gradle +++ b/sass-embedded-protocol/build.gradle @@ -19,7 +19,7 @@ repositories { } } -def protobufVersion = "4.29.3" +def protobufVersion = "4.29.4" tasks.withType(com.google.protobuf.gradle.ProtobufExtract).configureEach { doFirst { diff --git a/settings.gradle b/settings.gradle index 21a93ef9..a619fe33 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,9 +11,9 @@ pluginManagement { } plugins { - id 'io.freefair.settings.plugin-versions' version '8.12' + id 'io.freefair.settings.plugin-versions' version '8.13' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' - id "com.gradle.develocity" version "3.19.1" + id "com.gradle.develocity" version "3.19.2" } rootProject.name = 'dart-sass-java' diff --git a/test-projects/android-app/build.gradle b/test-projects/android-app/build.gradle index ac5a37ff..39619072 100644 --- a/test-projects/android-app/build.gradle +++ b/test-projects/android-app/build.gradle @@ -35,7 +35,7 @@ android { dependencies { implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' + implementation 'androidx.coordinatorlayout:coordinatorlayout:1.3.0' implementation project(":sass-embedded-android") } diff --git a/test-projects/graalvm/build.gradle b/test-projects/graalvm/build.gradle index cec7eb74..fa69b2d2 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.4' + id 'org.graalvm.buildtools.native' version '0.10.6' } java { diff --git a/test-projects/spring-boot-resources/build.gradle b/test-projects/spring-boot-resources/build.gradle index cb08e2ea..a8bdc667 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.1' + id 'org.springframework.boot' version '3.4.4' id 'io.spring.dependency-management' version '1.1.7' id 'java' }