Skip to content

Commit

Permalink
Update Kotlin, add JetBrains annotations and Kotlin coroutines
Browse files Browse the repository at this point in the history
closes #9
  • Loading branch information
shadowfacts committed Apr 29, 2017
1 parent 4dda702 commit d5138b9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
7 changes: 7 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ processResources {
}

repositories {
jcenter()
maven {
name "shadowfacts"
url "http://mvn.rx14.co.uk/shadowfacts/"
Expand All @@ -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 {
Expand All @@ -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",
Expand Down
6 changes: 4 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
mod_version = 1.4.1
mod_version = 1.4.2
group = net.shadowfacts
archivesBaseName = Forgelin

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
2 changes: 1 addition & 1 deletion src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

}

0 comments on commit d5138b9

Please sign in to comment.