Merge branch 'TNG:main' into issue-768

Author: ttho

.github/workflows/build.yml

@@ -15,16 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Java
-        uses: actions/setup-java@v4.7.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.build_java_version }}
+      - name: Set Up Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Build
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: build
+        run: ./gradlew build
       - name: Check project files unmodified
         run: |
           directoryState="$(git status --porcelain)"
@@ -51,19 +51,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Build JDK
-        uses: actions/setup-java@v4.7.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.build_java_version }}
       - name: Set up Test JDK
-        uses: actions/setup-java@v4.7.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.test_java_version }}
       - name: Provide installed JDKs
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         id: provideJdkPaths
         with:
           script: |
@@ -77,13 +77,12 @@ jobs:
                 }
               }
             }
+      - name: Set Up Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Test
-        uses: gradle/actions/setup-gradle@v3
+        run: ./gradlew test -PallTests -PtestJavaVersion=${{ matrix.test_java_version }} "-Porg.gradle.java.installations.paths=${{ env.test_jdk_path }}"
         env:
           JAVA_HOME: ${{ env.build_jdk_path }}
-        with:
-          arguments: test -PallTests -PtestJavaVersion=${{ matrix.test_java_version }} -Porg.gradle.java.installations.paths=${{ env.test_jdk_path }}
-          cache-disabled: true
 
   integration-test:
     strategy:
@@ -101,19 +100,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Build JDK
-        uses: actions/setup-java@v4.7.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.build_java_version }}
       - name: Set up Test JDK
-        uses: actions/setup-java@v4.7.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.test_java_version }}
       - name: Provide installed JDKs
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         id: provideJdkPaths
         with:
           script: |
@@ -127,15 +126,13 @@ jobs:
                 }
               }
             }
+      - name: Set Up Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Publish to Maven Local
-        uses: gradle/actions/setup-gradle@v3
+        run: ./gradlew build -xtest -xspotbugsMain -xjavadoc publishToMavenLocal
         env:
           JAVA_HOME: ${{ env.build_jdk_path }}
-        with:
-          arguments: build -xtest -xspotbugsMain -xjavadoc publishToMavenLocal
       - name: Integration test
-        uses: gradle/actions/setup-gradle@v3
+        run: ./gradlew runMavenTest -PtestJavaVersion=${{ matrix.test_java_version }} "-Porg.gradle.java.installations.paths=${{ env.test_jdk_path }}"
         env:
           JAVA_HOME: ${{ env.build_jdk_path }}
-        with:
-          arguments: runMavenTest -PtestJavaVersion=${{ matrix.test_java_version }} -Porg.gradle.java.installations.paths=${{ env.test_jdk_path }}

.github/workflows/check-dependencies.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+      - name: Set Up Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Check for dependency updates
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: checkDependencyUpdates -DoutputFormatter=plain,json
+        run: ./gradlew checkDependencyUpdates -DoutputFormatter=plain,json
       - name: Create issue/comment if ASM is not up-to-date
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         env:
           GITHUB_SERVER_URL: ${{github.server_url}}
           GITHUB_REPOSITORY: ${{github.repository}}

.github/workflows/gradle-wrapper-validation.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install Gradle JDK
-        uses: actions/setup-java@v4.7.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'zulu'
           java-version: 17

.github/workflows/update-gradle-wrapper.yml

@@ -17,7 +17,7 @@ framework.
 ###### Gradle
 
 ```
-testImplementation 'com.tngtech.archunit:archunit:1.4.0'
+testImplementation 'com.tngtech.archunit:archunit:1.4.1'
 ```
 
 ###### Maven
@@ -26,7 +26,7 @@ testImplementation 'com.tngtech.archunit:archunit:1.4.0'
 <dependency>
     <groupId>com.tngtech.archunit</groupId>
     <artifactId>archunit</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <scope>test</scope>
 </dependency>
 ```

README.md

@@ -7,9 +7,9 @@ ext.moduleName = 'com.tngtech.archunit.thirdpartytest'
 dependencies {
     testImplementation project(path: ':archunit', configuration: 'shadow')
     testImplementation project(path: ':archunit', configuration: 'tests')
-    testImplementation dependency.springBootLoader
+    testImplementation exampleLibs.springBootLoader
     dependency.addGuava { dependencyNotation, config -> testImplementation(dependencyNotation, config) }
-    testImplementation dependency.junit4
-    testImplementation dependency.junit_dataprovider
-    testImplementation dependency.assertj
+    testImplementation libs.junit4
+    testImplementation libs.junitDataprovider
+    testImplementation libs.assertj
 }

archunit-3rd-party-test/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 
     // we still use JUnit 4 as the test runner, but we don't use JUnit 4 support within this project
     // so tests could well be run using TestNG, etc.
-    testImplementation dependency.junit4
+    testImplementation libs.junit4
 }
 
 test {

archunit-example/example-plain/build.gradle

@@ -5,6 +5,7 @@
 import com.tngtech.archunit.core.importer.ClassFileImporter;
 import com.tngtech.archunit.example.cycles.complexcycles.slice1.SliceOneCallingConstructorInSliceTwoAndMethodInSliceThree;
 import com.tngtech.archunit.example.cycles.complexcycles.slice3.ClassCallingConstructorInSliceFive;
+import com.tngtech.archunit.lang.Priority;
 import com.tngtech.archunit.library.dependencies.SliceAssignment;
 import com.tngtech.archunit.library.dependencies.SliceIdentifier;
 import org.junit.Test;
@@ -80,7 +81,7 @@ public void no_cycles_in_complex_scenario_with_custom_ignore() {
 
     @Test
     public void no_cycles_in_freely_customized_slices() {
-        slices().assignedFrom(inComplexSliceOneOrTwo())
+        slices().assignedFrom(inComplexSliceOneOrTwo(), Priority.HIGH)
                 .namingSlices("$1[$2]")
                 .should().beFreeOfCycles()
                 .check(classes);

archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/CyclicDependencyRulesTest.java

@@ -7,8 +7,8 @@ ext.moduleName = 'com.tngtech.archunit.integrationtest'
 ext.minimumJavaVersion = JavaVersion.VERSION_1_8
 
 dependencies {
-    testImplementation dependency.junitPlatform
-    testImplementation dependency.assertj
+    testImplementation libs.junitPlatform
+    testImplementation libs.assertj
     testImplementation project(path: ':archunit', configuration: 'tests')
     testImplementation project(path: ':archunit-junit4')
     testImplementation project(path: ':archunit-junit5-api')

archunit-integration-test/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'archunit.java-conventions'
-    id 'org.javamodularity.moduleplugin' version '1.8.15'
+    id 'org.javamodularity.moduleplugin' version '2.0.0'
 }
 
 ext.moduleName = 'com.tngtech.archunit.javamodulestest'