Skip to content

Commit efa6890

Browse files
authored
Fix publish release: split tasks and set publish to true (#2778)
1 parent 2de0b30 commit efa6890

File tree

1 file changed

+31
-44
lines changed

1 file changed

+31
-44
lines changed

mapbox-convention-plugin/src/main/kotlin/com/mapbox/maps/gradle/plugins/extensions/MapboxPublishLibraryExtension.kt

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ constructor(objects: ObjectFactory) {
4141
* When enabled, the task will prepare and pack all the artifacts locally but skip uploading to S3.
4242
*/
4343
public var dryRun: Boolean by sdkRegistryPublication::dryRun
44-
/**
45-
* Defines whether to publish the release when artifacts are uploaded.
46-
*
47-
* When enabled, the task will publish the release after the artifacts are uploaded.
48-
*/
49-
public var publish: Boolean by sdkRegistryPublication::publish
50-
/**
51-
* Defines the message appending to the publish PR's description.
52-
*
53-
* Optional, when specified, the message would be appended to the publish PR.
54-
* Use this option to add the team for review.
55-
*
56-
* Default: "cc @mapbox/maps-android"
57-
*/
58-
public var publishMessage: String by sdkRegistryPublication::publishMessage
5944
/**
6045
* Defines whether to exclude the current module from the root project level's `mapboxSDKRegistryPublishAll` task.
6146
*
@@ -70,81 +55,85 @@ constructor(objects: ObjectFactory) {
7055
public var excludeFromRootProject: Boolean by sdkRegistryPublication::excludeFromRootProject
7156

7257
private val enabledProperty: Property<Boolean> = objects.property<Boolean>().convention(false)
58+
private val publishProperty: Property<Boolean> = objects.property<Boolean>().convention(true)
59+
private val publishMessageProperty: Property<String> = objects.property<String>().convention("cc @mapbox/maps-android")
7360
private val versionNameOverrideProperty: Property<String> = objects.property<String>()
7461
private val snapshotOverrideProperty: Property<Boolean> = objects.property<Boolean>()
7562
private val groupProperty: Property<String> = objects.property<String>()
7663
private val artifactIdProperty: Property<String> = objects.property<String>()
7764
private val artifactTitleProperty: Property<String> = objects.property<String>()
7865
private val artifactDescriptionProperty: Property<String> = objects.property<String>()
7966
private val publishNdkVariantProperty: Property<Boolean> = objects.property<Boolean>().convention(true)
80-
81-
init {
82-
// Default value for publishMessage
83-
publishMessage = "cc @mapbox/maps-android"
84-
}
67+
/**
68+
* Defines whether to publish the release when artifacts are uploaded.
69+
*
70+
* When enabled, the task will publish the release after the artifacts are uploaded.
71+
*
72+
* Default: true
73+
*/
74+
public var publish: Boolean
75+
get() = publishProperty.get()
76+
set(value) = publishProperty.setDisallowChanges(value)
77+
/**
78+
* Defines the message appending to the publish PR's description.
79+
*
80+
* Optional, when specified, the message would be appended to the publish PR.
81+
* Use this option to add the team for review.
82+
*
83+
* Default: "cc @mapbox/maps-android"
84+
*/
85+
public var publishMessage: String
86+
get() = publishMessageProperty.get()
87+
set(value) = publishMessageProperty.setDisallowChanges(value)
8588

8689
/**
8790
* Internal flag to know if this extension should be configured.
8891
*/
8992
internal var enabled: Boolean
9093
get() = enabledProperty.get()
91-
set(value) {
92-
enabledProperty.setDisallowChanges(value)
93-
}
94+
set(value) = enabledProperty.setDisallowChanges(value)
9495

9596
/**
9697
* Version name to use instead of the global one (defined in project property `VERSION_NAME`).
9798
*/
9899
public var versionNameOverride: String
99100
get() = versionNameOverrideProperty.get()
100-
set(value) {
101-
versionNameOverrideProperty.setDisallowChanges(value)
102-
}
101+
set(value) = versionNameOverrideProperty.setDisallowChanges(value)
103102

104103
/**
105104
* Group ID for this project.
106105
*/
107106
public var group: String
108107
get() = groupProperty.get()
109-
set(value) {
110-
groupProperty.setDisallowChanges(value)
111-
}
108+
set(value) = groupProperty.setDisallowChanges(value)
112109

113110
/**
114111
* Artifact ID for this project.
115112
*/
116113
public var artifactId: String
117114
get() = artifactIdProperty.get()
118-
set(value) {
119-
artifactIdProperty.setDisallowChanges(value)
120-
}
115+
set(value) = artifactIdProperty.setDisallowChanges(value)
121116

122117
/**
123118
* Force snapshot value, ignoring if version name contains `-SNAPSHOT`.
124119
*/
125120
internal var snapshotOverride: Boolean
126121
get() = snapshotOverrideProperty.get()
127-
set(value) {
128-
snapshotOverrideProperty.setDisallowChanges(value)
129-
}
122+
set(value) = snapshotOverrideProperty.setDisallowChanges(value)
130123

131124
/**
132125
* The POM description field content.
133126
*/
134127
public var artifactDescription: String
135128
get() = artifactDescriptionProperty.get()
136-
set(value) {
137-
artifactDescriptionProperty.setDisallowChanges(value)
138-
}
129+
set(value) = artifactDescriptionProperty.setDisallowChanges(value)
139130

140131
/**
141132
* The POM title field content.
142133
*/
143134
public var artifactTitle: String
144135
get() = artifactTitleProperty.get()
145-
set(value) {
146-
artifactTitleProperty.setDisallowChanges(value)
147-
}
136+
set(value) = artifactTitleProperty.setDisallowChanges(value)
148137

149138
/**
150139
* If true, the artifact ID will be suffixed by the NDK Major version if it's not the default
@@ -154,9 +143,7 @@ constructor(objects: ObjectFactory) {
154143
*/
155144
public var publishNdkVariant: Boolean
156145
get() = publishNdkVariantProperty.get()
157-
set(value) {
158-
publishNdkVariantProperty.setDisallowChanges(value)
159-
}
146+
set(value) = publishNdkVariantProperty.setDisallowChanges(value)
160147

161148
internal fun applyTo(project: Project) {
162149
project.applyRequiredPlugins()

0 commit comments

Comments
 (0)