try to compile kotlin properly 3.0

This commit is contained in:
Bella 2020-04-23 12:37:03 -04:00
parent 6c1c6459f5
commit 3191a63a84
No known key found for this signature in database
GPG Key ID: DBD4A6030080C8B3
2 changed files with 15 additions and 15 deletions

View File

@ -1,7 +1,6 @@
// forge's stuff
buildscript {
ext.kotlin_version = '1.3.72'
repositories {
jcenter()
maven {
@ -17,18 +16,28 @@ buildscript {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
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: 'net.minecraftforge.gradle.forge'
apply plugin: 'org.spongepowered.mixin'
apply plugin: 'com.github.johnrengelman.shadow'
version project.modVersion
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'
compileJava {
sourceCompatibility = targetCompatibility = '1.8'
@ -154,13 +163,3 @@ jar {
}
build.dependsOn(shadowJar)
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}

View File

@ -3,4 +3,5 @@ modGroup=me.zeroeightsix
modVersion=1.1.4-beta
modBaseName=kamiblue
forgeVersion=1.12.2-14.23.5.2847
mcpVersion=stable_39
mcpVersion=stable_39
kotlin_version=1.3.40