Merge branch 'master' of https://github.com/TabooLib/taboolib-gradle-plugin
# Conflicts: # build.gradle
This commit is contained in:
commit
9c88efae69
|
|
@ -24,8 +24,8 @@ dependencies {
|
||||||
compile 'org.codehaus.groovy:groovy:2.5.13'
|
compile 'org.codehaus.groovy:groovy:2.5.13'
|
||||||
compile gradleApi()
|
compile gradleApi()
|
||||||
compile localGroovy()
|
compile localGroovy()
|
||||||
embed 'org.ow2.asm:asm:8.0.1'
|
embed 'org.ow2.asm:asm:9.2'
|
||||||
embed 'org.ow2.asm:asm-commons:8.0.1'
|
embed 'org.ow2.asm:asm-commons:9.2'
|
||||||
embed 'com.google.code.gson:gson:2.8.7'
|
embed 'com.google.code.gson:gson:2.8.7'
|
||||||
embed 'org.jetbrains.kotlin:kotlin-stdlib'
|
embed 'org.jetbrains.kotlin:kotlin-stdlib'
|
||||||
}
|
}
|
||||||
|
|
@ -69,4 +69,4 @@ compileTestKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "1.8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue