From 713dee76c6101d75bab3a73b7f113f7fb9d1f25e Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 11 Apr 2024 13:29:34 -0600 Subject: [PATCH] Update extracted cache entries for Gradle 8.6+ - Extracted transform jars for newer Gradle versions 8.6+ - Extracted `groovy-dsl` which was introduced in Gradle 8.7 Fixes #45 --- sources/src/caching/gradle-home-extry-extractor.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sources/src/caching/gradle-home-extry-extractor.ts b/sources/src/caching/gradle-home-extry-extractor.ts index f502555..4fd6847 100644 --- a/sources/src/caching/gradle-home-extry-extractor.ts +++ b/sources/src/caching/gradle-home-extry-extractor.ts @@ -358,8 +358,10 @@ export class GradleHomeEntryExtractor extends AbstractEntryExtractor { entryDefinition('wrapper-zips', ['wrapper/dists/*/*/'], false), // Each wrapper directory cached separately entryDefinition('java-toolchains', ['jdks/*/'], false), // Each extracted JDK cached separately entryDefinition('dependencies', ['caches/modules-*/files-*/*/*/*/*'], true), - entryDefinition('instrumented-jars', ['caches/jars-*/*'], true), - entryDefinition('kotlin-dsl', ['caches/*/kotlin-dsl/*/*'], true) + entryDefinition('instrumented-jars', ['caches/jars-*/*/'], true), + entryDefinition('kotlin-dsl', ['caches/*/kotlin-dsl/accessors/*/', 'caches/*/kotlin-dsl/scripts/*/'], true), + entryDefinition('groovy-dsl', ['caches/*/groovy-dsl/*/'], true), + entryDefinition('transforms', ['caches/transforms-4/*/', 'caches/*/transforms/*/'], true) ] } }