bump other dependency versions

Author: mwitcpalek

build.gradle

@@ -2,7 +2,7 @@ import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO
 
 plugins {
     id "java"
-    id "org.jetbrains.kotlin.jvm" version "1.7.21"
+    id "org.jetbrains.kotlin.jvm" version "1.9.0" //1.7.21
     id "edu.wpi.first.GradleRIO" version "2024.3.1"
 }
 
@@ -76,15 +76,16 @@ dependencies {
 //    implementation("org.koin:koin-core:1.0.2")
 //    implementation("org.koin:koin-logger-slf4j:1.0.2")
 //    testImplementation("org.koin:koin-test:1.0.2")
-    implementation("io.insert-koin:koin-core:3.0.1")
-    implementation("io.insert-koin:koin-logger-slf4j:3.0.1")
-    implementation("io.insert-koin:koin-test:3.0.1")
+    implementation("io.insert-koin:koin-core:4.0.0") //3.0.1
+    implementation("io.insert-koin:koin-logger-slf4j:4.0.0") //3.0.1
+    implementation("io.insert-koin:koin-test:4.0.0") //3.0.1
 
     // Testing
     testImplementation(platform("org.junit:junit-bom:5.9.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.assertj:assertj-core:3.23.1")
-    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+//    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
     testRuntimeOnly('ch.qos.logback:logback-classic:1.4.4')
 }
 

src/test/kotlin/org/strykeforce/thirdcoast/ReadersTest.kt

@@ -1,6 +1,6 @@
 package org.strykeforce.thirdcoast
 
-import com.nhaarman.mockitokotlin2.*
+//import com.nhaarman.mockitokotlin2.*
 import net.consensys.cava.toml.Toml
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
@@ -10,6 +10,11 @@ import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
+import org.mockito.ArgumentMatchers.*
+import org.mockito.Mockito.reset
+import org.mockito.Mockito.`when`
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 import org.strykeforce.thirdcoast.command.Command
 import org.strykeforce.thirdcoast.command.DOUBLE_FORMAT_4
 import org.strykeforce.thirdcoast.command.MenuCommand

src/test/kotlin/org/strykeforce/thirdcoast/command/ParameterTest.kt

@@ -1,11 +1,12 @@
 package org.strykeforce.thirdcoast.command
 
-import com.nhaarman.mockitokotlin2.*
+//import com.nhaarman.mockitokotlin2.*
 import org.assertj.core.api.Assertions.assertThat
 import org.jline.reader.LineReader
 import org.jline.terminal.Terminal
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentMatchers.contains
+import org.mockito.kotlin.*
 import org.strykeforce.thirdcoast.talon.TalonParameter
 import org.strykeforce.thirdcoast.talon.TalonParameter.Companion.create
 import java.io.PrintWriter

src/test/kotlin/org/strykeforce/thirdcoast/device/DeviceServiceTest.kt

@@ -1,9 +1,11 @@
 package org.strykeforce.thirdcoast.device
 
-import com.nhaarman.mockitokotlin2.mock
+//import com.nhaarman.mockitokotlin2.mock
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.fail
+import org.mockito.Mockito.mock
+import org.strykeforce.telemetry.TelemetryService
 
 internal class DeviceServiceTest {
 
@@ -58,7 +60,10 @@ internal class DeviceServiceTest {
 
     @Test
     fun `service gets same Talon`() {
-        val talonService = TalonService(mock()) { mock() }
+        System.out.println("Before")
+        val telemetryService = mock<TelemetryService>()
+        System.out.println("Between")
+        val talonService = TalonService(telemetryService) { mock() }
         val t1 = talonService.get(1)
         assertThat(talonService.get(1)).isSameAs(t1)
         assertThat(talonService.all).containsOnly(t1)

src/test/kotlin/org/strykeforce/thirdcoast/talon/HardLimitCommandsTest.kt

@@ -3,8 +3,8 @@ package org.strykeforce.thirdcoast.talon
 import com.ctre.phoenix.motorcontrol.LimitSwitchNormal.NormallyOpen
 import com.ctre.phoenix.motorcontrol.LimitSwitchSource.FeedbackConnector
 import com.ctre.phoenix.motorcontrol.can.TalonSRX
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
+//import com.nhaarman.mockitokotlin2.mock
+//import comom.nhaarman.mockitokotlin2.verify
 import net.consensys.cava.toml.Toml
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
@@ -16,6 +16,8 @@ import org.koin.dsl.module
 import org.koin.logger.SLF4JLogger
 import org.koin.test.KoinTest
 import org.koin.test.mock.declare
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.verify
 import org.strykeforce.thirdcoast.command.Command
 import org.strykeforce.thirdcoast.device.TalonService
 
@@ -49,14 +51,14 @@ internal class HardLimitCommandsTest : KoinTest {
     @BeforeEach
     fun setUp() {
         startKoin{
-            /*modules(module {
+            modules(module {
                 single { TalonService(mock()) {talon} }
-            })*/
+            })
             logger(SLF4JLogger())
         }
 
         declare {
-            module { single { TalonService(mock()) {talon} } }
+//            module { single { TalonService(mock()) {talon} } }
             //single { TalonService(mock()) { talon } }
         }
 

src/test/kotlin/org/strykeforce/thirdcoast/talon/TalonParameterCommandTest.kt

@@ -1,7 +1,7 @@
 package org.strykeforce.thirdcoast.talon
 
 import com.ctre.phoenix.motorcontrol.can.TalonSRX
-import com.nhaarman.mockitokotlin2.*
+//import com.nhaarman.mockitokotlin2.*
 import net.consensys.cava.toml.Toml
 import org.assertj.core.api.Assertions.assertThat
 import org.jline.reader.LineReader
@@ -14,6 +14,9 @@ import org.koin.core.component.inject
 import org.koin.core.context.stopKoin
 import org.koin.test.KoinTest
 import org.koin.test.mock.declare
+import org.mockito.Mockito.mock
+import org.mockito.kotlin.*
+import org.mockito.kotlin.mock
 import org.strykeforce.thirdcoast.command.Command
 import org.strykeforce.thirdcoast.command.DOUBLE_FORMAT_4
 import org.strykeforce.thirdcoast.device.TalonService

vendordeps/thirdcoast.json

@@ -1,7 +1,7 @@
 {
     "fileName": "thirdcoast.json",
     "name": "StrykeForce-ThirdCoast",
-    "version": "24.0.3",
+    "version": "24.0.6",
     "uuid": "13c4f4b5-a1c0-4670-8f8d-b7b03628c0d3",
     "frcYear": "2024",
     "mavenUrls": [
@@ -12,7 +12,7 @@
         {
             "groupId": "org.strykeforce",
             "artifactId": "thirdcoast",
-            "version": "24.0.3"
+            "version": "24.0.6"
         }
     ],
     "jniDependencies": [],