Skip to content

Instantly share code, notes, and snippets.

View lptr's full-sized avatar

Lóránt Pintér lptr

63 followers · 13 following
View GitHub Profile
@lptr
lptr / embedded-forking.diff
Created June 21, 2023 12:48
--- EMBEDDED.txt 2023-06-19 09:41:44
+++ FORKING.txt 2023-06-19 09:41:52
@@ -1,123 +1,107 @@
-EMBEDDED
+FORKING
Directory:
-/Users/lptr/Workspace/gradle/gradle/subprojects/core/build/tmp/teŝt files/CopySpecInt.Spec/glbs7
+/Users/lptr/Workspace/gradle/gradle/subprojects/core/build/tmp/teŝt files/CopySpecInt.Spec/7yi8d
@lptr
lptr / change.patch
Created April 19, 2023 15:02
diff --git a/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java b/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java
index 50dfec905d4..e7a5e3a0e9d 100644
--- a/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java
+++ b/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java
@@ -79,20 +79,13 @@ private Set<Class<? extends Annotation>> getSupportedAnnotations() {
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
- Set<? extends Element> annotatedTypes = getSupportedAnnotations().stream()
+ Stream<? extends Element> annotatedTypes = getSupportedAnnotations().stream()
@lptr
lptr / change.patch
Created April 19, 2023 14:59
diff --git a/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java b/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java
index 50dfec905d4..0a556a6bce6 100644
--- a/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java
+++ b/subprojects/internal-instrumentation-processor/src/main/java/org/gradle/internal/instrumentation/processor/AbstractInstrumentationProcessor.java
@@ -79,20 +79,13 @@ private Set<Class<? extends Annotation>> getSupportedAnnotations() {
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
- Set<? extends Element> annotatedTypes = getSupportedAnnotations().stream()
+ Stream<? extends Element> annotatedTypes = getSupportedAnnotations().stream()
@lptr
lptr / verification-metadata-update-round-1.patch
Created April 19, 2023 08:00
This file has been truncated, but you can view the full file.
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 3233a14beac..c0d90397d81 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -11,37 +11,31 @@ J+hLS6SdnhS7KrbiLeC4fmeXkAVow09spSgTufhd+fqZ8RV2gbmfgvxOOf1NK8WZ
7E3Tkm7y6Rbz0DHrSqPYd28Od/3fKogFHHIE/srnAR7MEBf3HfEDJk4xTvH3sQ4+
4QOn+eyE9PnoNMvB9H4BfFMEsjNX8ZyoRv7zMLsB1aY3DmzzrcMiudx8qGntDB/G
ufAsZ5MRKH3gY7hW3SvXKOKp52pXfbJ/CSvPABEBAAG0IkFkYW0gR2VudCA8YWRh
-bS5nZW50QGV2b2NhdHVzLmNvbT6JATgEEwECACIFAk1Hdr8CGwMGCwkIBwMCBhUI
-AgkKCwQWAgMBAh4BAheAAAoJEIBmL4GS10mgSgQH/3NCP1FDD5A0NFnBcHXnjUyA
@lptr
lptr / null-fix.patch
Created December 10, 2022 14:57
diff --git a/subprojects/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/CalculatedValueContainerCodec.kt b/subprojects/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/CalculatedValueContainerCodec.kt
index afa4b27e8c6..037318b834c 100644
--- a/subprojects/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/CalculatedValueContainerCodec.kt
+++ b/subprojects/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/CalculatedValueContainerCodec.kt
@@ -33,7 +33,7 @@ class CalculatedValueContainerCodec(
) : Codec<CalculatedValueContainer<Any, ValueCalculator<Any>>> {
override suspend fun WriteContext.encode(value: CalculatedValueContainer<Any, ValueCalculator<Any>>) {
encodePreservingSharedIdentityOf(value) {
- val result = value.orNull
+ val result : Any? = value.orNull
@lptr
lptr / gist:6dd6b890b760306fa5d9070a014d0ece
Created December 1, 2022 15:08
diff --git a/subprojects/model-core/src/main/java/org/gradle/internal/properties/annotations/TypeMetadataWalker.java b/subprojects/model-core/src/main/java/org/gradle/internal/properties/annotations/TypeMetadataWalker.java
index d902fa578f0..48b4ef6b5ff 100644
--- a/subprojects/model-core/src/main/java/org/gradle/internal/properties/annotations/TypeMetadataWalker.java
+++ b/subprojects/model-core/src/main/java/org/gradle/internal/properties/annotations/TypeMetadataWalker.java
@@ -22,24 +22,29 @@
import java.lang.annotation.Annotation;
import java.util.function.Supplier;
-public interface TypeMetadataWalker<T> {
- static TypeMetadataWalker<Object> instanceWalker(TypeMetadataStore typeMetadataStore, Class<? extends Annotation> nestedAnnotation) {
@lptr
lptr / PluginAutoApplicationListener.patch
Created November 14, 2022 14:19
diff --git a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
index 218423f5a23..0508eb0af70 100644
--- a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
+++ b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
@@ -26,8 +26,6 @@
public class DefaultPluginRequest implements PluginRequestInternal {
- private static final Runnable NOOP_ACCEPTANCE_HANDLER = () -> {};
-
@lptr
lptr / PluginAutoApplicationListener.patch
Created November 14, 2022 14:10
diff --git a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
index 218423f5a23..0508eb0af70 100644
--- a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
+++ b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
@@ -26,8 +26,6 @@
public class DefaultPluginRequest implements PluginRequestInternal {
- private static final Runnable NOOP_ACCEPTANCE_HANDLER = () -> {};
-
@lptr
lptr / PluginAutoApplicationListener.patch
Created November 14, 2022 13:53
diff --git a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
index 218423f5a23..e4c431e30db 100644
--- a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
+++ b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/DefaultPluginRequest.java
@@ -26,8 +26,6 @@
public class DefaultPluginRequest implements PluginRequestInternal {
- private static final Runnable NOOP_ACCEPTANCE_HANDLER = () -> {};
-
@lptr
lptr / PluginAutoApplicationListener.patch
Created November 14, 2022 13:33
diff --git a/subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginRequestApplicator.java b/subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginRequestApplicator.java
index ecb1660bb12..440abb63714 100644
--- a/subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginRequestApplicator.java
+++ b/subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginRequestApplicator.java
@@ -22,6 +22,7 @@
import org.gradle.internal.service.scopes.Scopes;
import org.gradle.internal.service.scopes.ServiceScope;
import org.gradle.plugin.management.internal.PluginRequests;
+import org.gradle.plugin.use.PluginId;