@@ -174,14 +174,14 @@ def getGhVersion() {
174174 return version. substring(0 , version. indexOf(" -MC" ))
175175}
176176
177- def getChangelogLink (String platform , String from ) {
177+ def getChangelogLink (String platform , String from , String minecraftVersion , String archivesBaseName ) {
178178 def versionSlug = getGhVersion(). substring(1 ). replace(" ." , " -" )
179179 def shortURL = " https://www.wurstclient.net/updates/wurst-${ versionSlug} /"
180180 def query = []
181181 if (platform != " GitHub" )
182- query. add(" mc=${ project.minecraft_version } " )
182+ query. add(" mc=${ minecraftVersion } " )
183183 query. add(" utm_source=${ platform} " )
184- query. add(" utm_medium=" + project . archives_base_name . replace(" -" , " +" ))
184+ query. add(" utm_medium=" + archivesBaseName . replace(" -" , " +" ))
185185 def fullURL = shortURL + (query. isEmpty() ? " " : " ?" + query. join(" &" ))
186186 def encodedURL = java.net.URLEncoder . encode(fullURL, " UTF-8" )
187187 return " [${ shortURL} ](https://go.wimods.net/from/${ from} ?to=${ encodedURL} )"
@@ -191,23 +191,25 @@ def getChangelogImage(String from) {
191191 return " "
192192}
193193
194- def getChangelog (String platform , String from ) {
194+ def getChangelog (String platform , String from , String minecraftVersion , String modLoader , String archivesBaseName ) {
195195 def prefix = platform == " GitHub" ? " " : " A changelog can be found at: "
196- def imgQuery = platform == " GitHub" ? " " : " ?mc_version=${ project.minecraft_version } &mod_loader=${ project.mod_loader } "
197- return prefix + getChangelogLink(platform, from) + getChangelogImage(from + imgQuery)
196+ def imgQuery = platform == " GitHub" ? " " : " ?mc_version=${ minecraftVersion } &mod_loader=${ modLoader } "
197+ return prefix + getChangelogLink(platform, from, minecraftVersion, archivesBaseName ) + getChangelogImage(from + imgQuery)
198198}
199199
200200import org.kohsuke.github.GHReleaseBuilder
201201import org.kohsuke.github.GitHub
202202
203203task github (dependsOn : build) {
204+ def repoIdProvider = providers. gradleProperty(" mcx_repo_id" )
205+
204206 onlyIf {
205207 ENV . GITHUB_TOKEN
206208 }
207209
208210 doLast {
209211 def github = GitHub . connectUsingOAuth(ENV . GITHUB_TOKEN as String )
210- def repoId = project . mcx_repo_id
212+ def repoId = repoIdProvider . get()
211213 def repository = github. getRepository(repoId)
212214 def ghVersion = getGhVersion()
213215
@@ -229,13 +231,18 @@ import org.kohsuke.github.GHMilestoneState
229231import java.time.Instant
230232
231233task closeMilestone {
234+ def repoIdProvider = providers. gradleProperty(" gh_repo_id" )
235+ def minecraftVersionProvider = providers. gradleProperty(" minecraft_version" )
236+ def modLoaderProvider = providers. gradleProperty(" mod_loader" )
237+ def archivesBaseNameProvider = providers. gradleProperty(" archives_base_name" )
238+
232239 onlyIf {
233240 ENV . GITHUB_TOKEN
234241 }
235242
236243 doLast {
237244 def github = GitHub . connectUsingOAuth(ENV . GITHUB_TOKEN as String )
238- def repoId = project . gh_repo_id
245+ def repoId = repoIdProvider . get()
239246 def repository = github. getRepository(repoId)
240247 def ghVersion = getGhVersion()
241248
@@ -247,7 +254,8 @@ task closeMilestone {
247254
248255 if (milestone. getState() != GHMilestoneState . CLOSED ) {
249256 milestone. setDueOn(Date . from(Instant . now()))
250- milestone. setDescription(getChangelog(" GitHub" , " github.com/${ repoId} /milestone/${ ghVersion} " ))
257+ milestone. setDescription(getChangelog(" GitHub" , " github.com/${ repoId} /milestone/${ ghVersion} " ,
258+ minecraftVersionProvider. get(), modLoaderProvider. get(), archivesBaseNameProvider. get()))
251259 milestone. close()
252260 }
253261 }
0 commit comments