From 3e4c0da992a7780b08603dfbdc71ea129de64493 Mon Sep 17 00:00:00 2001 From: Mikhail Lopatkin Date: Tue, 28 Feb 2023 12:37:47 +0100 Subject: [PATCH] Bump instrumentation version The change in lambda serialization sneaked in without a version bump. This caused false cache hits, when 8.0 was picking up instrumented jars produced by 7.6. We bump straight to 23 as 8.1 is already at 22 and we don't want to pick up jars produced by 8.1 by mistake. --- .../classpath/InstrumentingTransformer.java | 2 +- .../DefaultCachedClasspathTransformerTest.groovy | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/subprojects/core/src/main/java/org/gradle/internal/classpath/InstrumentingTransformer.java b/subprojects/core/src/main/java/org/gradle/internal/classpath/InstrumentingTransformer.java index cb9285208be0..9fae91c832d2 100644 --- a/subprojects/core/src/main/java/org/gradle/internal/classpath/InstrumentingTransformer.java +++ b/subprojects/core/src/main/java/org/gradle/internal/classpath/InstrumentingTransformer.java @@ -66,7 +66,7 @@ class InstrumentingTransformer implements CachedClasspathTransformer.Transform { /** * Decoration format. Increment this when making changes. */ - private static final int DECORATION_FORMAT = 20; + private static final int DECORATION_FORMAT = 23; private static final Type SYSTEM_TYPE = getType(System.class); private static final Type STRING_TYPE = getType(String.class); diff --git a/subprojects/core/src/test/groovy/org/gradle/internal/classpath/DefaultCachedClasspathTransformerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/internal/classpath/DefaultCachedClasspathTransformerTest.groovy index e927eab7eb60..f0c2fb0f6fe1 100644 --- a/subprojects/core/src/test/groovy/org/gradle/internal/classpath/DefaultCachedClasspathTransformerTest.groovy +++ b/subprojects/core/src/test/groovy/org/gradle/internal/classpath/DefaultCachedClasspathTransformerTest.groovy @@ -241,7 +241,7 @@ class DefaultCachedClasspathTransformerTest extends ConcurrentSpec { def file = testDir.file("thing.jar") jar(file) def classpath = DefaultClassPath.of(file) - def cachedFile = testDir.file("cached/16fa923fc1ec782f28887195acdc5401/thing.jar") + def cachedFile = testDir.file("cached/7d8f1bdd1ac5894c19082a4927eeff0b/thing.jar") when: def cachedClasspath = transformer.transform(classpath, BuildLogic) @@ -269,7 +269,7 @@ class DefaultCachedClasspathTransformerTest extends ConcurrentSpec { def dir = testDir.file("thing.dir") classesDir(dir) def classpath = DefaultClassPath.of(dir) - def cachedFile = testDir.file("cached/d4d760260e067b91216f90d0d5a7ac5c/thing.dir.jar") + def cachedFile = testDir.file("cached/deed05338c460a99c155e591a360d09a/thing.dir.jar") when: def cachedClasspath = transformer.transform(classpath, BuildLogic) @@ -299,8 +299,8 @@ class DefaultCachedClasspathTransformerTest extends ConcurrentSpec { def file = testDir.file("thing.jar") jar(file) def classpath = DefaultClassPath.of(dir, file) - def cachedDir = testDir.file("cached/d4d760260e067b91216f90d0d5a7ac5c/thing.dir.jar") - def cachedFile = testDir.file("cached/16fa923fc1ec782f28887195acdc5401/thing.jar") + def cachedDir = testDir.file("cached/deed05338c460a99c155e591a360d09a/thing.dir.jar") + def cachedFile = testDir.file("cached/7d8f1bdd1ac5894c19082a4927eeff0b/thing.jar") when: def cachedClasspath = transformer.transform(classpath, BuildLogic) @@ -357,8 +357,8 @@ class DefaultCachedClasspathTransformerTest extends ConcurrentSpec { def file3 = testDir.file("thing3.jar") jar(file3) def classpath = DefaultClassPath.of(dir, file, dir2, file2, dir3, file3) - def cachedDir = testDir.file("cached/d4d760260e067b91216f90d0d5a7ac5c/thing.dir.jar") - def cachedFile = testDir.file("cached/16fa923fc1ec782f28887195acdc5401/thing.jar") + def cachedDir = testDir.file("cached/deed05338c460a99c155e591a360d09a/thing.dir.jar") + def cachedFile = testDir.file("cached/7d8f1bdd1ac5894c19082a4927eeff0b/thing.jar") when: def cachedClasspath = transformer.transform(classpath, BuildLogic) @@ -378,7 +378,7 @@ class DefaultCachedClasspathTransformerTest extends ConcurrentSpec { def file = testDir.file("thing.jar") jar(file) def classpath = DefaultClassPath.of(file) - def cachedFile = testDir.file("cached/90b54e71cfa1cf2192b11e3e12e93caa/thing.jar") + def cachedFile = testDir.file("cached/c850e684600f7febc81bb5a9e6129d55/thing.jar") when: def cachedClasspath = transformer.transform(classpath, BuildLogic, transform) @@ -412,7 +412,7 @@ class DefaultCachedClasspathTransformerTest extends ConcurrentSpec { def file = testDir.file("thing.jar") jarWithStoredResource(file) def classpath = DefaultClassPath.of(file) - def cachedFile = testDir.file("cached/40ba77bb7fbecc72eec8f0e8257e55d5/thing.jar") + def cachedFile = testDir.file("cached/d6260d908e7840629ecf6df971fd26d8/thing.jar") when: def cachedClasspath = transformer.transform(classpath, BuildLogic)