Updated Kotlin to 1.5.21

This commit is contained in:
Licious17 2021-08-02 15:54:39 +01:00
parent 7e582d39ee
commit 5cb47eed7c
4 changed files with 18 additions and 42 deletions

View File

@ -1,25 +1,22 @@
buildscript { buildscript {
repositories { repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
jcenter() jcenter()
maven { mavenCentral()
name "forge"
url "http://files.minecraftforge.net/maven/"
}
} }
dependencies { dependencies {
classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT" classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.+', changing: true
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
} }
} }
plugins { plugins {
id "maven" id "maven"
id "com.github.johnrengelman.shadow" version "1.2.3" id "com.github.johnrengelman.shadow" version "5.2.0"
} }
apply plugin: "kotlin" apply plugin: "kotlin"
apply plugin: "net.minecraftforge.gradle.forge" apply plugin: 'net.minecraftforge.gradle'
apply from: "https://github.com/shadowfacts/maven/raw/master/maven.gradle"
version = mod_version version = mod_version
@ -27,35 +24,18 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
minecraft { minecraft {
version = mc_version + "-" + forge_version mappings channel: 'stable', version: '39-1.12'
runDir = "run"
mappings = mcp_mappings
replaceIn "Forgelin.kt"
replace "@VERSION@", mod_version
useDepAts = true
} }
processResources { sourceSets.main.resources { srcDir 'src/generated/resources' }
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
from (sourceSets.main.resources.srcDirs) {
include "mcmod.info"
expand "version": project.version, "mcversion": mc_version
}
from (sourceSets.main.resources.srcDirs) {
exclude "mcmod.info"
}
}
repositories { repositories {
jcenter() jcenter()
mavenCentral()
} }
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2855'
compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib", version: kotlin_version compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib", version: kotlin_version
compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk7", version: kotlin_version compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk7", version: kotlin_version
compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: kotlin_version compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: kotlin_version
@ -85,7 +65,7 @@ shadowJar {
} }
manifest { manifest {
attributes "FMLCorePlugin": "net.shadowfacts.forgelin.preloader.ForgelinPlugin", attributes "FMLCorePlugin": "net.shadowfacts.forgelin.preloader.ForgelinPlugin",
"FMLCorePluginContainsFMLMod": "true" "FMLCorePluginContainsFMLMod": "true"
} }
} }
@ -97,10 +77,10 @@ artifacts {
reobf { reobf {
shadowJar { shadowJar {
mappingType = "SEARGE"
} }
} }
tasks.reobfShadowJar.mustRunAfter shadowJar tasks.reobfShadowJar.mustRunAfter shadowJar
tasks.build.dependsOn reobfShadowJar tasks.build.dependsOn reobfShadowJar
jar.finalizedBy('reobfJar')

View File

@ -1,11 +1,7 @@
mod_version = 1.8.4 mod_version = 1.9.0
group = net.shadowfacts group = net.shadowfacts
archivesBaseName = Forgelin archivesBaseName = Forgelin
mc_version = 1.12.2 kotlin_version = 1.5.21
mcp_mappings = snapshot_20180609 annotations_version = 21.0.1
forge_version = 14.23.4.2705 coroutines_version = 1.5.0
kotlin_version = 1.3.50
annotations_version = 16.0.3
coroutines_version = 1.3.1

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip

View File

@ -14,7 +14,7 @@ object Forgelin {
const val MOD_ID = "forgelin" const val MOD_ID = "forgelin"
const val NAME = "Forgelin" const val NAME = "Forgelin"
const val VERSION = "@VERSION@" const val VERSION = "1.9.0"
@EventHandler @EventHandler
fun onPreInit(event: FMLPreInitializationEvent) { fun onPreInit(event: FMLPreInitializationEvent) {