Skip to content

Commit 30fb24a

Browse files
RBusarowkodiakhq[bot]
authored andcommitted
use Caffeine for caching, with LazyDeferred loaders
1 parent a69dc10 commit 30fb24a

29 files changed

Lines changed: 217 additions & 69 deletions

File tree

build-logic/mcbuild/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
compileOnly(gradleApi())
3333
compileOnly(libs.kotlin.gradle.plug)
3434

35-
implementation(libs.benManes.gradle)
35+
implementation(libs.benManes.versions)
3636
implementation(libs.detekt.gradle)
3737
implementation(libs.dokka.gradle)
3838
implementation(libs.dropbox.dependencyGuard)

gradle/libs.versions.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ androidx-work = "2.6.0"
1515

1616
antlr = "4.10.1"
1717
autoManifest = "2.0"
18-
benManes = "0.42.0"
18+
19+
benManes-caffeine = "3.1.0"
20+
benManes-versions = "0.42.0"
21+
1922
changeTracker = "0.7.4"
2023
coil = "1.3.2"
2124
compileSdk = "30"
@@ -68,7 +71,7 @@ vanniktech-publish = "0.19.0"
6871

6972
anvil = { id = "com.squareup.anvil", version.ref = "square-anvil" }
7073
autoManifest = { id = "com.gradleup.auto.manifest", version.ref = "autoManifest" }
71-
benManes = { id = "com.github.ben-manes.versions", version.ref = "benManes" }
74+
benManes = { id = "com.github.ben-manes.versions", version.ref = "benManes-versions" }
7275
dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
7376
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
7477
dropbox-dependencyGuard = { id = "com.dropbox.dependency-guard", version.ref = "dropbox-dependencyGuard" }
@@ -95,7 +98,8 @@ agp-builder-model = { module = "com.android.tools.build:builder-model", version.
9598
antlr-core = { module = "org.antlr:antlr4", version.ref = "antlr" }
9699
antlr-runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" }
97100

98-
benManes-gradle = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "benManes" }
101+
benManes-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "benManes-versions" }
102+
benManes-caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "benManes-caffeine" }
99103

100104
detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
101105

modulecheck-api/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
2+
com.google.errorprone:error_prone_annotations:2.13.1
13
com.rickbusarow.dispatch:dispatch-core:1.0.0-beta10
24
com.squareup.anvil:annotations:2.4.0
35
javax.inject:javax.inject:1
46
net.java.dev.jna:jna:5.6.0
57
net.swiftzer.semver:semver:1.2.0
8+
org.checkerframework:checker-qual:3.21.4
69
org.codehaus.groovy:groovy-xml:3.0.10
710
org.codehaus.groovy:groovy:3.0.10
811
org.jetbrains.intellij.deps:trove4j:1.0.20181211

modulecheck-core/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
2+
com.google.errorprone:error_prone_annotations:2.13.1
13
com.rickbusarow.dispatch:dispatch-core:1.0.0-beta10
24
com.squareup.anvil:annotations:2.4.0
35
javax.inject:javax.inject:1
46
net.java.dev.jna:jna:5.6.0
57
net.swiftzer.semver:semver:1.2.0
8+
org.checkerframework:checker-qual:3.21.4
69
org.codehaus.groovy:groovy-xml:3.0.10
710
org.codehaus.groovy:groovy:3.0.10
811
org.jetbrains.intellij.deps:trove4j:1.0.20181211

modulecheck-finding/api/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
2+
com.google.errorprone:error_prone_annotations:2.13.1
13
com.rickbusarow.dispatch:dispatch-core:1.0.0-beta10
24
com.squareup.anvil:annotations:2.4.0
35
javax.inject:javax.inject:1
46
net.java.dev.jna:jna:5.6.0
57
net.swiftzer.semver:semver:1.2.0
8+
org.checkerframework:checker-qual:3.21.4
69
org.jetbrains.intellij.deps:trove4j:1.0.20181211
710
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10
811
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10

modulecheck-finding/impl-android/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
2+
com.google.errorprone:error_prone_annotations:2.13.1
13
com.rickbusarow.dispatch:dispatch-core:1.0.0-beta10
24
com.squareup.anvil:annotations:2.4.0
35
javax.inject:javax.inject:1
46
net.java.dev.jna:jna:5.6.0
57
net.swiftzer.semver:semver:1.2.0
8+
org.checkerframework:checker-qual:3.21.4
69
org.jetbrains.intellij.deps:trove4j:1.0.20181211
710
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10
811
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10

modulecheck-finding/impl-sort/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
2+
com.google.errorprone:error_prone_annotations:2.13.1
13
com.rickbusarow.dispatch:dispatch-core:1.0.0-beta10
24
com.squareup.anvil:annotations:2.4.0
35
javax.inject:javax.inject:1
46
net.java.dev.jna:jna:5.6.0
57
net.swiftzer.semver:semver:1.2.0
8+
org.checkerframework:checker-qual:3.21.4
69
org.jetbrains.intellij.deps:trove4j:1.0.20181211
710
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10
811
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10

modulecheck-finding/impl/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
2+
com.google.errorprone:error_prone_annotations:2.13.1
13
com.rickbusarow.dispatch:dispatch-core:1.0.0-beta10
24
com.squareup.anvil:annotations:2.4.0
35
javax.inject:javax.inject:1
46
net.java.dev.jna:jna:5.6.0
57
net.swiftzer.semver:semver:1.2.0
8+
org.checkerframework:checker-qual:3.21.4
69
org.jetbrains.intellij.deps:trove4j:1.0.20181211
710
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10
811
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10

modulecheck-gradle/plugin/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
12
com.github.javaparser:javaparser-core:3.24.2
23
com.github.javaparser:javaparser-symbol-solver-core:3.24.2
34
com.google.code.findbugs:jsr305:3.0.2
45
com.google.dagger:dagger:2.42
5-
com.google.errorprone:error_prone_annotations:2.11.0
6+
com.google.errorprone:error_prone_annotations:2.13.1
67
com.google.guava:failureaccess:1.0.1
78
com.google.guava:guava:31.1-jre
89
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
@@ -20,7 +21,7 @@ org.antlr:ST4:4.3.3
2021
org.antlr:antlr-runtime:3.5.3
2122
org.antlr:antlr4-runtime:4.10.1
2223
org.antlr:antlr4:4.10.1
23-
org.checkerframework:checker-qual:3.12.0
24+
org.checkerframework:checker-qual:3.21.4
2425
org.codehaus.groovy:groovy-xml:3.0.10
2526
org.codehaus.groovy:groovy:3.0.10
2627
org.glassfish:javax.json:1.0.4

modulecheck-parsing/java/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
com.github.ben-manes.caffeine:caffeine:3.1.0
12
com.github.javaparser:javaparser-core:3.24.2
23
com.github.javaparser:javaparser-symbol-solver-core:3.24.2
34
com.google.code.findbugs:jsr305:3.0.2
4-
com.google.errorprone:error_prone_annotations:2.11.0
5+
com.google.errorprone:error_prone_annotations:2.13.1
56
com.google.guava:failureaccess:1.0.1
67
com.google.guava:guava:31.1-jre
78
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
@@ -11,7 +12,7 @@ com.squareup.anvil:annotations:2.4.0
1112
javax.inject:javax.inject:1
1213
net.java.dev.jna:jna:5.6.0
1314
net.swiftzer.semver:semver:1.2.0
14-
org.checkerframework:checker-qual:3.12.0
15+
org.checkerframework:checker-qual:3.21.4
1516
org.javassist:javassist:3.28.0-GA
1617
org.jetbrains.intellij.deps:trove4j:1.0.20181211
1718
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10

0 commit comments

Comments
 (0)