[core] Add a platform property to Glob. Resolves #565

core/jreleaser-model/src/main/java/org/jreleaser/model/Artifact.java

@@ -288,6 +288,15 @@ public static Comparator<Artifact> comparatorByPlatform() {
         };
     }
 
+    public static Artifact of(Path resolvedPath, String platform, Map<String, Object> props) {
+        Artifact artifact = new Artifact();
+        artifact.path = resolvedPath.toAbsolutePath().toString();
+        artifact.platform = platform;
+        artifact.resolvedPath = resolvedPath;
+        artifact.setExtraProperties(props);
+        return artifact;
+    }
+
     public static Artifact of(Path resolvedPath, Map<String, Object> props) {
         Artifact artifact = new Artifact();
         artifact.path = resolvedPath.toAbsolutePath().toString();

core/jreleaser-model/src/main/java/org/jreleaser/model/Glob.java

@@ -53,6 +53,7 @@ public class Glob implements Domain, ExtraProperties {
     private final Map<String, Object> extraProperties = new LinkedHashMap<>();
 
     private String pattern;
+    private String platform;
     private Set<Artifact> artifacts;
 
     private String directory;
@@ -62,6 +63,7 @@ public class Glob implements Domain, ExtraProperties {
 
     void setAll(Glob glob) {
         this.pattern = glob.pattern;
+        this.platform = glob.platform;
         setExtraProperties(glob.extraProperties);
     }
 
@@ -96,6 +98,7 @@ public Set<Artifact> getResolvedArtifactsPattern(JReleaserContext context) {
             normalizePattern();
             artifacts = Artifacts.resolveFiles(context, resolveDirectory(context), Collections.singletonList(pattern));
             artifacts.forEach(artifact -> {
+                artifact.setPlatform(platform);
                 if (context.isPlatformSelected(artifact)) artifact.activate();
                 artifact.setExtraProperties(getExtraProperties());
             });
@@ -143,7 +146,7 @@ public Set<Artifact> getResolvedArtifactsLegacy(JReleaserContext context) {
             }
 
             artifacts = fileCollector.getFiles().stream()
-                .map(p -> Artifact.of(p, getExtraProperties()))
+                .map(p -> Artifact.of(p, platform, getExtraProperties()))
                 .peek(a -> {
                     if (context.isPlatformSelected(a)) a.activate();
                 })
@@ -180,6 +183,14 @@ private void normalizePattern() {
         }
     }
 
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
     public String getDirectory() {
         return directory;
     }
@@ -226,6 +237,7 @@ public boolean isRecursiveSet() {
     public Map<String, Object> asMap(boolean full) {
         Map<String, Object> props = new LinkedHashMap<>();
         props.put("pattern", pattern);
+        props.put("platform", platform);
         props.put("extraProperties", getResolvedExtraProperties());
         props.put("directory", directory);
         props.put("include", include);

plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/Glob.groovy

@@ -30,6 +30,8 @@ import org.gradle.api.provider.Property
 interface Glob {
     Property<String> getPattern()
 
+    Property<String> getPlatform()
+
     DirectoryProperty getDirectory()
 
     Property<String> getInclude()

plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/GlobImpl.groovy

@@ -35,6 +35,7 @@ import javax.inject.Inject
 class GlobImpl implements Glob {
     String name
     final Property<String> pattern
+    final Property<String> platform
     final DirectoryProperty directory
     final Property<String> include
     final Property<String> exclude
@@ -43,6 +44,7 @@ class GlobImpl implements Glob {
     @Inject
     GlobImpl(ObjectFactory objects) {
         pattern = objects.property(String).convention(Providers.notDefined())
+        platform = objects.property(String).convention(Providers.notDefined())
         directory = objects.directoryProperty().convention(Providers.notDefined())
         include = objects.property(String).convention(Providers.notDefined())
         exclude = objects.property(String).convention(Providers.notDefined())
@@ -56,6 +58,7 @@ class GlobImpl implements Glob {
     org.jreleaser.model.Glob toModel() {
         org.jreleaser.model.Glob glob = new org.jreleaser.model.Glob()
         if (pattern.present) glob.pattern = pattern.get()
+        if (platform.present) glob.platform = platform.get()
         if (directory.present) {
             glob.directory = directory.asFile.get().absolutePath
         }

plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/Glob.java

@@ -23,6 +23,7 @@
  */
 public class Glob {
     private String pattern;
+    private String platform;
     private String directory;
     private String include;
     private String exclude;
@@ -36,6 +37,14 @@ public void setPattern(String pattern) {
         this.pattern = pattern;
     }
 
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
     public String getDirectory() {
         return directory;
     }

plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java

@@ -942,6 +942,7 @@ private static List<org.jreleaser.model.Glob> convertGlobs(List<Glob> globs) {
     private static org.jreleaser.model.Glob convertGlob(Glob glob) {
         org.jreleaser.model.Glob g = new org.jreleaser.model.Glob();
         g.setPattern(tr(glob.getPattern()));
+        g.setPlatform(tr(glob.getPlatform()));
         if (isNotBlank(glob.getDirectory())) g.setDirectory(tr(glob.getDirectory()));
         if (isNotBlank(glob.getInclude())) g.setInclude(glob.getInclude());
         if (isNotBlank(glob.getExclude())) g.setExclude(glob.getExclude());