Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JAVA-42811] Upgraded kotlin to latest version 2.1.0 #1174

Merged
merged 6 commits into from
Dec 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import kotlin.time.ExperimentalTime
import kotlin.time.TimedValue
import kotlin.time.measureTime
import kotlin.time.measureTimedValue
import kotlin.time.milliseconds
import kotlin.time.toDuration

class ElapsedTimeUnitTest {
Expand Down
1 change: 1 addition & 0 deletions core-kotlin-modules/core-kotlin-advanced-4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@

<properties>
<kotlin-scripting.version>1.8.0</kotlin-scripting.version>
<kotlin.version>2.0.21</kotlin.version>
</properties>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.github.tomakehurst.wiremock.client.WireMock.matching
import com.github.tomakehurst.wiremock.client.WireMock.post
import com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor
import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
import com.github.tomakehurst.wiremock.core.WireMockConfiguration
import com.github.tomakehurst.wiremock.junit.WireMockRule
import io.ktor.client.HttpClient
import io.ktor.client.engine.cio.CIO
Expand All @@ -18,16 +19,12 @@ import io.ktor.client.statement.readText
import io.ktor.http.Headers
import io.ktor.http.HttpHeaders
import kotlinx.coroutines.runBlocking
import okhttp3.Call
import okhttp3.Callback
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.MultipartBody
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.RequestBody.Companion.asRequestBody
import okhttp3.Response
import okhttp3.ResponseBody
import okhttp3.internal.wait
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.Rule
Expand All @@ -38,7 +35,6 @@ import retrofit2.http.Multipart
import retrofit2.http.POST
import retrofit2.http.Part
import java.io.File
import java.io.IOException

fun uploadFileFuel(filePath: String, uploadUrl: String) {
val file = File(filePath)
Expand Down Expand Up @@ -112,7 +108,7 @@ fun uploadFileRetrofit(filePath: String, uploadUrl: String) {
class FileUploadUnitTest {
@Rule
@JvmField
val wireMockRule = WireMockRule(8080)
val wireMockRule = WireMockRule(WireMockConfiguration.wireMockConfig().dynamicPort())

@BeforeEach
fun startWireMock() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fun convertStringToBooleanUsingRegex(input: String): Boolean {
}

fun String.toBooleanValue(): Boolean =
when (this.toLowerCase()) {
when (this.lowercase()) {
"true" -> true
else -> false
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@
</profiles>

<properties>
<kotlin.version>2.0.21</kotlin.version>
<kotlin.version>2.1.0</kotlin.version>
<kotlinx.version>1.7.1</kotlinx.version>
<ktlint-cli.version>1.0.1</ktlint-cli.version>

Expand Down