Skip to content

Commit

Permalink
Merge pull request #52 from the-obsidian/mc-1.12
Browse files Browse the repository at this point in the history
Update for Spigot 1.12
  • Loading branch information
jacobwgillespie authored Jul 9, 2017
2 parents 7a274c3 + 58507df commit 1ca2e16
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bridges chat between Discord and Minecraft (Bukkit/Spigot).
## Requirements

* Java 8
* Spigot 1.11.2
* Spigot 1.12

## Installation

Expand Down Expand Up @@ -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**
Expand Down
19 changes: 14 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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' }
Expand All @@ -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'
Expand All @@ -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'),
Expand Down

0 comments on commit 1ca2e16

Please sign in to comment.