From d5138b9814b4af4e5e5d498df38aabdd830babbf Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sat, 29 Apr 2017 12:05:56 -0400 Subject: [PATCH] Update Kotlin, add JetBrains annotations and Kotlin coroutines closes #9 --- build.gradle | 7 +++++++ gradle.properties | 6 ++++-- src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bdd8be0..2621213 100644 --- a/build.gradle +++ b/build.gradle @@ -52,6 +52,7 @@ processResources { } repositories { + jcenter() maven { name "shadowfacts" url "http://mvn.rx14.co.uk/shadowfacts/" @@ -68,6 +69,9 @@ dependencies { compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib", version: kotlin_version compile group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: kotlin_version compile group: "org.jetbrains.kotlin", name: "kotlin-runtime", version: kotlin_version + compile group: "org.jetbrains", name: "annotations", version: annotations_version + compile group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutines_version + compile group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-jdk8", version: coroutines_version } jar { @@ -83,6 +87,9 @@ shadowJar { include(dependency("org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}")) include(dependency("org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}")) include(dependency("org.jetbrains.kotlin:kotlin-runtime:${kotlin_version}")) + include(dependency("org.jetbrains:annotations:${annotations_version}")) + include(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}")) + include(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${coroutines_version}")) } manifest { attributes "FMLCorePlugin": "net.shadowfacts.forgelin.preloader.ForgelinPlugin", diff --git a/gradle.properties b/gradle.properties index ddb3663..8ecb786 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version = 1.4.1 +mod_version = 1.4.2 group = net.shadowfacts archivesBaseName = Forgelin @@ -6,4 +6,6 @@ mc_version = 1.10.2 mcp_mappings = snapshot_20160802 forge_version = 12.18.1.2045 -kotlin_version = 1.1.1 +kotlin_version = 1.1.2 +annotations_version = 15.0 +coroutines_version = 0.14.1 diff --git a/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt b/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt index 31aa691..36644d4 100644 --- a/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt +++ b/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt @@ -10,6 +10,6 @@ object Forgelin { const val MOD_ID = "forgelin" const val NAME = "Forgelin" - const val VERSION = "1.4.1" + const val VERSION = "1.4.2" } \ No newline at end of file