Merge pull request #703 from cqse/renovate/retrofit

Update retrofit to v3

Author: DreierF

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 jacoco = "0.8.13"
 # We need to stay on the 1.3.x release line as 1.4.x requires Java 11
 logback = "1.3.15"
-retrofit = "2.12.0"
+retrofit = "3.0.0"
 okhttp = "4.12.0"
 mockito = "5.17.0"
 mockitoKotlin = "5.4.0"

impacted-test-engine/src/main/kotlin/com/teamscale/test_impacted/engine/options/TestEngineOptions.kt

@@ -10,7 +10,7 @@ import com.teamscale.test_impacted.engine.executor.ImpactedTestsSorter
 import com.teamscale.test_impacted.engine.executor.NOPTestSorter
 import com.teamscale.test_impacted.engine.executor.TeamscaleAgentNotifier
 import com.teamscale.tia.client.ITestwiseCoverageAgentApi
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import java.io.File
 import kotlin.io.path.createDirectories
 
@@ -59,7 +59,7 @@ class TestEngineOptions(
 
 	private var reportDirectory = reportDirectoryPath?.let { File(it) }
 	private var testwiseCoverageAgentApis =
-		testCoverageAgentUrls.mapNotNull { HttpUrl.parse(it)?.let(ITestwiseCoverageAgentApi::createService) }
+		testCoverageAgentUrls.mapNotNull { it.toHttpUrlOrNull()?.let(ITestwiseCoverageAgentApi::createService) }
 
 	companion object {
 		private const val DEFAULT_RUN_IMPACTED = true

renovate.json

@@ -39,18 +39,13 @@
       ],
       "allowedVersions": "< 2"
     },
-    {
-      "matchPaths": ["installer/build.gradle.kts"],
-      "matchPackageNames": [
-        "com.squareup.okhttp3:okhttp"
-      ],
-      "allowedVersions": "<4 || >=5"
-    },
     {
       "matchPackageNames": [
         "com.teamscale:teamscale-lib-commons"
       ],
-      "matchUpdateTypes": ["patch"],
+      "matchUpdateTypes": [
+        "patch"
+      ],
       "enabled": false
     },
     {

teamscale-gradle-plugin/src/main/kotlin/com/teamscale/config/AgentConfiguration.kt

@@ -3,6 +3,7 @@ package com.teamscale.config
 import com.teamscale.report.util.ClasspathWildcardIncludeFilter
 import com.teamscale.utils.ArgumentAppender
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.FileCollection
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
@@ -48,7 +49,7 @@ abstract class AgentConfiguration @Inject constructor(
 	 */
 	@JvmOverloads
 	fun useLocalAgent(url: String = "http://127.0.0.1:8123/") {
-		localAgent = TeamscaleAgent(HttpUrl.parse(url)!!)
+		localAgent = TeamscaleAgent(url.toHttpUrl())
 	}
 
 	/**
@@ -58,7 +59,7 @@ abstract class AgentConfiguration @Inject constructor(
 	 */
 	@JvmOverloads
 	fun useRemoteAgent(url: String = "http://127.0.0.1:8124/") {
-		remoteAgent = TeamscaleAgent(HttpUrl.parse(url)!!)
+		remoteAgent = TeamscaleAgent(url.toHttpUrl())
 	}
 
 	/** Returns a filter predicate that respects the configured wildcard include and exclude patterns. */
@@ -98,7 +99,7 @@ abstract class AgentConfiguration @Inject constructor(
 			argument.append("includes", jacocoExtension.includes)
 			argument.append("excludes", jacocoExtension.excludes)
 			argument.append("mode", "testwise")
-			argument.append("http-server-port", url.port())
+			argument.append("http-server-port", url.port)
 		}
 	}
 }

tia-client/src/main/kotlin/com/teamscale/tia/client/CommandLineInterface.kt

@@ -1,15 +1,14 @@
 package com.teamscale.tia.client
 
 import com.teamscale.client.ClusteredTestDetails
-import com.teamscale.client.JsonUtils
 import com.teamscale.client.JsonUtils.deserializeList
 import com.teamscale.client.JsonUtils.serialize
 import com.teamscale.client.StringUtils.isEmpty
 import com.teamscale.report.testwise.model.ETestExecutionResult
 import com.teamscale.report.testwise.model.TestExecution
 import com.teamscale.tia.client.AgentCommunicationUtils.handleRequestError
 import com.teamscale.tia.client.UrlUtils.encodeUrl
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
@@ -34,8 +33,8 @@ class CommandLineInterface(arguments: Array<String>) {
 			)
 		}
 
-		val url = HttpUrl.parse(this.arguments.removeAt(0))
-		api = ITestwiseCoverageAgentApi.createService(url!!)
+		val url = this.arguments.removeAt(0).toHttpUrl()
+		api = ITestwiseCoverageAgentApi.createService(url)
 
 		command = this.arguments.removeAt(0)
 	}

tia-runlisteners/src/main/kotlin/com/teamscale/tia/runlistener/RunListenerAgentBridge.kt

@@ -5,7 +5,7 @@ import com.teamscale.tia.client.RunningTest
 import com.teamscale.tia.client.TestRun
 import com.teamscale.tia.client.TestRun.TestResultWithMessage
 import com.teamscale.tia.client.TiaAgent
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 
 /**
  * Handles communication with the [TiaAgent] and logging for any type of test run listener.
@@ -31,7 +31,7 @@ class RunListenerAgentBridge(runListenerClassName: String) {
 			throw exception
 		}
 
-		val agent = TiaAgent(false, HttpUrl.get(agentUrl))
+		val agent = TiaAgent(false, agentUrl.toHttpUrl())
 		testRun = agent.startTestRunWithoutTestSelection()
 	}
 
@@ -90,4 +90,4 @@ class RunListenerAgentBridge(runListenerClassName: String) {
 	companion object {
 		inline fun <reified T> create() = RunListenerAgentBridge(T::class.java.name)
 	}
-}
+}