From f7f7e2735ce0cb44cfe792191a0fb40a9fdf2be8 Mon Sep 17 00:00:00 2001 From: Jacob Gillespie Date: Sat, 8 Jul 2017 20:05:41 -0500 Subject: [PATCH 1/2] Compile for Spigot 1.12 --- build.gradle | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index a3a1210..4a91639 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import org.apache.tools.ant.filters.ReplaceTokens buildscript { - ext.kotlin_version = '1.1.2' + ext.kotlin_version = '1.1.3-2' repositories { mavenCentral() @@ -22,12 +22,12 @@ plugins { apply plugin: 'kotlin' group = 'gg.obsidian' -version = '2.0.0' +version = '3.0.0' description = """Bridge chat between Minecraft and Discord""" ext.url = 'https://github.com/the-obsidian/DiscordBridge' repositories { - maven { url 'https://maven-central.storage.googleapis.com' } + mavenCentral() maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } maven { url 'http://lutece.paris.fr/nexus/content/repositories/lutece_third_party' } @@ -37,8 +37,8 @@ repositories { } dependencies { - compile group: 'org.spigotmc', name: 'spigot-api', version: '1.11.2-R0.1-SNAPSHOT' - compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.0.0-rc-1036' + compile group: 'org.spigotmc', name: 'spigot-api', version: '1.12-R0.1-SNAPSHOT' + compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.1.3-2' compile group: 'net.dv8tion', name: 'JDA', version: '3.0.BETA2_108' compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1' compile group: 'org.pegdown', name:'pegdown', version: '1.6.0' @@ -47,6 +47,15 @@ dependencies { compile files('libraries/dynmap-api-2.5-SNAPSHOT.jar') } +compileKotlin { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + + kotlinOptions { + jvmTarget = "1.8" + } +} + processResources { filter ReplaceTokens, tokens: [ 'DESCRIPTION': project.property('description'), From 58507df7e31fb324cc389de5f10b7b906d8f49ba Mon Sep 17 00:00:00 2001 From: Jacob Gillespie Date: Sat, 8 Jul 2017 20:06:40 -0500 Subject: [PATCH 2/2] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5c37baa..a3a2952 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Bridges chat between Discord and Minecraft (Bukkit/Spigot). ## Requirements * Java 8 -* Spigot 1.11.2 +* Spigot 1.12 ## Installation @@ -98,7 +98,7 @@ templates: * `relay_cancelled_messages` will relay chat messages even if they are cancelled * `messages` enables or disables certain kinds of messages * `if_vanished` enables or disables messages if the user is vanished (applies after `messages`) -* `templates` - customize the message text +* `templates` - customize the message text **Templates**