@@ -15,30 +15,30 @@ public class GitVersioningPluginConfig {
15
15
16
16
public boolean preferTags = false ;
17
17
18
- public void addBranchVersionDescription (VersionDescription versionDescription ) {
19
- this .branchVersionDescriptions .add (versionDescription );
20
- }
21
-
22
- public void addTagVersionDescription (VersionDescription versionDescription ) {
23
- this .tagVersionDescriptions .add (versionDescription );
24
- }
25
-
26
- public void commit (Closure closure ) {
18
+ public void commit (Closure <CommitVersionDescription > closure ) {
27
19
CommitVersionDescription versionDescription = new CommitVersionDescription ();
28
20
configure (closure , versionDescription );
29
21
this .commitVersionDescription = versionDescription ;
30
22
}
31
23
32
- public void branch (Closure closure ) {
24
+ public void branch (VersionDescription versionDescription ) {
25
+ this .branchVersionDescriptions .add (versionDescription );
26
+ }
27
+
28
+ public void branch (Closure <VersionDescription > closure ) {
33
29
VersionDescription versionDescription = new VersionDescription ();
34
30
configure (closure , versionDescription );
35
- addBranchVersionDescription (versionDescription );
31
+ branch (versionDescription );
32
+ }
33
+
34
+ public void tag (VersionDescription versionDescription ) {
35
+ this .tagVersionDescriptions .add (versionDescription );
36
36
}
37
37
38
- public void tag (Closure closure ) {
38
+ public void tag (Closure < VersionDescription > closure ) {
39
39
VersionDescription versionDescription = new VersionDescription ();
40
40
configure (closure , versionDescription );
41
- addTagVersionDescription (versionDescription );
41
+ tag (versionDescription );
42
42
}
43
43
44
44
public static class VersionDescription {
@@ -47,10 +47,14 @@ public static class VersionDescription {
47
47
public String versionFormat ;
48
48
public List <PropertyDescription > properties = new ArrayList <>();
49
49
50
- public void property (Closure closure ) {
50
+ public void property (PropertyDescription propertyDescription ) {
51
+ this .properties .add (propertyDescription );
52
+ }
53
+
54
+ public void property (Closure <PropertyDescription > closure ) {
51
55
PropertyDescription propertyDescription = new PropertyDescription ();
52
56
configure (closure , propertyDescription );
53
- this . properties . add (propertyDescription );
57
+ property (propertyDescription );
54
58
}
55
59
}
56
60
@@ -59,10 +63,14 @@ public static class CommitVersionDescription {
59
63
public String versionFormat ;
60
64
public List <PropertyDescription > properties = new ArrayList <>();
61
65
62
- public void property (Closure closure ) {
66
+ public void property (PropertyDescription propertyDescription ) {
67
+ this .properties .add (propertyDescription );
68
+ }
69
+
70
+ public void property (Closure <PropertyDescription > closure ) {
63
71
PropertyDescription propertyDescription = new PropertyDescription ();
64
72
configure (closure , propertyDescription );
65
- this . properties . add (propertyDescription );
73
+ property (propertyDescription );
66
74
}
67
75
}
68
76
@@ -71,10 +79,14 @@ public static class PropertyDescription {
71
79
public String pattern ;
72
80
public ValueDescription value ;
73
81
74
- public void value (Closure closure ) {
82
+ public void value (ValueDescription valueDescription ) {
83
+ this .value = valueDescription ;
84
+ }
85
+
86
+ public void value (Closure <ValueDescription > closure ) {
75
87
ValueDescription valueDescription = new ValueDescription ();
76
88
configure (closure , valueDescription );
77
- this . value = valueDescription ;
89
+ value ( valueDescription ) ;
78
90
}
79
91
}
80
92
0 commit comments