Skip to content

Commit

Permalink
Merge pull request #1 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 d02d795 + a14ad8a commit 6e8023f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Uses a Discourse group as the whitelist for a Spigot server.
## Requirements

* Java 8
* Spigot 1.12

## Installation

Expand Down
21 changes: 13 additions & 8 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.0.5-2'
ext.kotlin_version = '1.1.3-2'

repositories {
mavenCentral()
Expand All @@ -23,13 +23,10 @@ plugins {
apply plugin: 'kotlin'

group = 'gg.obsidian'
version = '1.1.0'
version = '2.0.0'
description = """Use Discourse group as a whitelist"""
ext.url = 'https://github.com/the-obsidian/DiscourseBridge'

sourceCompatibility = 1.8
targetCompatibility = 1.8

repositories {
maven { url 'https://maven-central.storage.googleapis.com' }
maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' }
Expand All @@ -41,12 +38,20 @@ repositories {
}

dependencies {
compile group: 'org.spigotmc', name: 'spigot-api', version:'1.11-R0.1-SNAPSHOT'
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version:'1.0.0-rc-1036'
compile group: 'net.dv8tion', name: 'JDA', version:'1.3.0_188'
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: 'com.squareup.okhttp3', name: 'okhttp', version: '3.2.0'
}

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 6e8023f

Please sign in to comment.