diff --git a/.github/workflows/build_master.yml b/.github/workflows/build_master.yml index 456e6dd..e406443 100644 --- a/.github/workflows/build_master.yml +++ b/.github/workflows/build_master.yml @@ -16,11 +16,12 @@ jobs: with: fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: 'temurin' - name: Gradle caches - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/build_standard.yml b/.github/workflows/build_standard.yml index 08e0b4c..05a8211 100644 --- a/.github/workflows/build_standard.yml +++ b/.github/workflows/build_standard.yml @@ -15,11 +15,12 @@ jobs: with: fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: 'temurin' - name: Gradle caches - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aea45aa..f618840 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,11 +14,12 @@ jobs: with: fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: 'temurin' - name: Gradle caches - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/build.gradle b/build.gradle index 72daee9..370f846 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'jacoco' id 'maven-publish' id 'signing' - id 'nebula.release' version '13.0.0' + id 'nebula.release' version '20.2.0' } group 'org.contextmapper' @@ -24,6 +24,7 @@ dependencies { testImplementation "org.assertj:assertj-core:${assertJVersion}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}" + testRuntimeOnly "org.junit.platform:junit-platform-launcher" } sourceSets.test.java.srcDirs = ['src/test/java','src/test/cml'] @@ -34,8 +35,8 @@ test { jacocoTestReport { reports { - xml.enabled true - html.enabled true + xml.required = true + html.required = true } } diff --git a/gradle.properties b/gradle.properties index ab60efc..8cea257 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ ossSnapshotRepository=https://oss.sonatype.org/content/repositories/snapshots/ ossReleaseStagingRepository=https://oss.sonatype.org/service/local/staging/deploy/maven2/ # dependency versions -jUnitVersion=5.9.2 -assertJVersion=3.24.2 -archUnitVersion=1.0.1 +jUnitVersion=5.12.2 +assertJVersion=3.27.3 +archUnitVersion=1.4.1 cmlVersion=6.7.0 -jmoleculesVersion=1.6.0 +jmoleculesVersion=1.10.0 xtendLibVersion=2.19.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..5c82cb0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists