Skip to content

Commit ed10863

Browse files
xenoterracidexenoterracide
committed
fix: update depenendency analysis plugin
1 parent 31486a2 commit ed10863

File tree

7 files changed

+45
-37
lines changed

7 files changed

+45
-37
lines changed

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
1515
implementation(libs.plugin.convention.publish)
1616
implementation(libs.plugin.errorprone)
17+
implementation(libs.plugin.dependency.analysis)
1718

1819
runtimeOnly(libs.plugin.convention.checkstyle)
1920
runtimeOnly(libs.plugin.convention.coverage)

‎buildSrc/gradle.lockfile‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,62 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4+
com.autonomousapps:antlr:4.13.2.0=buildScriptClasspath,runtimeClasspath
5+
com.autonomousapps:asm-relocated:9.7.1.0=buildScriptClasspath,runtimeClasspath
6+
com.autonomousapps:dependency-analysis-gradle-plugin:2.18.0=buildScriptClasspath,compileClasspath,runtimeClasspath
7+
com.autonomousapps:graph-support:0.6=buildScriptClasspath,runtimeClasspath
8+
com.autonomousapps:kotlin-editor-relocated:0.18.0=buildScriptClasspath,runtimeClasspath
9+
com.github.ben-manes.caffeine:caffeine:3.1.8=buildScriptClasspath,runtimeClasspath
410
com.github.spotbugs.snom:spotbugs-gradle-plugin:6.2.0=buildScriptClasspath,runtimeClasspath
511
com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.2.0=buildScriptClasspath,runtimeClasspath
12+
com.google.code.findbugs:jsr305:3.0.2=buildScriptClasspath,runtimeClasspath
13+
com.google.errorprone:error_prone_annotations:2.28.0=buildScriptClasspath,runtimeClasspath
14+
com.google.guava:failureaccess:1.0.2=buildScriptClasspath,runtimeClasspath
15+
com.google.guava:guava:33.3.1-jre=buildScriptClasspath,runtimeClasspath
16+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=buildScriptClasspath,runtimeClasspath
17+
com.google.j2objc:j2objc-annotations:3.0.0=buildScriptClasspath,runtimeClasspath
18+
com.squareup.moshi:moshi-adapters:1.15.0=buildScriptClasspath,compileClasspath,runtimeClasspath
19+
com.squareup.moshi:moshi-kotlin:1.15.1=buildScriptClasspath,runtimeClasspath
20+
com.squareup.moshi:moshi:1.15.1=buildScriptClasspath,compileClasspath,runtimeClasspath
21+
com.squareup.okio:okio-bom:3.9.0=buildScriptClasspath,runtimeClasspath
22+
com.squareup.okio:okio-jvm:3.7.0=compileClasspath
23+
com.squareup.okio:okio-jvm:3.9.0=buildScriptClasspath,runtimeClasspath
24+
com.squareup.okio:okio:3.7.0=compileClasspath
25+
com.squareup.okio:okio:3.9.0=buildScriptClasspath,runtimeClasspath
26+
com.squareup:kotlinpoet-jvm:1.15.1=buildScriptClasspath,runtimeClasspath
27+
com.squareup:kotlinpoet:1.15.1=buildScriptClasspath,runtimeClasspath
628
com.xenoterracide.gradle.convention:checkstyle:0.2.2=buildScriptClasspath,runtimeClasspath
729
com.xenoterracide.gradle.convention:coverage:0.2.2=buildScriptClasspath,runtimeClasspath
830
com.xenoterracide.gradle.convention:publish:0.2.2=buildScriptClasspath,compileClasspath,runtimeClasspath
931
com.xenoterracide.gradle.convention:spotbugs:0.2.2=buildScriptClasspath,runtimeClasspath
32+
dev.zacsweers.moshix:moshi-sealed-reflect:0.25.1=buildScriptClasspath,runtimeClasspath
33+
dev.zacsweers.moshix:moshi-sealed-runtime:0.25.1=buildScriptClasspath,compileClasspath,runtimeClasspath
34+
javax.inject:javax.inject:1=buildScriptClasspath,compileClasspath,runtimeClasspath
1035
net.ltgt.gradle:gradle-errorprone-plugin:4.2.0=buildScriptClasspath,compileClasspath,runtimeClasspath
36+
org.checkerframework:checker-qual:3.43.0=buildScriptClasspath,runtimeClasspath
1137
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
1238
org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:2.0.21=kotlinCompilerPluginClasspathMain
39+
org.jetbrains.kotlin:kotlin-bom:2.0.21=buildScriptClasspath,runtimeClasspath
1340
org.jetbrains.kotlin:kotlin-build-common:2.0.21=kotlinBuildToolsApiClasspath
1441
org.jetbrains.kotlin:kotlin-build-tools-api:2.0.21=kotlinBuildToolsApiClasspath
1542
org.jetbrains.kotlin:kotlin-build-tools-impl:2.0.21=kotlinBuildToolsApiClasspath
1643
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
1744
org.jetbrains.kotlin:kotlin-compiler-runner:2.0.21=kotlinBuildToolsApiClasspath
1845
org.jetbrains.kotlin:kotlin-daemon-client:2.0.21=kotlinBuildToolsApiClasspath
1946
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
47+
org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.21=buildScriptClasspath,runtimeClasspath
2048
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
21-
org.jetbrains.kotlin:kotlin-reflect:2.0.21=compileClasspath
49+
org.jetbrains.kotlin:kotlin-reflect:2.0.21=buildScriptClasspath,compileClasspath,runtimeClasspath
2250
org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:2.0.21=kotlinCompilerPluginClasspathMain
2351
org.jetbrains.kotlin:kotlin-script-runtime:2.0.21=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
2452
org.jetbrains.kotlin:kotlin-scripting-common:2.0.21=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
2553
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.0.21=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
2654
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.0.21=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
2755
org.jetbrains.kotlin:kotlin-scripting-jvm:2.0.21=compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
56+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=compileClasspath
57+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21=buildScriptClasspath,runtimeClasspath
58+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=compileClasspath
59+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21=buildScriptClasspath,runtimeClasspath
2860
org.jetbrains.kotlin:kotlin-stdlib:2.0.21=buildScriptClasspath,compileClasspath,compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
2961
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
3062
org.jetbrains:annotations:13.0=buildScriptClasspath,compileClasspath,compilePluginsBlocksPluginClasspathElements,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath

‎buildSrc/src/main/kotlin/our.bom.gradle.kts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// © Copyright 2023-2024 Caleb Cushing
1+
// Copyright 2023 - 2025 Caleb Cushing
2+
//
23
// SPDX-License-Identifier: MIT
34

45
plugins {
@@ -16,10 +17,12 @@ configurations.configureEach {
1617
resolutionStrategy {
1718
componentSelection {
1819
all {
19-
val spotbugs = Regex("^spotbugs.*")
20-
if (!name.matches(spotbugs) && !candidate.module.matches(spotbugs)) {
21-
val nonRelease = Regex("^[\\d.]+-(M|ea|beta|alpha).*$")
20+
val nonRelease = Regex("^[\\d.]+-(RC|M|ea|beta|alpha).*$")
21+
if (candidate.group != "com.xenoterracide") {
2222
if (candidate.version.matches(nonRelease)) reject("no pre-release")
23+
if (candidate.version.endsWith("-SNAPSHOT")) reject("no snapshots")
24+
} else if (candidate.version.matches(nonRelease)) {
25+
logger.info("allowing: {}", candidate)
2326
}
2427

2528
if (candidate.module == "nullaway") {

‎buildSrc/src/main/kotlin/our.convention.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import org.gradle.accessors.dm.LibrariesForLibs
77

88

99
plugins {
10+
id("com.autonomousapps.dependency-analysis")
1011
id("com.xenoterracide.gradle.convention.checkstyle")
1112
id("com.xenoterracide.gradle.convention.coverage")
1213
id("com.xenoterracide.gradle.convention.publish")

‎buildscript-gradle.lockfile‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,12 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.autonomousapps.dependency-analysis:com.autonomousapps.dependency-analysis.gradle.plugin:1.33.0=classpath
5-
com.autonomousapps:antlr:4.10.1.6=classpath
6-
com.autonomousapps:asm-relocated:9.6.0.1=classpath
7-
com.autonomousapps:dependency-analysis-gradle-plugin:1.33.0=classpath
8-
com.autonomousapps:graph-support:0.3=classpath
9-
com.github.ben-manes.caffeine:caffeine:3.1.8=classpath
10-
com.google.code.findbugs:jsr305:3.0.2=classpath
11-
com.google.errorprone:error_prone_annotations:2.26.1=classpath
12-
com.google.guava:failureaccess:1.0.2=classpath
13-
com.google.guava:guava:33.1.0-jre=classpath
14-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
15-
com.squareup.moshi:moshi-adapters:1.15.0=classpath
16-
com.squareup.moshi:moshi-kotlin:1.15.1=classpath
17-
com.squareup.moshi:moshi:1.15.1=classpath
18-
com.squareup.okio:okio-bom:3.9.0=classpath
19-
com.squareup.okio:okio-jvm:3.9.0=classpath
20-
com.squareup.okio:okio:3.9.0=classpath
21-
com.squareup:kotlinpoet-jvm:1.15.1=classpath
22-
com.squareup:kotlinpoet:1.15.1=classpath
234
com.xenoterracide.gradle.semver:com.xenoterracide.gradle.semver.gradle.plugin:0.12.1=classpath
245
com.xenoterracide.gradle:git:0.12.1=classpath
256
com.xenoterracide.gradle:semver:0.12.1=classpath
26-
dev.zacsweers.moshix:moshi-sealed-reflect:0.25.1=classpath
27-
dev.zacsweers.moshix:moshi-sealed-runtime:0.25.1=classpath
287
io.vavr:vavr-match:0.10.6=classpath
298
io.vavr:vavr:0.10.6=classpath
30-
javax.inject:javax.inject:1=classpath
319
org.apache.commons:commons-lang3:3.17.0=classpath
32-
org.checkerframework:checker-qual:3.42.0=classpath
33-
org.jetbrains.kotlin:kotlin-bom:1.9.22=classpath
34-
org.jetbrains.kotlin:kotlin-reflect:2.0.21=classpath
35-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22=classpath
36-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22=classpath
37-
org.jetbrains.kotlin:kotlin-stdlib:2.0.21=classpath
38-
org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0=classpath
39-
org.jetbrains:annotations:13.0=classpath
4010
org.jspecify:jspecify:1.0.0=classpath
4111
org.semver4j:semver4j:5.7.1=classpath
4212
empty=

‎gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
empty=projectHealthClasspath,resolvedDepsClasspath
4+
empty=combinedGraphClasspath,projectHealthClasspath,resolvedDepsClasspath

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ plugin-convention-checkstyle = "com.xenoterracide.gradle.convention:checkstyle:0
4444
plugin-convention-coverage = "com.xenoterracide.gradle.convention:coverage:0.2.+"
4545
plugin-convention-publish = "com.xenoterracide.gradle.convention:publish:0.2.+"
4646
plugin-convention-spotbugs = "com.xenoterracide.gradle.convention:spotbugs:0.2.+"
47+
plugin-dependency-analysis = "com.autonomousapps:dependency-analysis-gradle-plugin:2.+"
4748
plugin-errorprone = "net.ltgt.gradle:gradle-errorprone-plugin:4.+"
4849
plugin-semver = "com.xenoterracide:gradle-semver:0.+"
4950
plugin-spotbugs = "com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.+"
@@ -88,7 +89,7 @@ spring-test = ["spring-test", "spring-boot-test-core", "spring-boot-autoconfigur
8889

8990
[plugins]
9091
module-testing = { id = "org.gradlex.java-module-testing", version = "1.+" }
91-
dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version = "1.+" }
92+
dependency-analysis = { id = "com.autonomousapps.dependency-analysis" }
9293
gradle-plugin-publish = { id = "com.gradle.plugin-publish", version = "1.+" }
9394
shadow = { id = "com.github.johnrengelman.shadow", version = "8.+" }
9495
semver = { id = "com.xenoterracide.gradle.semver", version = "0.12.+" }

0 commit comments

Comments
 (0)