Skip to content

Commit 854982f

Browse files
VirtlinkVirtlink
committed
Fix metadata
1 parent 54e09d0 commit 854982f

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Unless required by applicable law or agreed to in writing, software distributed
5757
[mvn-rel-badge:org.metaborg.convention.java:org.metaborg.convention.java.gradle.plugin]: https://img.shields.io/nexus/r/org.metaborg.convention.java/org.metaborg.convention.java.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
5858
[mvn-rel-badge:org.metaborg.convention.maven-publish:org.metaborg.convention.maven-publish.gradle.plugin]: https://img.shields.io/nexus/r/org.metaborg.convention.maven-publish/org.metaborg.convention.maven-publish.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
5959
[mvn-rel-badge:org.metaborg.convention.root-project:org.metaborg.convention.root-project.gradle.plugin]: https://img.shields.io/nexus/r/org.metaborg.convention.root-project/org.metaborg.convention.root-project.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
60-
[mvn-rel-badge:org.metaborg:catalog]: https://img.shields.io/nexus/s/org.metaborg/catalog?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
61-
[mvn-rel-badge:org.metaborg:platform]: https://img.shields.io/nexus/s/org.metaborg/platform?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
60+
[mvn-snap-badge:org.metaborg:catalog]: https://img.shields.io/nexus/s/org.metaborg/catalog?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
61+
[mvn-snap-badge:org.metaborg:platform]: https://img.shields.io/nexus/s/org.metaborg/platform?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
6262
[mvn-snap-badge:org.metaborg.convention.settings:org.metaborg.convention.settings.gradle.plugin]: https://img.shields.io/nexus/s/org.metaborg.convention.settings/org.metaborg.convention.settings.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
6363
[mvn-snap-badge:org.metaborg.convention.java:org.metaborg.convention.java.gradle.plugin]: https://img.shields.io/nexus/s/org.metaborg.convention.java/org.metaborg.convention.java.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
6464
[mvn-snap-badge:org.metaborg.convention.maven-publish:org.metaborg.convention.maven-publish.gradle.plugin]: https://img.shields.io/nexus/s/org.metaborg.convention.maven-publish/org.metaborg.convention.maven-publish.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20

‎repo.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@ files:
4444
- path: "depman/"
4545
- path: "example/"
4646
- path: "repoman/"
47+
githubIssueTemplates:
48+
generate: false

‎repoman/src/main/kotlin/org/metaborg/repoman/meta/RepoMetadata.kt‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ data class RepoMetadata(
2222
/** The name of the main branch. For example: `"master"` */
2323
val mainBranch: String = Defaults.MAIN_BRANCH,
2424
/** The release tag prefix to use. For example: `"devenv-release/"` */
25-
val releaseTagPrefix: String = Defaults.RELEASE_TAG_PREFIX,
25+
val releaseTagPrefix: String = Defaults.RELEASE_TAG_PREFIX, // Spoofax 3
2626
/** The default Maven group of the artifacts in the build. For example: `"org.metaborg.devenv"` */
2727
val mavenGroup: String = "org.metaborg",
2828

@@ -49,13 +49,6 @@ data class RepoMetadata(
4949
/** A list of Gradle plugins published by the repo as part of Spoofax 3. */
5050
val spoofax3Plugins: List<GradlePlugin> = emptyList(),
5151

52-
/** A list of Maven libraries published by the repo. */
53-
val libraries: List<MavenArtifact> = emptyList(),
54-
/** A list of Spoofax languages published by the repo. */
55-
val languages: List<MavenArtifact> = emptyList(),
56-
/** A list of Gradle plugins published by the repo. */
57-
val plugins: List<GradlePlugin> = emptyList(),
58-
5952
/** An ordered list of developers that may be contacted about the repo. */
6053
val developers: List<Person> = emptyList(),
6154
/** An ordered list of (main) contributors that also worked on the repo. */
@@ -100,7 +93,7 @@ data class Readme(
10093
/** Whether to generate the file. */
10194
val generate: Boolean = true,
10295
/** Whether to update the file. */
103-
val update: Boolean = true,
96+
val update: Boolean = generate,
10497
/** Content to include in the main body of the readme; or `null`. */
10598
val body: Markdown? = null,
10699
)
@@ -111,7 +104,7 @@ data class License(
111104
/** Whether to generate the file. */
112105
val generate: Boolean = true,
113106
/** Whether to update the file. */
114-
val update: Boolean = true,
107+
val update: Boolean = generate,
115108
/** Whether to use a Markdown license file. */
116109
val markdown: Boolean = true,
117110
)
@@ -122,7 +115,7 @@ data class Contributing(
122115
/** Whether to generate the file. */
123116
val generate: Boolean = true,
124117
/** Whether to update the file. */
125-
val update: Boolean = true,
118+
val update: Boolean = generate,
126119
)
127120

128121
/** Metadata for the CODE_OF_CONDUCT.md file. */
@@ -131,7 +124,7 @@ data class CodeOfConduct(
131124
/** Whether to generate the file. */
132125
val generate: Boolean = true,
133126
/** Whether to update the file. */
134-
val update: Boolean = true,
127+
val update: Boolean = generate,
135128
)
136129

137130
/** Metadata for the CHANGELOG.md file. */
@@ -149,7 +142,7 @@ data class Gitignore(
149142
/** Whether to generate the file. */
150143
val generate: Boolean = true,
151144
/** Whether to update the file. */
152-
val update: Boolean = true,
145+
val update: Boolean = generate,
153146
/** Extra entries to include at the bottom of the .gitignore file; or `null`. */
154147
val extra: String? = null,
155148
)
@@ -160,7 +153,7 @@ data class GradleWrapper(
160153
/** Whether to generate the files. */
161154
val generate: Boolean = true,
162155
/** Whether to update the file. */
163-
val update: Boolean = true,
156+
val update: Boolean = generate,
164157
/** The version of the Gradle wrapper to generate. */
165158
val gradleVersion: String = "7.6.4",
166159
/** The kind of Gradle distribution type to use, either `"bin"` or `"all"`. */
@@ -192,7 +185,7 @@ data class GithubWorkflows(
192185
/** Whether to generate the files. */
193186
val generate: Boolean = true,
194187
/** Whether to update the file. */
195-
val update: Boolean = true,
188+
val update: Boolean = generate,
196189
/** Whether to publish releases using GitHub CI (instead of Jenkins or something else). */
197190
val publishRelease: Boolean = false,
198191
/** Whether to publish snapshots using GitHub CI. */
@@ -213,7 +206,7 @@ data class GithubIssueTemplates(
213206
/** Whether to generate the files. */
214207
val generate: Boolean = true,
215208
/** Whether to update the file. */
216-
val update: Boolean = true,
209+
val update: Boolean = generate,
217210
/** Whether to automatically assign developers to issues. */
218211
val assignDevelopers: Boolean = true,
219212
/** Whether to use the GitHub Discussions tab. */

‎repoman/src/main/resources/templates/README.md.kte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Unless required by applicable law or agreed to in writing, software distributed
117117
[mvn-rel-badge:${plugin.id}:${plugin.id}.gradle.plugin]: https://img.shields.io/nexus/r/${plugin.id}/${plugin.id}.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
118118
@endfor
119119
@for(artifact in meta.allArtifacts)
120-
[mvn-rel-badge:${artifact.group}:${artifact.name}]: https://img.shields.io/nexus/s/${artifact.group}/${artifact.name}?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
120+
[mvn-snap-badge:${artifact.group}:${artifact.name}]: https://img.shields.io/nexus/s/${artifact.group}/${artifact.name}?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20
121121
@endfor
122122
@for(plugin in meta.spoofax3Plugins)
123123
[mvn-snap-badge:${plugin.id}:${plugin.id}.gradle.plugin]: https://img.shields.io/nexus/s/${plugin.id}/${plugin.id}.gradle.plugin?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20

0 commit comments

Comments
 (0)