From f227a0094fc844dfa75c00e73ecfc703a6612f73 Mon Sep 17 00:00:00 2001 From: John Burns Date: Wed, 27 May 2026 10:09:48 -0500 Subject: [PATCH] update archrule libraries to 1.+ --- build.gradle.kts | 5 +++++ gradle.lockfile | 18 +++++++++--------- .../plugin/plugin/NebulaPluginPlugin.groovy | 2 +- .../nebula/plugin/plugin/ArchRulesUtil.java | 3 +-- .../plugin/plugin/NebulaLibraryPluginTest.kt | 1 + 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d1cf4c1..bb7a437 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,6 +70,11 @@ gradlePlugin { description = "Sets up publishing and release process for Nebula Libraries" implementationClass = "nebula.plugin.plugin.NebulaLibraryPlugin" tags.set(listOf("nebula")) + compatibility { + features { + configurationCache = true + } + } } create("com.netflix.nebula.root") { id = "com.netflix.nebula.root" diff --git a/gradle.lockfile b/gradle.lockfile index 5401800..451c66a 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -48,7 +48,7 @@ com.netflix.nebula:nebula-oss-publishing-plugin:4.1.1=compileClasspath,runtimeCl com.netflix.nebula:nebula-project-plugin:13.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:nebula-publishing-plugin:23.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:nebula-release-plugin:21.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:nebula-test:12.3.0=testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-test:12.4.2=testCompileClasspath,testRuntimeClasspath com.networknt:json-schema-validator:1.0.76=testCompileClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.28=testCompileClasspath,testRuntimeClasspath com.perforce:p4java:2015.2.1365273=runtimeClasspath,testRuntimeClasspath @@ -143,14 +143,14 @@ org.jetbrains.kotlin:kotlin-stdlib:2.2.0=runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=compileClasspath,embeddedKotlin,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,embeddedKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.14.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.14.3=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.14.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.14.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.14.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.4=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.4=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.4=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.4=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.4=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.4=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.4=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.4=testCompileClasspath,testRuntimeClasspath org.mock-server:mockserver-client-java:5.15.0=testCompileClasspath,testRuntimeClasspath org.mock-server:mockserver-core:5.15.0=testCompileClasspath,testRuntimeClasspath org.mock-server:mockserver-netty:5.15.0=testCompileClasspath,testRuntimeClasspath diff --git a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy index 2a9624d..04bbd94 100644 --- a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy +++ b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy @@ -80,7 +80,7 @@ class NebulaPluginPlugin implements Plugin { } ArchRulesUtil.setupArchRules(project) if (project.name != "archrules-gradle-plugin-development") { - project.getDependencies().add("archRules", "com.netflix.nebula:archrules-gradle-plugin-development:0.+") + project.getDependencies().add("archRules", "com.netflix.nebula:archrules-gradle-plugin-development:1.+") } project.with { PLUGIN_IDS.each { plugins.apply(it) } diff --git a/src/main/java/nebula/plugin/plugin/ArchRulesUtil.java b/src/main/java/nebula/plugin/plugin/ArchRulesUtil.java index 38bf474..179cdde 100644 --- a/src/main/java/nebula/plugin/plugin/ArchRulesUtil.java +++ b/src/main/java/nebula/plugin/plugin/ArchRulesUtil.java @@ -15,12 +15,11 @@ private ArchRulesUtil() { static void setupArchRules(Project project) { // avoid circular dependencies in core libraries if (!Set.of("nebula-archrules-core", "archrules-common").contains(project.getName())) { - String nebulaRulesVersion = "0.+"; + String nebulaRulesVersion = "1.+"; project.getPlugins().apply("com.netflix.nebula.archrules.runner"); final var nebulaRules = List.of( "archrules-deprecation", "archrules-guava", - "archrules-javax", "archrules-joda", "archrules-testing-frameworks", "archrules-nullability", diff --git a/src/test/kotlin/nebula/plugin/plugin/NebulaLibraryPluginTest.kt b/src/test/kotlin/nebula/plugin/plugin/NebulaLibraryPluginTest.kt index 6295eb9..445a6d0 100644 --- a/src/test/kotlin/nebula/plugin/plugin/NebulaLibraryPluginTest.kt +++ b/src/test/kotlin/nebula/plugin/plugin/NebulaLibraryPluginTest.kt @@ -46,6 +46,7 @@ internal class NebulaLibraryPluginTest { val runner = testProject(projectDir) { properties { buildCache(true) + configurationCache(true) } rootProject { plugins {