Skip to content

Commit a6bc932

Browse files
mwitcpalekmwitcpalek
authored
Merge pull request #27 from strykeforce/koin-bump
Dependency Version Bump
2 parents 7120259 + 1a20a91 commit a6bc932

File tree

73 files changed

+174
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+174
-109
lines changed

‎build.gradle‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO
22

33
plugins {
44
id "java"
5-
id "org.jetbrains.kotlin.jvm" version "1.7.21"
5+
id "org.jetbrains.kotlin.jvm" version "1.9.0" //1.7.21
66
id "edu.wpi.first.GradleRIO" version "2024.3.1"
77
}
88

9-
version = "24.0.0"
9+
version = "24.0.1"
1010

1111
sourceCompatibility = JavaVersion.VERSION_17
1212
targetCompatibility = JavaVersion.VERSION_17
@@ -73,15 +73,19 @@ dependencies {
7373
implementation('ch.qos.logback:logback-classic:1.3.5')
7474

7575
// Koin
76-
implementation("org.koin:koin-core:1.0.2")
77-
implementation("org.koin:koin-logger-slf4j:1.0.2")
78-
testImplementation("org.koin:koin-test:1.0.2")
76+
// implementation("org.koin:koin-core:1.0.2")
77+
// implementation("org.koin:koin-logger-slf4j:1.0.2")
78+
// testImplementation("org.koin:koin-test:1.0.2")
79+
implementation("io.insert-koin:koin-core:4.0.0") //3.0.1
80+
implementation("io.insert-koin:koin-logger-slf4j:4.0.0") //3.0.1
81+
implementation("io.insert-koin:koin-test:4.0.0") //3.0.1
7982

8083
// Testing
8184
testImplementation(platform("org.junit:junit-bom:5.9.0"))
8285
testImplementation("org.junit.jupiter:junit-jupiter")
8386
testImplementation("org.assertj:assertj-core:3.23.1")
84-
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
87+
// testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
88+
testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
8589
testRuntimeOnly('ch.qos.logback:logback-classic:1.4.4')
8690
}
8791

‎src/main/kotlin/org/strykeforce/thirdcoast/DummyRobot.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package org.strykeforce.thirdcoast
22

33
import edu.wpi.first.wpilibj.TimedRobot
44
import mu.KotlinLogging
5-
import org.koin.standalone.KoinComponent
5+
import org.koin.core.component.KoinComponent
6+
//import org.koin.standalone.KoinComponent
67

78
private val logger = KotlinLogging.logger {}
89

‎src/main/kotlin/org/strykeforce/thirdcoast/Koin.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import org.jline.reader.LineReader
1414
import org.jline.reader.LineReaderBuilder
1515
import org.jline.terminal.Terminal
1616
import org.jline.terminal.TerminalBuilder
17-
import org.koin.dsl.module.module
17+
import org.koin.dsl.module
18+
//import org.koin.dsl.module.module
1819
import org.strykeforce.swerve.*
1920
import org.strykeforce.thirdcoast.command.Command
2021
import org.strykeforce.thirdcoast.device.*
@@ -68,7 +69,7 @@ val tctModule = module {
6869

6970
single<Terminal> { TerminalBuilder.terminal() }
7071

71-
single<LineReader>(createOnStart = true) { LineReaderBuilder.builder().terminal(get()).build() }
72+
single<LineReader>(createdAtStart = true) { LineReaderBuilder.builder().terminal(get()).build() }
7273

7374
}
7475

‎src/main/kotlin/org/strykeforce/thirdcoast/Robot.kt‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ import edu.wpi.first.wpilibj.TimedRobot
44
import mu.KotlinLogging
55
import net.consensys.cava.toml.Toml
66
import net.consensys.cava.toml.TomlTable
7+
import org.koin.core.component.KoinComponent
8+
import org.koin.core.component.inject
9+
import org.koin.core.context.startKoin
710
import org.koin.core.parameter.parametersOf
8-
import org.koin.log.Logger.SLF4JLogger
9-
import org.koin.standalone.KoinComponent
10-
import org.koin.standalone.StandAloneContext.startKoin
11-
import org.koin.standalone.inject
11+
//import org.koin.log.Logger.SLF4JLogger
12+
import org.koin.logger.SLF4JLogger
13+
//import org.koin.standalone.KoinComponent
14+
//import org.koin.standalone.StandAloneContext.startKoin
15+
//import org.koin.standalone.inject
1216
import org.strykeforce.telemetry.TelemetryService
1317
import org.strykeforce.thirdcoast.command.Command
1418
import kotlin.concurrent.thread
@@ -19,7 +23,10 @@ private val logger = KotlinLogging.logger {}
1923
class Robot : TimedRobot(), KoinComponent {
2024

2125
override fun robotInit() {
22-
startKoin(listOf(tctModule, swerveModule), logger = SLF4JLogger())
26+
startKoin{
27+
modules(listOf(tctModule, swerveModule))
28+
logger(SLF4JLogger())
29+
}
2330
val telemetryService: TelemetryService by inject()
2431
thread(name = "tct", start = true) {
2532
val toml = parseResource("/commands.toml")

‎src/main/kotlin/org/strykeforce/thirdcoast/cancoder/CancoderParameterCommand.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import com.ctre.phoenix6.configs.CANcoderConfiguration
44
import com.ctre.phoenix6.hardware.CANcoder
55
import mu.KotlinLogging
66
import net.consensys.cava.toml.TomlTable
7-
import org.koin.standalone.inject
7+
//import org.koin.standalone.inject
8+
import org.koin.core.component.KoinComponent
9+
import org.koin.core.component.inject
10+
import org.koin.java.KoinJavaComponent.inject
811
import org.strykeforce.thirdcoast.command.AbstractCommand
912
import org.strykeforce.thirdcoast.command.Command
1013
import org.strykeforce.thirdcoast.device.CancoderService

‎src/main/kotlin/org/strykeforce/thirdcoast/cancoder/CancoderStatusCommand.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.strykeforce.thirdcoast.cancoder
22

33
import com.ctre.phoenix6.configs.CANcoderConfiguration
44
import net.consensys.cava.toml.TomlTable
5-
import org.koin.standalone.inject
5+
import org.koin.core.component.inject
66
import org.strykeforce.thirdcoast.command.AbstractCommand
77
import org.strykeforce.thirdcoast.command.Command
88
import org.strykeforce.thirdcoast.device.CancoderFDService

‎src/main/kotlin/org/strykeforce/thirdcoast/cancoder/SelectAbsRangeValueCommand.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package org.strykeforce.thirdcoast.cancoder
33
import com.ctre.phoenix6.signals.AbsoluteSensorRangeValue
44
import com.ctre.phoenix6.signals.AbsoluteSensorRangeValue.*
55
import net.consensys.cava.toml.TomlTable
6-
import org.koin.standalone.inject
6+
import org.koin.core.component.inject
7+
import org.koin.java.KoinJavaComponent.inject
8+
//import org.koin.standalone.inject
79
import org.strykeforce.thirdcoast.command.AbstractSelectCommand
810
import org.strykeforce.thirdcoast.command.Command
911
import org.strykeforce.thirdcoast.device.CancoderFDService

‎src/main/kotlin/org/strykeforce/thirdcoast/cancoder/SelectCancoderCommand.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.strykeforce.thirdcoast.cancoder
22

33
import com.ctre.phoenix6.hardware.CANcoder
44
import net.consensys.cava.toml.TomlTable
5-
import org.koin.standalone.inject
5+
import org.koin.core.component.inject
66
import org.strykeforce.thirdcoast.command.AbstractCommand
77
import org.strykeforce.thirdcoast.command.Command
88
import org.strykeforce.thirdcoast.command.prompt

‎src/main/kotlin/org/strykeforce/thirdcoast/cancoder/SelectCancoderSensorDirectionCommand.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.strykeforce.thirdcoast.cancoder
33
import com.ctre.phoenix6.signals.SensorDirectionValue
44
import com.ctre.phoenix6.signals.SensorDirectionValue.*
55
import net.consensys.cava.toml.TomlTable
6-
import org.koin.standalone.inject
6+
import org.koin.core.component.inject
77
import org.strykeforce.thirdcoast.command.AbstractSelectCommand
88
import org.strykeforce.thirdcoast.command.Command
99
import org.strykeforce.thirdcoast.device.CancoderFDService

‎src/main/kotlin/org/strykeforce/thirdcoast/cancoder/SetCancoderPositionCommand.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.strykeforce.thirdcoast.cancoder
22

33
import mu.KotlinLogging
44
import net.consensys.cava.toml.TomlTable
5-
import org.koin.standalone.inject
65
import org.strykeforce.thirdcoast.command.AbstractCommand
76
import org.strykeforce.thirdcoast.command.Command
87
import org.strykeforce.thirdcoast.device.CancoderService

0 commit comments

Comments
 (0)