Skip to content

Commit a44db3b

Browse files
wakingrufuswakingrufus
committed
fix configuration cache issue
temporarily disable configuration cache in this project until the fix makes it back around to this project
1 parent 2f93095 commit a44db3b

File tree

5 files changed

+36
-28
lines changed

5 files changed

+36
-28
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
org.gradle.caching=true
2-
org.gradle.configuration-cache=true
2+
org.gradle.configuration-cache=false
33
systemProp.nebula.features.coreLockingSupport=true
44
nebula.integTest=false

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,18 @@ configurations.named("testArchRulesRuntime").configure {
5353
all {
5454
val requestedProject = requested
5555
if (requestedProject is ProjectComponentSelector) {
56-
useTarget("com.netflix.nebula" + requestedProject.projectPath + ":0.3.0")
56+
useTarget("com.netflix.nebula" + requestedProject.projectPath + ":latest.release")
57+
}
58+
}
59+
}
60+
}
61+
configurations.named("mainArchRulesRuntime").configure {
62+
resolutionStrategy.dependencySubstitution {
63+
// workaround for classpath issue
64+
all {
65+
val requestedProject = requested
66+
if (requestedProject is ProjectComponentSelector) {
67+
useTarget("com.netflix.nebula" + requestedProject.projectPath + ":latest.release")
5768
}
5869
}
5970
}

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

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
cglib:cglib-nodep:3.2.2=testRuntimeClasspath
55
com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
66
com.jayway.jsonpath:json-path:2.9.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7-
com.netflix.nebula:archrules-deprecation:0.4.0=archRules
8-
com.netflix.nebula:archrules-joda:0.4.0=archRules
9-
com.netflix.nebula:archrules-nullability:0.4.0=archRules
10-
com.netflix.nebula:archrules-testing-frameworks:0.4.0=archRules
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
7+
com.netflix.nebula:archrules-deprecation:0.4.0=archRules,mainArchRulesRuntime,testArchRulesRuntime
8+
com.netflix.nebula:archrules-joda:0.4.0=archRules,mainArchRulesRuntime,testArchRulesRuntime
9+
com.netflix.nebula:archrules-nullability:0.4.0=archRules,mainArchRulesRuntime,testArchRulesRuntime
10+
com.netflix.nebula:archrules-testing-frameworks:0.4.0=archRules,mainArchRulesRuntime,testArchRulesRuntime
11+
com.netflix.nebula:nebula-archrules-core:0.3.0=archRules
12+
com.netflix.nebula:nebula-archrules-core:0.5.2=mainArchRulesRuntime,testArchRulesRuntime
13+
com.netflix.nebula:nebula-test:11.10.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1314
com.tngtech.archunit:archunit:1.4.1=archRules,compileClasspath,implementationDependenciesMetadata,mainArchRulesRuntime,runtimeClasspath,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1415
io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
1516
net.bytebuddy:byte-buddy:1.17.7=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
@@ -45,23 +46,15 @@ org.jetbrains.kotlin:kotlin-stdlib:2.2.0=compileClasspath,compileOnlyDependencie
4546
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
4647
org.jetbrains:annotations:13.0=compileClasspath,compilePluginsBlocksPluginClasspathElements,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,testArchRulesRuntime,testCompileClasspath,testRuntimeClasspath
4748
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
52-
org.junit.jupiter:junit-jupiter-engine:5.14.1=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
49+
org.jspecify:jspecify:1.0.0=archRules,mainArchRulesRuntime,testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
50+
org.junit.jupiter:junit-jupiter-api:5.14.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
51+
org.junit.jupiter:junit-jupiter-engine:5.14.1=testArchRulesRuntime,testRuntimeClasspath
52+
org.junit.jupiter:junit-jupiter-params:5.14.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
53+
org.junit.jupiter:junit-jupiter:5.14.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
54+
org.junit.platform:junit-platform-commons:1.14.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55+
org.junit.platform:junit-platform-engine:1.14.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
56+
org.junit.platform:junit-platform-launcher:1.14.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
57+
org.junit:junit-bom:5.14.1=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6558
org.objenesis:objenesis:2.4=testRuntimeClasspath
6659
org.opentest4j:opentest4j:1.3.0=testArchRulesRuntime,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6760
org.ow2.asm:asm:9.3=testArchRulesRuntime,testRuntimeClasspath

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ class ArchrulesRunnerPlugin : Plugin<Project> {
8080
})
8181
sourcesToCheck.from(sourceSet.output.classesDirs)
8282
dependsOn(project.tasks.named(sourceSet.classesTaskName))
83-
onlyIf { !ext.sourceSetsToSkip.get().contains(sourceSet.name) }
83+
val sourceSetName = sourceSet.name
84+
onlyIf { !ext.sourceSetsToSkip.get().contains(sourceSetName) }
8485
}
8586
}
8687
}

‎nebula-archrules-gradle-plugin/src/test/kotlin/com/netflix/nebula/archrules/gradle/ArchrulesRunnerPluginTest.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class ArchrulesRunnerPluginTest {
4848
val runner = testProject(projectDir) {
4949
properties {
5050
gradleCache(true)
51+
property("org.gradle.configuration-cache", "true")
5152
}
5253
settings {
5354
name("consumer")
@@ -356,7 +357,8 @@ archRules {
356357
exampleDeprecatedUsage("FailingCodeTest")
357358
}
358359
}
359-
rawBuildScript("""
360+
rawBuildScript(
361+
"""
360362
archRules {
361363
skipPassingSummaries = true
362364
}
@@ -461,7 +463,8 @@ archRules {
461463
exampleDeprecatedUsage("FailingCodeTest")
462464
}
463465
}
464-
rawBuildScript("""
466+
rawBuildScript(
467+
"""
465468
archRules {
466469
skipSourceSet("test")
467470
}

0 commit comments

Comments
 (0)