Merge pull request #31 from TheProgramSrc/patch/update-depends

Author: Francisco Solis

.gitignore

@@ -77,3 +77,5 @@ bin/
 *.pom.xml
 modules/
 !gradle-wrapper.jar
+plugins/
+translations/

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.6 - Snapshot
+* Updated depends
+* Moved to JitCI
+* Improve testing to avoid unwanted files committed
+
 # v0.1.5 - Snapshot
 * Now translations are automatically colorized (unless you set `colorize` to `false`)
 * Updated tests

README.md

@@ -1,6 +1,9 @@
+[![](https://jitci.com/gh/TheProgramSrc/SimpleCore-TranslationsModule/svg)](https://jitci.com/gh/TheProgramSrc/SimpleCore-TranslationsModule)
+[![](https://jitpack.io/v/xyz.theprogramsrc/SimpleCore-TranslationsModule.svg)](https://jitpack.io/#xyz.theprogramsrc/SimpleCore-TranslationsModule)
+
 # SimpleCore-TranslationsModule
 Translations module for SimpleCore API.
 
 # Documentation
 * [Wiki](https://github.com/TheProgramSrc/SimpleCore-TranslationsModule/wiki)
-* [JavaDocs](https://theprogramsrc.github.io/SimpleCore-TranslationsModule/)
+* [JavaDocs](https://docs.theprogramsrc.xyz/SimpleCore-TranslationsModule/)

build.gradle

@@ -1,13 +1,12 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.7.20'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'cl.franciscosolis.blossom-extended' version '1.3.1'
     id 'org.jetbrains.dokka' version '1.7.20'
 }
 
-def projectVersion = (System.getenv("VERSION") ?: '0.1.5-SNAPSHOT').replaceFirst("v", "").replace('/', '')
+def projectVersion = (System.getenv("VERSION") ?: '0.1.6-SNAPSHOT').replaceFirst("v", "").replace('/', '')
 
 group 'xyz.theprogramsrc'
 version projectVersion
@@ -56,8 +55,12 @@ java {
     withSourcesJar()
 }
 
-processResources {
-    filter ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description, git_short: System.getenv("GIT_COMMIT_SHORT_HASH") ?: "unknown", git_full: System.getenv("GIT_COMMIT_LONG_HASH") ?: "unknown"]
+blossom {
+    replaceToken '@name@', rootProject.name
+    replaceToken '@version@', project.version.toString()
+    replaceToken '@description@', project.description
+    replaceToken '@git_short@', System.getenv("GIT_COMMIT_SHORT_HASH") ?: "unknown"
+    replaceToken '@git_full@', System.getenv("GIT_COMMIT_LONG_HASH") ?: "unknown"
 }
 
 tasks.withType(JavaCompile) {
@@ -86,10 +89,12 @@ publishing {
     repositories {
         if(System.getenv('env') == 'prod'){
             maven {
-                name = 'TheProgramSrcRepository'
-                credentials.username = System.getenv('NEXUS_USERNAME')
-                credentials.password = System.getenv('NEXUS_PASSWORD')
-                url = uri("https://repo.theprogramsrc.xyz/repository/simplecoreapi-modules/")
+                name = 'GitHubPackages'
+                url = 'https://maven.pkg.github.com/TheProgramSrc/SimpleCore-TasksModule'
+                credentials {
+                    username = System.getenv('GITHUB_ACTOR')
+                    password = System.getenv('GITHUB_TOKEN')
+                }
             }
         }else{
             mavenLocal()

src/test/kotlin/xyz/theprogramsrc/translationsmodule/TranslationColorTest.kt

@@ -1,8 +1,11 @@
 package xyz.theprogramsrc.translationsmodule
 
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import java.io.File
 
 internal class TranslationColorTest {
 
@@ -13,6 +16,17 @@ internal class TranslationColorTest {
             TranslationManager()
         }
 
+        @AfterAll
+        @JvmStatic
+        fun tearDown() {
+            File("translations").deleteRecursively()
+            File("plugins").deleteRecursively()
+        }
+    }
+
+    @BeforeEach
+    fun beforeEach() {
+        File("translations").deleteRecursively()
     }
 
     @Test

src/test/kotlin/xyz/theprogramsrc/translationsmodule/TranslationManagerTest.kt

@@ -2,6 +2,7 @@ package xyz.theprogramsrc.translationsmodule
 
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -15,6 +16,13 @@ internal class TranslationManagerTest {
         fun setUp() {
             TranslationManager()
         }
+
+        @AfterAll
+        @JvmStatic
+        fun tearDown() {
+            File("translations").deleteRecursively()
+            File("plugins").deleteRecursively()
+        }
     }
 
     @BeforeEach