Update Kotlin and Arrow

This commit is contained in:
kageru 2019-11-24 14:25:32 +01:00
parent 83a7b2cbdf
commit 5679d5d8dd
Signed by: kageru
GPG Key ID: 8282A2BEA4ADA3D2

View File

@ -1,65 +1,65 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
apply { apply {
plugin("kotlin-kapt") plugin("kotlin-kapt")
} }
plugins { plugins {
kotlin("jvm") version "1.3.50" kotlin("jvm") version "1.3.70"
id("com.github.johnrengelman.shadow") version "5.1.0" apply true id("com.github.johnrengelman.shadow") version "5.1.0" apply true
application application
} }
val botMainClass = "moe.kageru.kagebot.KagebotKt" val botMainClass = "moe.kageru.kagebot.KagebotKt"
application { application {
mainClassName = botMainClass mainClassName = botMainClass
} }
tasks.withType<Jar> { tasks.withType<Jar> {
manifest { manifest {
attributes( attributes(
mapOf( mapOf(
"Main-Class" to botMainClass "Main-Class" to botMainClass
) )
) )
} }
} }
group = "moe.kageru.kagebot" group = "moe.kageru.kagebot"
version = "0.1" version = "0.1"
repositories { repositories {
mavenCentral() mavenCentral()
jcenter() jcenter()
maven { maven {
url = uri("https://dl.bintray.com/arrow-kt/arrow-kt/") url = uri("https://dl.bintray.com/arrow-kt/arrow-kt/")
} }
} }
val test by tasks.getting(Test::class) { val test by tasks.getting(Test::class) {
useJUnitPlatform { } useJUnitPlatform { }
} }
val arrowVersion = "0.10.2" val arrowVersion = "0.10.3"
dependencies { dependencies {
implementation("com.uchuhimo:konf-core:0.20.0") implementation("com.uchuhimo:konf-core:0.20.0")
implementation("com.uchuhimo:konf-toml:0.20.0") implementation("com.uchuhimo:konf-toml:0.20.0")
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
implementation("org.javacord:javacord:3.0.5") implementation("org.javacord:javacord:3.0.5")
implementation("org.mapdb:mapdb:3.0.7") implementation("org.mapdb:mapdb:3.0.7")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.50") implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.70")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.10.0.pr3") implementation("com.fasterxml.jackson.core:jackson-annotations:2.10.0.pr3")
implementation("io.arrow-kt:arrow-core:$arrowVersion") implementation("io.arrow-kt:arrow-core:$arrowVersion")
implementation("io.arrow-kt:arrow-syntax:$arrowVersion") implementation("io.arrow-kt:arrow-syntax:$arrowVersion")
testImplementation("io.kotlintest:kotlintest-runner-junit5:3.4.2") testImplementation("io.kotlintest:kotlintest-runner-junit5:3.4.2")
testImplementation("io.mockk:mockk:1.9.3") testImplementation("io.mockk:mockk:1.9.3")
// these two are needed to access javacord internals (such as reading from sent embeds during tests) // these two are needed to access javacord internals (such as reading from sent embeds during tests)
testImplementation("org.javacord:javacord-core:3.0.5") testImplementation("org.javacord:javacord-core:3.0.4")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.10.0.pr3") testImplementation("com.fasterxml.jackson.core:jackson-databind:2.10.0.pr3")
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }