Skip to content

Instantly share code, notes, and snippets.

Avatar

Lóránt Pintér lptr

  • Gradle Inc. (@gradle)
  • Hungary
  • 05:41 (UTC +02:00)
  • Twitter @lptr
View GitHub Profile
View null-fix.patch
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
View gist:6dd6b890b760306fa5d9070a014d0ece
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) {
View PluginAutoApplicationListener.patch
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 = () -> {};
-
View PluginAutoApplicationListener.patch
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 = () -> {};
-
View PluginAutoApplicationListener.patch
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 = () -> {};
-
View PluginAutoApplicationListener.patch
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;
View PluginAutoApplicationListener.patch
diff --git a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/autoapply/AutoAppliedPluginRegistry.java b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/autoapply/AutoAppliedPluginRegistry.java
index 783884a76ad..d1de44d30d0 100644
--- a/subprojects/core/src/main/java/org/gradle/plugin/management/internal/autoapply/AutoAppliedPluginRegistry.java
+++ b/subprojects/core/src/main/java/org/gradle/plugin/management/internal/autoapply/AutoAppliedPluginRegistry.java
@@ -18,6 +18,7 @@
import org.gradle.api.Project;
import org.gradle.api.initialization.Settings;
+import org.gradle.plugin.management.PluginRequest;
import org.gradle.plugin.management.internal.PluginRequests;
View no-native-terminate.patch
diff --git a/file-events/src/file-events/cpp/generic_fsnotifier.cpp b/file-events/src/file-events/cpp/generic_fsnotifier.cpp
index f058278..20127ca 100644
--- a/file-events/src/file-events/cpp/generic_fsnotifier.cpp
+++ b/file-events/src/file-events/cpp/generic_fsnotifier.cpp
@@ -77,27 +77,6 @@ jobject wrapServer(JNIEnv* env, AbstractServer* server) {
return env->NewDirectByteBuffer(server, sizeof(server));
}
-void AbstractServer::executeRunLoop(JNIEnv* env) {
- try {
View test-cpp.patch
diff --git a/file-events/src/test/cpp/test_fsnotifier.cpp b/file-events/src/test/cpp/test_fsnotifier.cpp
new file mode 100644
index 0000000..add06ac
--- /dev/null
+++ b/file-events/src/test/cpp/test_fsnotifier.cpp
@@ -0,0 +1,32 @@
+#include "test_fsnotifier.h"
+
+using namespace std;
+
View PropertyValueSupplier.patch
diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskInputPropertyRegistration.java b/subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskInputPropertyRegistration.java
index 5953f394b7c..00228cceb3b 100644
--- a/subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskInputPropertyRegistration.java
+++ b/subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskInputPropertyRegistration.java
@@ -17,16 +17,17 @@
package org.gradle.api.internal.tasks;
import org.gradle.api.NonNullApi;
+import org.gradle.api.internal.tasks.properties.PropertyValue;
import org.gradle.api.tasks.TaskInputPropertyBuilder;