forked from RepoMirrors/kami-blue
try to compile kotlin properly 3.0
This commit is contained in:
parent
6c1c6459f5
commit
3191a63a84
27
build.gradle
27
build.gradle
|
@ -1,7 +1,6 @@
|
||||||
// forge's stuff
|
// forge's stuff
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.3.72'
|
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven {
|
maven {
|
||||||
|
@ -17,18 +16,28 @@ buildscript {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
|
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
|
||||||
classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
|
classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
|
||||||
classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
|
classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath group: 'org.jetbrains.kotlin', name: 'kotlin-gradle-plugin', version: "${kotlin_version}" }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||||
apply plugin: 'org.spongepowered.mixin'
|
apply plugin: 'org.spongepowered.mixin'
|
||||||
apply plugin: 'com.github.johnrengelman.shadow'
|
apply plugin: 'com.github.johnrengelman.shadow'
|
||||||
|
|
||||||
version project.modVersion
|
version project.modVersion
|
||||||
group project.modGroup // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
group project.modGroup // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
|
|
||||||
|
compileKotlin {
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = "1.8"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = "1.8"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sourceCompatibility = targetCompatibility = '1.8'
|
sourceCompatibility = targetCompatibility = '1.8'
|
||||||
compileJava {
|
compileJava {
|
||||||
sourceCompatibility = targetCompatibility = '1.8'
|
sourceCompatibility = targetCompatibility = '1.8'
|
||||||
|
@ -154,13 +163,3 @@ jar {
|
||||||
}
|
}
|
||||||
|
|
||||||
build.dependsOn(shadowJar)
|
build.dependsOn(shadowJar)
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
compileTestKotlin {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -4,3 +4,4 @@ modVersion=1.1.4-beta
|
||||||
modBaseName=kamiblue
|
modBaseName=kamiblue
|
||||||
forgeVersion=1.12.2-14.23.5.2847
|
forgeVersion=1.12.2-14.23.5.2847
|
||||||
mcpVersion=stable_39
|
mcpVersion=stable_39
|
||||||
|
kotlin_version=1.3.40
|
Loading…
Reference in New Issue