Skip to content

Commit 1ca2e16

Browse files
Merge pull request #52 from the-obsidian/mc-1.12
Update for Spigot 1.12
2 parents 7a274c3 + 58507df commit 1ca2e16

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bridges chat between Discord and Minecraft (Bukkit/Spigot).
55
## Requirements
66

77
* Java 8
8-
* Spigot 1.11.2
8+
* Spigot 1.12
99

1010
## Installation
1111

@@ -98,7 +98,7 @@ templates:
9898
* `relay_cancelled_messages` will relay chat messages even if they are cancelled
9999
* `messages` enables or disables certain kinds of messages
100100
* `if_vanished` enables or disables messages if the user is vanished (applies after `messages`)
101-
* `templates` - customize the message text
101+
* `templates` - customize the message text
102102
103103
**Templates**
104104

Diff for: build.gradle

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.apache.tools.ant.filters.ReplaceTokens
22

33
buildscript {
4-
ext.kotlin_version = '1.1.2'
4+
ext.kotlin_version = '1.1.3-2'
55

66
repositories {
77
mavenCentral()
@@ -22,12 +22,12 @@ plugins {
2222
apply plugin: 'kotlin'
2323

2424
group = 'gg.obsidian'
25-
version = '2.0.0'
25+
version = '3.0.0'
2626
description = """Bridge chat between Minecraft and Discord"""
2727
ext.url = 'https://github.com/the-obsidian/DiscordBridge'
2828

2929
repositories {
30-
maven { url 'https://maven-central.storage.googleapis.com' }
30+
mavenCentral()
3131
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
3232
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
3333
maven { url 'http://lutece.paris.fr/nexus/content/repositories/lutece_third_party' }
@@ -37,8 +37,8 @@ repositories {
3737
}
3838

3939
dependencies {
40-
compile group: 'org.spigotmc', name: 'spigot-api', version: '1.11.2-R0.1-SNAPSHOT'
41-
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.0.0-rc-1036'
40+
compile group: 'org.spigotmc', name: 'spigot-api', version: '1.12-R0.1-SNAPSHOT'
41+
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.1.3-2'
4242
compile group: 'net.dv8tion', name: 'JDA', version: '3.0.BETA2_108'
4343
compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
4444
compile group: 'org.pegdown', name:'pegdown', version: '1.6.0'
@@ -47,6 +47,15 @@ dependencies {
4747
compile files('libraries/dynmap-api-2.5-SNAPSHOT.jar')
4848
}
4949

50+
compileKotlin {
51+
sourceCompatibility = JavaVersion.VERSION_1_8
52+
targetCompatibility = JavaVersion.VERSION_1_8
53+
54+
kotlinOptions {
55+
jvmTarget = "1.8"
56+
}
57+
}
58+
5059
processResources {
5160
filter ReplaceTokens, tokens: [
5261
'DESCRIPTION': project.property('description'),

0 commit comments

Comments
 (0)