Skip to content

Commit e5b9411

Browse files
committed
Update Kotlin and minor deps
1 parent 2bf1a0d commit e5b9411

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

build.gradle

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "java"
3-
id "org.jetbrains.kotlin.jvm" version "1.4.21"
4-
id "edu.wpi.first.GradleRIO" version "2021.2.1"
3+
id "org.jetbrains.kotlin.jvm" version "1.5.0"
4+
id "edu.wpi.first.GradleRIO" version "2021.3.1"
55
}
66

77
version = "21.0.0"
@@ -44,6 +44,7 @@ deploy {
4444
def includeDesktopSupport = false
4545

4646
repositories {
47+
mavenCentral()
4748
jcenter()
4849
}
4950
// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
@@ -59,33 +60,39 @@ dependencies {
5960
nativeDesktopZip wpi.deps.vendor.jni(wpi.platforms.desktop)
6061

6162
// We need to add the Kotlin stdlib in order to use most Kotlin language features.
62-
implementation "org.jetbrains.kotlin:kotlin-stdlib"
63+
// implementation "org.jetbrains.kotlin:kotlin-stdlib"
6364

6465
// App
65-
implementation "org.jline:jline:3.9.0"
66-
implementation 'net.consensys.cava:cava-toml:0.5.0'
66+
implementation("org.jline:jline-terminal:3.20.0")
67+
implementation("org.jline:jline-reader:3.20.0")
68+
implementation("net.consensys.cava:cava-toml:0.5.0")
6769

6870
// Logging
69-
implementation 'io.github.microutils:kotlin-logging:1.6.10'
70-
implementation 'ch.qos.logback:logback-classic:1.2.3'
71+
implementation("io.github.microutils:kotlin-logging-jvm:2.0.6")
72+
implementation("ch.qos.logback:logback-classic:1.2.3")
7173

7274
// Koin
73-
implementation "org.koin:koin-core:1.0.2"
74-
implementation "org.koin:koin-logger-slf4j:1.0.2"
75-
testImplementation "org.koin:koin-test:1.0.2"
75+
implementation("org.koin:koin-core:1.0.2")
76+
implementation("org.koin:koin-logger-slf4j:1.0.2")
77+
testImplementation("org.koin:koin-test:1.0.2")
7678

7779
// Testing
78-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.5.2"
79-
testImplementation "org.junit.jupiter:junit-jupiter-params:5.5.2"
80-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.5.2"
81-
testImplementation "org.assertj:assertj-core:3.11.1"
82-
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
80+
testImplementation(platform("org.junit:junit-bom:5.7.2"))
81+
testImplementation("org.junit.jupiter:junit-jupiter")
82+
testImplementation("org.assertj:assertj-core:3.19.0")
83+
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
8384

8485
// Enable simulation gui support. Must check the box in vscode to enable support
8586
// upon debugging
8687
simulation wpi.deps.sim.gui(wpi.platforms.desktop, false)
8788
}
8889

90+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
91+
kotlinOptions {
92+
jvmTarget = "11"
93+
}
94+
}
95+
8996
test {
9097
useJUnitPlatform()
9198
}

0 commit comments

Comments
 (0)