Improved the modules and the output jars names

GameModsBR · Oct 20, 2016 · 42a1220 · 42a1220
1 parent 793d9bc
commit 42a1220
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/KotlinFunBukkit/build.gradle → BukkitPlugin/build.gradle b/KotlinFunBukkit/build.gradle → BukkitPlugin/build.gradle
@@ -4,13 +4,13 @@ repositories {
 
 dependencies {
     compile 'org.bukkit:bukkit:1.10.2-R0.1-SNAPSHOT'
-    compile project(':KotlinFunBungeeChat')
+    compile project(':BungeeChat')
 }
 
 
 shadowJar {
     dependencies {
-        include project(':KotlinFunBungeeChat')
+        include project(':BungeeChat')
     }
 }
 

diff --git a/...r/com/gamemods/kotlinfun/bukkit/bukkit.kt → ...r/com/gamemods/kotlinfun/bukkit/bukkit.kt b/...r/com/gamemods/kotlinfun/bukkit/bukkit.kt → ...r/com/gamemods/kotlinfun/bukkit/bukkit.kt
diff --git a/...inFunBukkit/src/main/resources/plugin.yml → BukkitPlugin/src/main/resources/plugin.yml b/...inFunBukkit/src/main/resources/plugin.yml → BukkitPlugin/src/main/resources/plugin.yml
diff --git a/...amemods/kotlinfun/bukkit/KotlinFunTest.kt → ...amemods/kotlinfun/bukkit/KotlinFunTest.kt b/...amemods/kotlinfun/bukkit/KotlinFunTest.kt → ...amemods/kotlinfun/bukkit/KotlinFunTest.kt
diff --git a/...om/gamemods/kotlinfun/bungee/Colorized.kt → ...om/gamemods/kotlinfun/bungee/Colorized.kt b/...om/gamemods/kotlinfun/bungee/Colorized.kt → ...om/gamemods/kotlinfun/bungee/Colorized.kt
diff --git a/KotlinFunBungee/build.gradle → BungeePlugin/build.gradle b/KotlinFunBungee/build.gradle → BungeePlugin/build.gradle
@@ -1,11 +1,11 @@
 dependencies {
     compile 'net.md-5:bungeecord-api:1.10-SNAPSHOT'
-    compile project(':KotlinFunBungeeChat')
+    compile project(':BungeeChat')
 }
 
 shadowJar {
     dependencies {
-        include project(':KotlinFunBungeeChat')
+        include project(':BungeeChat')
     }
 }
 

diff --git a/...r/com/gamemods/kotlinfun/bungee/bungee.kt → ...r/com/gamemods/kotlinfun/bungee/bungee.kt b/...r/com/gamemods/kotlinfun/bungee/bungee.kt → ...r/com/gamemods/kotlinfun/bungee/bungee.kt
diff --git a/...inFunBungee/src/main/resources/bungee.yml → BungeePlugin/src/main/resources/bungee.yml b/...inFunBungee/src/main/resources/bungee.yml → BungeePlugin/src/main/resources/bungee.yml
diff --git a/build.gradle b/build.gradle
@@ -59,6 +59,10 @@ subprojects {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
+    jar {
+        baseName = "KotlinFun-${project.name}"
+    }
+
     shadowJar {
         dependencies {
             include dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
@@ -68,32 +72,33 @@ subprojects {
         }
 
         classifier = null
+        baseName = "KotlinFun-${project.name}"
         // relocate 'kotlin', 'br.com.gamemods.kotlinfun.kotlin'
     }
 
     build.finalizedBy shadowJar
 }
 
-project(':KotlinFunBungeeChat') {
+project(':BungeeChat') {
     dependencies {
         compile 'net.md-5:bungeecord-chat:1.10-SNAPSHOT'
     }
 }
 
-project(':KotlinFunUniversal') {
+project(':UniversalPlugin') {
     repositories {
         maven { url = bukkit_repo }
     }
 
     dependencies {
-        compile project(':KotlinFunBungee')
-        compile project(':KotlinFunBukkit')
+        compile project(':BungeePlugin')
+        compile project(':BukkitPlugin')
     }
 
     shadowJar {
         dependencies {
-            include project(':KotlinFunBungee')
-            include project(':KotlinFunBukkit')
+            include project(':BungeePlugin')
+            include project(':BukkitPlugin')
         }
     }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
 rootProject.name = 'KotlinFun'
-include 'KotlinFunBukkit', 'KotlinFunBungee', 'KotlinFunBungeeChat', 'KotlinFunUniversal'
+include 'BukkitPlugin', 'BungeePlugin', 'BungeeChat', 'UniversalPlugin'