minecraft
/
Forgelin
mirror of https://github.com/shadowfacts/Forgelin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update Kotlin, add JetBrains annotations and Kotlin coroutines 

closes #9
This commit is contained in:
Shadowfacts 2017-04-29 12:05:56 -04:00
parent 4dda702c93
commit d5138b9814
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@ -52,6 +52,7 @@ processResources {
} }
repositories { repositories {
jcenter()
maven { maven {
name "shadowfacts" name "shadowfacts"
url "http://mvn.rx14.co.uk/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-stdlib", version: kotlin_version
compile group: "org.jetbrains.kotlin", name: "kotlin-reflect", 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.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 { jar {
@ -83,6 +87,9 @@ shadowJar {
include(dependency("org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"))
include(dependency("org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}")) include(dependency("org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"))
include(dependency("org.jetbrains.kotlin:kotlin-runtime:${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 { manifest {
attributes "FMLCorePlugin": "net.shadowfacts.forgelin.preloader.ForgelinPlugin", attributes "FMLCorePlugin": "net.shadowfacts.forgelin.preloader.ForgelinPlugin",

6
gradle.properties
View File

@ -1,4 +1,4 @@
mod_version = 1.4.1 mod_version = 1.4.2
group = net.shadowfacts group = net.shadowfacts
archivesBaseName = Forgelin archivesBaseName = Forgelin
@ -6,4 +6,6 @@ mc_version = 1.10.2
mcp_mappings = snapshot_20160802 mcp_mappings = snapshot_20160802
forge_version = 12.18.1.2045 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
src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt
View File

@ -10,6 +10,6 @@ object Forgelin {
const val MOD_ID = "forgelin" const val MOD_ID = "forgelin"
const val NAME = "Forgelin" const val NAME = "Forgelin"
const val VERSION = "1.4.1" const val VERSION = "1.4.2"
} }