@@ -33,8 +33,8 @@ plugins {
3333 id(" dev.ithundxr.silk" ) version " 0.11.+" // https://github.com/IThundxr/silk
3434}
3535
36- val isRelease = System .getenv (" RELEASE_BUILD" )?.toBoolean() ? : false
37- val buildNumber = System .getenv (" GITHUB_RUN_NUMBER" )?.toInt()
36+ val isRelease = providers.environmentVariable (" RELEASE_BUILD" ).orNull ?.toBoolean() ? : false
37+ val buildNumber = providers.environmentVariable (" GITHUB_RUN_NUMBER" ).orNull ?.toInt()
3838val gitHash = " \" ${calculateGitHash() + (if (hasUnstaged()) " -modified" else " " )} \" "
3939
4040architectury {
@@ -107,9 +107,9 @@ subprojects {
107107 }
108108
109109 repositories {
110- val mavenToken = System .getenv (" MAVEN_TOKEN" )
110+ val mavenToken = providers.environmentVariable (" MAVEN_TOKEN" ).getOrElse( " " )
111111 val maven = if (isRelease) " releases" else " snapshots"
112- if (mavenToken != null && mavenToken .isNotEmpty()) {
112+ if (mavenToken.isNotEmpty()) {
113113 maven {
114114 url = uri(" https://maven.ithundxr.dev/${maven} " )
115115 credentials {
@@ -208,43 +208,38 @@ subprojects {
208208 skip()
209209 }
210210 }
211-
212- val releaseType = {
213- val versionStr = version.toString()
214- if (versionStr.contains(" alpha" )) {
215- ReleaseType .ALPHA ;
216- } else if (versionStr.contains(" beta" )) {
217- ReleaseType .BETA ;
218- } else {
219- ReleaseType .STABLE ;
220- }
221- }()
211+
212+ val releaseType = when {
213+ " alpha" in version.toString() -> ReleaseType .ALPHA
214+ " beta" in version.toString() -> ReleaseType .BETA
215+ else -> ReleaseType .STABLE
216+ }
222217 configure<ModPublishExtension > {
223218 file.set(remapJar.get().archiveFile)
224219 version.set(project.version.toString())
225220 changelog = ChangelogText .getChangelogText(rootProject).toString()
226221 type = releaseType
227- displayName = " Numismatics ${" mod_version" ()} ${ capitalizedName} ${" minecraft_version" ()} "
222+ displayName = " Numismatics ${" mod_version" ()} for $ capitalizedName ${" minecraft_version" ()} "
228223 modLoaders.add(project.name)
229224
230- val createVersionType = if (project.name == " fabric" ) " create-fabric" else " create"
225+ val createVersionSlug = if (project.name == " fabric" ) " create-fabric" else " create"
231226 curseforge {
232227 projectId = " curseforge_id" ()
233- accessToken = System .getenv (" CURSEFORGE_TOKEN" )
228+ accessToken = providers.environmentVariable (" CURSEFORGE_TOKEN" )
234229 minecraftVersions.add(" minecraft_version" ())
235230
236231 requires {
237- slug = createVersionType
232+ slug = createVersionSlug
238233 }
239234 }
240235
241236 modrinth {
242237 projectId = " modrinth_id" ()
243- accessToken = System .getenv (" MODRINTH_TOKEN" )
238+ accessToken = providers.environmentVariable (" MODRINTH_TOKEN" )
244239 minecraftVersions.add(" minecraft_version" ())
245240
246241 requires {
247- slug = createVersionType
242+ slug = createVersionSlug
248243 }
249244 }
250245 }
@@ -256,7 +251,7 @@ fun calculateGitHash(): String {
256251 commandLine(" git" , " rev-parse" , " HEAD" )
257252 }
258253 return output.standardOutput.asText.get().trim()
259- } catch (ignored : Throwable ) {
254+ } catch (_ : Throwable ) {
260255 return " unknown"
261256 }
262257}
@@ -270,13 +265,13 @@ fun hasUnstaged(): Boolean {
270265 if (result.isNotEmpty())
271266 println (" Found stageable results:\n ${result} \n " )
272267 return result.isNotEmpty()
273- } catch (ignored : Throwable ) {
268+ } catch (_ : Throwable ) {
274269 return false
275270 }
276271}
277272
278273tasks.register(" numismaticsPublish" ) {
279- when (val platform = System .getenv (" PLATFORM" )) {
274+ when (val platform = providers.environmentVariable (" PLATFORM" ).get( )) {
280275 " both" -> {
281276 dependsOn(tasks.build, " :fabric:publish" , " :neoforge:publish" , " :common:publish" , " :fabric:publishMods" , " :neoforge:publishMods" )
282277 }
0 commit comments