Skip to content

Commit 611bc04

Browse files
wakingrufuswakingrufus
committed
update checkout action to v6
update plugins
1 parent c8d1a3d commit 611bc04

File tree

8 files changed

+69
-61
lines changed

8 files changed

+69
-61
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
java: [17, 21, 25]
1515
name: Gradle Build without Publish
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1818
- name: Setup git user
1919
run: |
2020
git config --global user.name "Nebula Plugin Maintainers"

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
2222
NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525
- name: Setup git user
2626
run: |
2727
git config --global user.name "Nebula Plugin Maintainers"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ When authoring rules about the usage of your own library code, it is recommended
6565
same project as the library code. The ArchRules plugin will publish the rules in a separate Jar, and the Runner plugin
6666
will select that jar for running rules, but these rule classes will not end up in the runtime classpath.
6767

68-
You may also create a "standalone" rules library which contains only `archRules` sources, and not `main` sources. These are useful when you want to write rules a bout libraries you do not control. They can be applied to downstream project's `archRules` configuration so that the Runner plugin will run these rules against any source set.
68+
You may also create a "standalone" rules library which contains only `archRules` sources, and not `main` sources. These are useful when you want to write rules about libraries you do not control. They can be applied to downstream project's `archRules` configuration so that the Runner plugin will run these rules against any source set.
6969

7070
#### Dependencies
7171

‎nebula-archrules-core/build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ plugins {
22
id("com.netflix.nebula.library")
33
}
44
description = "Core library for authoring and running Nebula ArchRules"
5-
repositories {
6-
mavenCentral()
7-
}
85
dependencies {
96
api("com.tngtech.archunit:archunit:1.4.1")
107
testImplementation("org.assertj:assertj-core:3.27.6")

‎nebula-archrules-gradle-plugin/build.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ plugins {
33
`kotlin-dsl`
44
}
55
description = "Plugins for authoring and running Nebula ArchRules"
6-
repositories {
7-
mavenCentral()
8-
}
96
dependencies {
107
implementation(project(":nebula-archrules-core"))
118
implementation("tools.jackson.core:jackson-databind:3.0.2")
@@ -49,4 +46,4 @@ testing {
4946
}
5047
dependencyLocking {
5148
lockAllConfigurations()
52-
}
49+
}

‎nebula-archrules-gradle-plugin/gradle.lockfile‎

Lines changed: 57 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,71 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
cglib:cglib-nodep:3.2.2=testRuntimeClasspath
5-
com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6-
com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testRuntimeClasspath
5+
com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6+
com.jayway.jsonpath:json-path:2.9.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
77
com.netflix.nebula:archrules-deprecation:0.4.0=archRules
88
com.netflix.nebula:archrules-joda:0.4.0=archRules
9+
com.netflix.nebula:archrules-nullability:0.4.0=archRules
910
com.netflix.nebula:archrules-testing-frameworks:0.4.0=archRules
10-
com.netflix.nebula:nebula-archrules-core:0.3.0=archRules
11-
com.netflix.nebula:nebula-test:11.9.0=testCompileClasspath,testRuntimeClasspath
12-
com.tngtech.archunit:archunit:1.4.1=archRules,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
13-
net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
14-
net.javacrumbs.json-unit:json-unit-assertj:5.0.0=testCompileClasspath,testRuntimeClasspath
15-
net.javacrumbs.json-unit:json-unit-core:5.0.0=testCompileClasspath,testRuntimeClasspath
16-
net.javacrumbs.json-unit:json-unit-json-path:5.0.0=testCompileClasspath,testRuntimeClasspath
17-
net.minidev:accessors-smart:2.5.0=testRuntimeClasspath
18-
net.minidev:json-smart:2.5.0=testRuntimeClasspath
19-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
20-
org.assertj:assertj-core:3.27.6=testCompileClasspath,testRuntimeClasspath
21-
org.hamcrest:hamcrest-core:3.0=testCompileClasspath,testRuntimeClasspath
22-
org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
11+
com.netflix.nebula:nebula-archrules-core:0.3.0=archRules,testArchRulesRuntime
12+
com.netflix.nebula:nebula-test:11.9.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
13+
com.tngtech.archunit:archunit:1.4.1=archRules,compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
14+
io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
15+
net.bytebuddy:byte-buddy:1.17.7=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
16+
net.javacrumbs.json-unit:json-unit-assertj:5.0.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
17+
net.javacrumbs.json-unit:json-unit-core:5.0.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
18+
net.javacrumbs.json-unit:json-unit-json-path:5.0.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
19+
net.minidev:accessors-smart:2.5.0=testArchRulesRuntime,testRuntimeClasspath
20+
net.minidev:json-smart:2.5.0=testArchRulesRuntime,testRuntimeClasspath
21+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
22+
org.assertj:assertj-core:3.27.6=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
23+
org.hamcrest:hamcrest-core:3.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
24+
org.hamcrest:hamcrest:3.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
25+
org.jetbrains.kotlin:abi-tools-api:2.2.0=kotlinInternalAbiValidation
26+
org.jetbrains.kotlin:abi-tools:2.2.0=kotlinInternalAbiValidation
2327
org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:2.2.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
2428
org.jetbrains.kotlin:kotlin-build-tools-api:2.2.0=kotlinBuildToolsApiClasspath
2529
org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.0=kotlinBuildToolsApiClasspath
26-
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
30+
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
2731
org.jetbrains.kotlin:kotlin-compiler-runner:2.2.0=kotlinBuildToolsApiClasspath
2832
org.jetbrains.kotlin:kotlin-daemon-client:2.2.0=kotlinBuildToolsApiClasspath
29-
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
30-
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
31-
org.jetbrains.kotlin:kotlin-reflect:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
33+
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
34+
org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.0=kotlinKlibCommonizerClasspath
35+
org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.0=kotlinInternalAbiValidation
36+
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
37+
org.jetbrains.kotlin:kotlin-reflect:2.2.0=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
3238
org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:2.2.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
33-
org.jetbrains.kotlin:kotlin-script-runtime:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
34-
org.jetbrains.kotlin:kotlin-scripting-common:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
35-
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
36-
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
37-
org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
38-
org.jetbrains.kotlin:kotlin-stdlib:2.2.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
39-
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
40-
org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
41-
org.json:json:20250517=testCompileClasspath,testRuntimeClasspath
42-
org.jspecify:jspecify:1.0.0=archRules,testCompileClasspath,testRuntimeClasspath
43-
org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
39+
org.jetbrains.kotlin:kotlin-script-runtime:2.2.0=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
40+
org.jetbrains.kotlin:kotlin-scripting-common:2.2.0=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
41+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.0=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
42+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.0=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
43+
org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.0=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
44+
org.jetbrains.kotlin:kotlin-stdlib:2.2.0=compileClasspath,compileOnlyDependenciesMetadata,compilePluginsBlocksPluginClasspathElements,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
45+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
46+
org.jetbrains:annotations:13.0=compileClasspath,compilePluginsBlocksPluginClasspathElements,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,testArchRulesRuntime,testCompileClasspath,testRuntimeClasspath
47+
org.json:json:20250517=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
48+
org.jspecify:jspecify:1.0.0=archRules,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
49+
org.junit.jupiter:junit-jupiter-api:5.12.2=testArchRulesRuntime
50+
org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
51+
org.junit.jupiter:junit-jupiter-engine:5.12.2=testArchRulesRuntime
4452
org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath
45-
org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath
46-
org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath
47-
org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
48-
org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
49-
org.junit.platform:junit-platform-launcher:1.14.1=testCompileClasspath,testRuntimeClasspath
50-
org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
53+
org.junit.jupiter:junit-jupiter-params:5.12.2=testArchRulesRuntime
54+
org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55+
org.junit.jupiter:junit-jupiter:5.12.2=testArchRulesRuntime
56+
org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
57+
org.junit.platform:junit-platform-commons:1.12.2=testArchRulesRuntime
58+
org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
59+
org.junit.platform:junit-platform-engine:1.12.2=testArchRulesRuntime
60+
org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
61+
org.junit.platform:junit-platform-launcher:1.12.2=testArchRulesRuntime
62+
org.junit.platform:junit-platform-launcher:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
63+
org.junit:junit-bom:5.12.2=testArchRulesRuntime
64+
org.junit:junit-bom:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5165
org.objenesis:objenesis:2.4=testRuntimeClasspath
52-
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
53-
org.ow2.asm:asm:9.3=testRuntimeClasspath
54-
org.slf4j:slf4j-api:2.0.17=archRules,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
55-
tools.jackson.core:jackson-core:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
56-
tools.jackson.core:jackson-databind:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
57-
tools.jackson:jackson-bom:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
58-
empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions
66+
org.opentest4j:opentest4j:1.3.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
67+
org.ow2.asm:asm:9.3=testArchRulesRuntime,testRuntimeClasspath
68+
org.slf4j:slf4j-api:2.0.17=archRules,compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
69+
tools.jackson.core:jackson-core:3.0.2=compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
70+
tools.jackson.core:jackson-databind:3.0.2=compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
71+
tools.jackson:jackson-bom:3.0.2=compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
72+
empty=annotationProcessor,apiDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

‎nebula-archrules-gradle-plugin/src/main/kotlin/com/netflix/nebula/archrules/gradle/ArchrulesRunnerPlugin.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ class ArchrulesRunnerPlugin : Plugin<Project> {
6464
fun Project.configureCheckTaskForSourceSet(sourceSet: SourceSet, ext: ArchrulesExtension) {
6565
val archRulesReportDir = project.layout.buildDirectory.dir("reports/archrules")
6666
val sourceSetArchRulesRuntime = configurations.resolvable(sourceSet.name + "ArchRulesRuntime") {
67-
extendsFrom(configurations.getByName(sourceSet.runtimeClasspathConfigurationName))
67+
extendsFrom(
68+
project.configurations.getByName("archRules"),
69+
configurations.getByName(sourceSet.runtimeClasspathConfigurationName)
70+
)
6871
attributes {
6972
attribute(ArchRuleAttribute.ARCH_RULES_ATTRIBUTE, project.objects.named<ArchRuleAttribute>(ARCH_RULES))
7073
}
7174
}
7275
tasks.register<CheckRulesTask>("checkArchRules" + sourceSet.name.capitalized()) {
7376
description = "Checks ArchRules on ${sourceSet.name}"
74-
rulesClasspath.setFrom(
75-
sourceSetArchRulesRuntime,
76-
project.configurations.getByName("archRules")
77-
)
77+
rulesClasspath.setFrom(sourceSetArchRulesRuntime)
7878
dataFile.set(archRulesReportDir.map {
7979
it.file(sourceSet.name + ".data").asFile
8080
})

‎settings.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pluginManagement {
22
plugins {
3-
id("com.netflix.nebula.root") version ("25.0.2")
4-
id("com.netflix.nebula.plugin-plugin") version ("25.0.2")
5-
id("com.netflix.nebula.library") version ("25.0.2")
3+
id("com.netflix.nebula.root") version ("25.+")
4+
id("com.netflix.nebula.plugin-plugin") version ("25.+")
5+
id("com.netflix.nebula.library") version ("25.+")
66
}
77
}
88
plugins {

0 commit comments

Comments
 (0)