Skip to content

Commit 6058db4

Browse files
committed
Update deps
1 parent c887594 commit 6058db4

File tree

2 files changed

+19
-29
lines changed

2 files changed

+19
-29
lines changed

build.gradle

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
1-
buildscript {
2-
ext {
3-
kotlin_version = '1.3.0'
4-
junit_version = '5.2.0'
5-
koin_version = '1.0.1'
6-
thirdcoast_version = '18.7.3'
7-
}
1+
plugins {
82

9-
repositories {
10-
jcenter()
11-
maven { url = "https://plugins.gradle.org/m2/" }
12-
}
13-
dependencies {
14-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
15-
}
3+
id "org.jetbrains.kotlin.jvm" version "1.3.11"
4+
id "idea"
165
}
176

18-
apply plugin: "kotlin"
19-
apply plugin: "idea"
20-
217
version = '18.2.0'
228

239
repositories {
@@ -36,29 +22,29 @@ dependencies {
3622
compile "org.opencv:opencv-java:3.2.0"
3723

3824
// Kotlin
39-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
25+
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
4026

4127
// App
4228
compile "org.jline:jline:3.9.0"
43-
compile 'net.consensys.cava:cava-toml:0.3.1'
44-
compile "org.strykeforce.thirdcoast:telemetry:$thirdcoast_version"
45-
compile "org.strykeforce.thirdcoast:swerve:$thirdcoast_version"
29+
compile 'net.consensys.cava:cava-toml:0.5.0'
30+
compile "org.strykeforce.thirdcoast:telemetry:${thirdcoast_version}"
31+
compile "org.strykeforce.thirdcoast:swerve:${thirdcoast_version}"
4632

4733
// Logging
48-
compile 'io.github.microutils:kotlin-logging:1.5.9'
34+
compile 'io.github.microutils:kotlin-logging:1.6.10'
4935
compile 'ch.qos.logback:logback-classic:1.2.3'
5036

5137
// Koin
5238
compile "org.koin:koin-core:$koin_version"
53-
compile "org.koin:koin-logger-slf4j:$koin_version"
54-
testCompile "org.koin:koin-test:$koin_version"
39+
compile "org.koin:koin-logger-slf4j:${koin_version}"
40+
testCompile "org.koin:koin-test:${koin_version}"
5541

5642
// Testing
57-
testCompile "org.junit.jupiter:junit-jupiter-api:$junit_version"
58-
testCompile "org.junit.jupiter:junit-jupiter-params:$junit_version"
59-
testRuntime "org.junit.jupiter:junit-jupiter-engine:$junit_version"
43+
testCompile "org.junit.jupiter:junit-jupiter-api:${junit_version}"
44+
testCompile "org.junit.jupiter:junit-jupiter-params:${junit_version}"
45+
testRuntime "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
6046
testCompile "org.assertj:assertj-core:3.11.1"
61-
testCompile 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.0.0-RC2'
47+
testCompile 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.0.0'
6248

6349
}
6450

@@ -92,7 +78,7 @@ def robotManifest = {
9278
attributes 'Main-Class': 'edu.wpi.first.wpilibj.RobotBase',
9379
'Robot-Class': 'org.strykeforce.thirdcoast.Robot',
9480
'Specification-Title': 'Third Coast Telemetry',
95-
'Specification-Version': version,
81+
'Specification-Version': "${thirdcoast_version}",
9682
'Implementation-Title': 'Third Coast Telemetry Utility (tct)',
9783
'Implementation-Version': version
9884
}

gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
kotlin.code.style=official
2+
kotlin_version = 1.3.11
3+
junit_version = 5.2.0
4+
koin_version = 1.0.1
5+
thirdcoast_version = 18.7.3

0 commit comments

Comments
 (0)