Update MessagesExtensions.kt

README.md

@@ -4,16 +4,17 @@ Thanks for DevSrSouza / KotlinBukkitAPI.
 
 
 ```kotlin
-implementation("tech.carcadex:kotlinbukkitkit-architecture:1.0.0.3")
+val kbk_version = "1.0.1.0"
-implementation("tech.carcadex:kotlinbukkitkit-extensions:1.0.0.3")
+implementation("tech.carcadex:kotlinbukkitkit-architecture:$version")
-implementation("tech.carcadex:kotlinbukkitkit-serialization:1.0.0.3")
+implementation("tech.carcadex:kotlinbukkitkit-extensions:$version")
-implementation("tech.carcadex:kotlinbukkitkit-messages:1.0.0.3")
+implementation("tech.carcadex:kotlinbukkitkit-serialization:$version")
-implementation("tech.carcadex:kotlinbukkitkit-commands:1.0.0.3")
+implementation("tech.carcadex:kotlinbukkitkit-messages:$version")
-implementation("tech.carcadex:kotlinbukkitkit-utility:1.0.0.3")
+implementation("tech.carcadex:kotlinbukkitkit-commands:$version")
-implementation("tech.carcadex:kotlinbukkitkit-exposed:1.0.0.3")
+implementation("tech.carcadex:kotlinbukkitkit-utility:$version")
+implementation("tech.carcadex:kotlinbukkitkit-exposed:$version")
 
-compileOnly("tech.carcadex:kotlinbukkitkit-genref:1.0.0.3")
+compileOnly("tech.carcadex:kotlinbukkitkit-genref:$version")
-ksp("tech.carcadex:kotlinbukkitkit-genref:1.0.0.3")
+ksp("tech.carcadex:kotlinbukkitkit-genref:$version")
 ```
 
 

architecture/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("java")
     kotlin("jvm")
     id("com.github.johnrengelman.shadow") version "7.1.2"
+
     id("maven-publish")
     id("signing")
 }
@@ -101,17 +102,19 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 
     }
 }
 
+
+
 signing {
     useGpgCmd()
-    sign(publishing.publications.getByName("maven"))
+    sign(publishing.publications.asMap.values.first())
 }
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {

commands/build.gradle.kts

@@ -103,8 +103,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

exposed/build.gradle.kts

@@ -110,8 +110,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

extensions/build.gradle.kts

@@ -102,8 +102,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

genref/build.gradle.kts

@@ -105,8 +105,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

menu/build.gradle.kts

@@ -106,8 +106,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

messages/build.gradle.kts

@@ -112,8 +112,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

messages/src/main/java/tech/carcadex/kotlinbukkitkit/messages/kotlin/MessagesExtensions.kt

@@ -23,8 +23,8 @@ class MessagesBuilder(var legacy: Boolean = false,
     fun build(): Messages {
         if(plugin == null) throw RuntimeException("Missed plugin")
         return if(file == null) {
-            return (if(legacy) Messages.legacy(fileName ?: "messages.yml", plugin!!) else Messages.of(fileName ?: "messages.yml", plugin!!)).also { m -> verifier?.let { m.verifier(it) } }
+            (if(legacy) Messages.legacy(fileName ?: "messages.yml", plugin!!) else Messages.of(fileName ?: "messages.yml", plugin!!)).also { m -> verifier?.let { m.verifier(it) } }
-        } else return (if(legacy) Messages.legacy(file!!, plugin!!) else Messages.of(file!!, plugin!!)).also { m -> verifier?.let { m.verifier(it) } }
+        } else (if(legacy) Messages.legacy(file!!, plugin!!) else Messages.of(file!!, plugin!!)).also { m -> verifier?.let { m.verifier(it) } }
     }
 }
 

serialization/build.gradle.kts

@@ -105,8 +105,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

thirdparty/build.gradle.kts

@@ -105,8 +105,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }
 

utility/build.gradle.kts

@@ -105,8 +105,8 @@ publishing {
             val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
             credentials {
-                username = "itzRedTea"
+                username = project.findProperty("ossrhUsername").toString()
-                password = project.findProperty("password").toString()
+                password = project.findProperty("ossrhPassword").toString()
             }
         }