From 42a12203c808a6fb4e1898750ce7657628fc943f Mon Sep 17 00:00:00 2001 From: joserobjr Date: Thu, 20 Oct 2016 12:17:24 -0300 Subject: [PATCH] Improved the modules and the output jars names --- {KotlinFunBukkit => BukkitPlugin}/build.gradle | 4 ++-- .../br/com/gamemods/kotlinfun/bukkit/bukkit.kt | 0 .../src/main/resources/plugin.yml | 0 .../gamemods/kotlinfun/bukkit/KotlinFunTest.kt | 0 .../com/gamemods/kotlinfun/bungee/Colorized.kt | 0 {KotlinFunBungee => BungeePlugin}/build.gradle | 4 ++-- .../br/com/gamemods/kotlinfun/bungee/bungee.kt | 0 .../src/main/resources/bungee.yml | 0 build.gradle | 17 +++++++++++------ settings.gradle | 2 +- 10 files changed, 16 insertions(+), 11 deletions(-) rename {KotlinFunBukkit => BukkitPlugin}/build.gradle (82%) rename {KotlinFunBukkit => BukkitPlugin}/src/main/kotlin/br/com/gamemods/kotlinfun/bukkit/bukkit.kt (100%) rename {KotlinFunBukkit => BukkitPlugin}/src/main/resources/plugin.yml (100%) rename {KotlinFunBukkit => BukkitPlugin}/src/test/kotlin/br/com/gamemods/kotlinfun/bukkit/KotlinFunTest.kt (100%) rename {KotlinFunBungeeChat => BungeeChat}/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/Colorized.kt (100%) rename {KotlinFunBungee => BungeePlugin}/build.gradle (80%) rename {KotlinFunBungee => BungeePlugin}/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/bungee.kt (100%) rename {KotlinFunBungee => BungeePlugin}/src/main/resources/bungee.yml (100%) diff --git a/KotlinFunBukkit/build.gradle b/BukkitPlugin/build.gradle similarity index 82% rename from KotlinFunBukkit/build.gradle rename to BukkitPlugin/build.gradle index d12635a..3bfba67 100644 --- a/KotlinFunBukkit/build.gradle +++ b/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/KotlinFunBukkit/src/main/kotlin/br/com/gamemods/kotlinfun/bukkit/bukkit.kt b/BukkitPlugin/src/main/kotlin/br/com/gamemods/kotlinfun/bukkit/bukkit.kt similarity index 100% rename from KotlinFunBukkit/src/main/kotlin/br/com/gamemods/kotlinfun/bukkit/bukkit.kt rename to BukkitPlugin/src/main/kotlin/br/com/gamemods/kotlinfun/bukkit/bukkit.kt diff --git a/KotlinFunBukkit/src/main/resources/plugin.yml b/BukkitPlugin/src/main/resources/plugin.yml similarity index 100% rename from KotlinFunBukkit/src/main/resources/plugin.yml rename to BukkitPlugin/src/main/resources/plugin.yml diff --git a/KotlinFunBukkit/src/test/kotlin/br/com/gamemods/kotlinfun/bukkit/KotlinFunTest.kt b/BukkitPlugin/src/test/kotlin/br/com/gamemods/kotlinfun/bukkit/KotlinFunTest.kt similarity index 100% rename from KotlinFunBukkit/src/test/kotlin/br/com/gamemods/kotlinfun/bukkit/KotlinFunTest.kt rename to BukkitPlugin/src/test/kotlin/br/com/gamemods/kotlinfun/bukkit/KotlinFunTest.kt diff --git a/KotlinFunBungeeChat/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/Colorized.kt b/BungeeChat/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/Colorized.kt similarity index 100% rename from KotlinFunBungeeChat/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/Colorized.kt rename to BungeeChat/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/Colorized.kt diff --git a/KotlinFunBungee/build.gradle b/BungeePlugin/build.gradle similarity index 80% rename from KotlinFunBungee/build.gradle rename to BungeePlugin/build.gradle index 6d0a941..3bb165d 100644 --- a/KotlinFunBungee/build.gradle +++ b/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/KotlinFunBungee/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/bungee.kt b/BungeePlugin/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/bungee.kt similarity index 100% rename from KotlinFunBungee/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/bungee.kt rename to BungeePlugin/src/main/kotlin/br/com/gamemods/kotlinfun/bungee/bungee.kt diff --git a/KotlinFunBungee/src/main/resources/bungee.yml b/BungeePlugin/src/main/resources/bungee.yml similarity index 100% rename from KotlinFunBungee/src/main/resources/bungee.yml rename to BungeePlugin/src/main/resources/bungee.yml diff --git a/build.gradle b/build.gradle index a998b0b..2150e6c 100644 --- 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 index d7ef646..95066e8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'KotlinFun' -include 'KotlinFunBukkit', 'KotlinFunBungee', 'KotlinFunBungeeChat', 'KotlinFunUniversal' +include 'BukkitPlugin', 'BungeePlugin', 'BungeeChat', 'UniversalPlugin'