From 303697b94b90ff8065eaf30b6dcb0e063f6cedb4 Mon Sep 17 00:00:00 2001
From: Kamil Kropiewnicki <kamilk@palantir.com>
Date: Thu, 19 Dec 2024 13:51:21 +0100
Subject: [PATCH 1/2] acp

---
 .../dist/BaseDistributionExtension.java       | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java
index 6f16cec54..db6fcf678 100644
--- a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java
+++ b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java
@@ -25,23 +25,18 @@
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import groovy.lang.Closure;
 import groovy.lang.DelegatesTo;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.inject.Inject;
 import org.gradle.api.Action;
 import org.gradle.api.DomainObjectSet;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.ListProperty;
-import org.gradle.api.provider.MapProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.provider.ProviderFactory;
-import org.gradle.api.provider.SetProperty;
+import org.gradle.api.provider.*;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class BaseDistributionExtension {
 
@@ -92,7 +87,7 @@ public BaseDistributionExtension(Project project) {
         projectName = project.getName();
     }
 
-    public final Provider<String> getDistributionServiceGroup() {
+    public final Property<String> getDistributionServiceGroup() {
         return serviceGroup;
     }
 
@@ -110,7 +105,7 @@ public final void setServiceGroup(String serviceGroup) {
         this.serviceGroup.set(serviceGroup);
     }
 
-    public final Provider<String> getDistributionServiceName() {
+    public final Property<String> getDistributionServiceName() {
         return serviceName;
     }
 
@@ -128,7 +123,7 @@ public final void setServiceName(String serviceName) {
         this.serviceName.set(serviceName);
     }
 
-    public final Provider<ProductType> getProductType() {
+    public final Property<ProductType> getProductType() {
         return productType;
     }
 
@@ -230,7 +225,7 @@ public final void productDependency(@DelegatesTo(ProductDependency.class) Closur
         }));
     }
 
-    public final Provider<Set<ProductId>> getOptionalProductDependencies() {
+    public final SetProperty<ProductId> getOptionalProductDependencies() {
         return optionalProductDependencies;
     }
 
@@ -242,7 +237,7 @@ public final void optionalProductDependency(String optionalProductId) {
         this.optionalProductDependencies.add(new ProductId(optionalProductId));
     }
 
-    public final Provider<Set<ProductId>> getIgnoredProductDependencies() {
+    public final SetProperty<ProductId> getIgnoredProductDependencies() {
         return ignoredProductDependencies;
     }
 

From 48c88b8af7a1d04ac75e450464cb68370b833301 Mon Sep 17 00:00:00 2001
From: Kamil Kropiewnicki <kamilk@palantir.com>
Date: Thu, 19 Dec 2024 14:50:52 +0100
Subject: [PATCH 2/2] fix formatting

---
 .../gradle/dist/BaseDistributionExtension.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java
index db6fcf678..56ffd0d80 100644
--- a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java
+++ b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/BaseDistributionExtension.java
@@ -25,18 +25,22 @@
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import groovy.lang.Closure;
 import groovy.lang.DelegatesTo;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.inject.Inject;
 import org.gradle.api.Action;
 import org.gradle.api.DomainObjectSet;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.*;
-
-import javax.inject.Inject;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import org.gradle.api.provider.ListProperty;
+import org.gradle.api.provider.MapProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.ProviderFactory;
+import org.gradle.api.provider.SetProperty;
 
 public class BaseDistributionExtension {