[brew] let cask be explicitly enabled. Resolves #301

jreleaser · Jul 21, 2021 · 34011d9 · 34011d9
1 parent 77cd581
commit 34011d9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/Cask.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/Cask.java
@@ -72,6 +72,10 @@ public boolean isEnabled() {
         return enabled;
     }
 
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
     public String getResolvedAppcast(Map<String, Object> props) {
         if (isNotBlank(appcast)) {
             return applyTemplate(new StringReader(appcast), props);

diff --git a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/Cask.groovy b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/Cask.groovy
@@ -38,6 +38,8 @@ interface Cask {
 
     Property<String> getAppcast()
 
+    Property<Boolean> getEnabled()
+
     MapProperty<String, List<String>> getUninstall()
 
     MapProperty<String, List<String>> getZap()

diff --git a/...er-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/CaskImpl.groovy b/...er-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/CaskImpl.groovy
@@ -39,6 +39,7 @@ class CaskImpl implements Cask {
     final Property<String> pkgName
     final Property<String> appName
     final Property<String> appcast
+    final Property<Boolean> enabled
     final MapProperty<String,List<String>> uninstall
     final MapProperty<String,List<String>> zap
 
@@ -49,6 +50,7 @@ class CaskImpl implements Cask {
         pkgName = objects.property(String).convention(Providers.notDefined())
         appName = objects.property(String).convention(Providers.notDefined())
         appcast = objects.property(String).convention(Providers.notDefined())
+        enabled = objects.property(Boolean).convention(Providers.notDefined())
         uninstall = (objects.mapProperty(String,List).convention(Providers.notDefined()) as MapProperty<String, List<String>>)
         zap = (objects.mapProperty(String,List).convention(Providers.notDefined()) as MapProperty<String, List<String>>)
     }
@@ -60,6 +62,7 @@ class CaskImpl implements Cask {
             pkgName.present ||
             appName.present ||
             appcast.present ||
+            enabled.present ||
             uninstall.present ||
             zap.present
     }
@@ -71,6 +74,7 @@ class CaskImpl implements Cask {
         if (pkgName.present) cask.pkgName = pkgName.get()
         if (appName.present) cask.appName = appName.get()
         if (appcast.present) cask.appcast = appcast.get()
+        if (enabled.present) cask.enabled = enabled.get()
         if (uninstall.present) cask.uninstall = uninstall.get()
         if (zap.present) cask.zap = zap.get()
         cask

diff --git a/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/Cask.java b/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/Cask.java
@@ -36,13 +36,15 @@ public class Cask {
     private String pkgName;
     private String appName;
     private String appcast;
+    private boolean enabled;
 
     void setAll(Cask cask) {
         this.name = cask.name;
         this.displayName = cask.displayName;
         this.pkgName = cask.pkgName;
         this.appName = cask.appName;
         this.appcast = cask.appcast;
+        this.enabled = cask.enabled;
         setUninstall(cask.uninstall);
         setZap(cask.zap);
     }
@@ -87,6 +89,14 @@ public void setAppcast(String appcast) {
         this.appcast = appcast;
     }
 
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
     public Map<String, List<String>> getUninstall() {
         return uninstall;
     }

diff --git a/...ven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java b/...ven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java
@@ -793,6 +793,7 @@ private static org.jreleaser.model.Cask convertCask(Cask cask) {
         c.setPkgName(cask.getPkgName());
         c.setAppName(cask.getAppName());
         c.setAppcast(cask.getAppcast());
+        c.setEnabled(cask.isEnabled());
         c.setUninstall(cask.getUninstall());
         c.setZap(cask.getZap());
         return c;