Update Publishing to use new cred method

Signed-off-by: Joseph T. McQuigg <[email protected]>

Author: JT122406

fabric/build.gradle.kts

@@ -105,8 +105,8 @@ tasks {
 
 publisher {
     apiKeys {
-        curseforge(project.properties["curseforge_token"].toString())
-        modrinth(project.properties["modrinth_token"].toString())
+        curseforge(getPublishingCredentials().first)
+        modrinth(getPublishingCredentials().second)
         github(project.properties["github_token"].toString())
     }
 
@@ -153,9 +153,21 @@ publishing {
             url = uri(if (project.version.toString().endsWith("SNAPSHOT") || project.version.toString().startsWith("0")) snapshotsRepoUrl else releasesRepoUrl)
             name = "Generations-Repo"
             credentials {
-                username = project.properties["repoLogin"]?.toString()
-                password = project.properties["repoPassword"]?.toString()
+                username = getGensCredentials().first
+                password = getGensCredentials().second
             }
         }
     }
+}
+
+private fun getGensCredentials(): Pair<String?, String?> {
+    val username = (project.findProperty("gensUsername") ?: System.getenv("GENS_USERNAME") ?: "") as String?
+    val password = (project.findProperty("gensPassword") ?: System.getenv("GENS_PASSWORD") ?: "") as String?
+    return Pair(username, password)
+}
+
+private fun getPublishingCredentials(): Pair<String?, String?> {
+    val curseForgeToken = (project.findProperty("curseforge_token") ?: System.getenv("CURSEFORGE_TOKEN") ?: "") as String?
+    val modrinthToken = (project.findProperty("modrinth_token") ?: System.getenv("MODRINTH_TOKEN") ?: "") as String?
+    return Pair(curseForgeToken, modrinthToken)
 }

fabric/src/main/resources/fabric.mod.json

@@ -6,6 +6,7 @@
   "name": "Generations-Core",
   "description": "",
   "authors": ["Joseph T. McQuigg (JT122406)", "Waterpicker"],
+  "contributors": ["Greg_lor"],
   "contact": {},
   "icon": "generations.png",
 

forge/build.gradle.kts

@@ -113,8 +113,8 @@ tasks {
 
 publisher {
     apiKeys {
-        curseforge(project.properties["curseforge_token"].toString())
-        modrinth(project.properties["modrinth_token"].toString())
+        curseforge(getPublishingCredentials().first)
+        modrinth(getPublishingCredentials().second)
         github(project.properties["github_token"].toString())
     }
 
@@ -160,9 +160,21 @@ publishing {
             url = uri(if (project.version.toString().endsWith("SNAPSHOT") || project.version.toString().startsWith("0")) snapshotsRepoUrl else releasesRepoUrl)
             name = "Generations-Repo"
             credentials {
-                username = project.properties["repoLogin"]?.toString()
-                password = project.properties["repoPassword"]?.toString()
+                username = getGensCredentials().first
+                password = getGensCredentials().second
             }
         }
     }
+}
+
+private fun getGensCredentials(): Pair<String?, String?> {
+    val username = (project.findProperty("gensUsername") ?: System.getenv("GENS_USERNAME") ?: "") as String?
+    val password = (project.findProperty("gensPassword") ?: System.getenv("GENS_PASSWORD") ?: "") as String?
+    return Pair(username, password)
+}
+
+private fun getPublishingCredentials(): Pair<String?, String?> {
+    val curseForgeToken = (project.findProperty("curseforge_token") ?: System.getenv("CURSEFORGE_TOKEN") ?: "") as String?
+    val modrinthToken = (project.findProperty("modrinth_token") ?: System.getenv("MODRINTH_TOKEN") ?: "") as String?
+    return Pair(curseForgeToken, modrinthToken)
 }

gradle.properties

@@ -43,6 +43,4 @@ systemProp.org.gradle.internal.repository.max.tentative=10
 systemProp.org.gradle.internal.repository.initial.backoff=500
 
 # Publishing
-curseforge_token=xxx
-modrinth_token=xxx
 github_token=xxx