Skip to content

Commit 3b88587

Browse files
Abduqodiri Qurbonzodaqurbonzoda
authored andcommitted
Replace deprecated functions
1 parent 571275b commit 3b88587

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

plugin/main/src/kotlinx/benchmark/gradle/BenchmarksPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class BenchmarksPlugin : Plugin<Project> {
3838
val kotlinClass = tryGetClass<KotlinBasePluginWrapper>("org.jetbrains.kotlin.gradle.plugin.KotlinBasePluginWrapper")
3939
if (kotlinClass != null) {
4040
plugins.findPlugin(kotlinClass)?.run {
41-
logger.info("Detected Kotlin plugin version '$kotlinPluginVersion'")
42-
if (VersionNumber.parse(kotlinPluginVersion) < VersionNumber(1, 5, 30, null))
41+
logger.info("Detected Kotlin plugin version '${project.getKotlinPluginVersion()}'")
42+
if (VersionNumber.parse(project.getKotlinPluginVersion()) < VersionNumber(1, 5, 30, null))
4343
logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.5.30 or higher")
4444
}
4545
}

plugin/main/src/kotlinx/benchmark/gradle/Utils.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,28 +105,28 @@ fun writeParameters(
105105
validateConfig(config)
106106
val file = createTempFile("benchmarks")
107107
file.writeText(buildString {
108-
appendln("name:$name")
109-
appendln("reportFile:$reportFile")
110-
appendln("traceFormat:$format")
111-
config.reportFormat?.let { appendln("reportFormat:$it") }
112-
config.iterations?.let { appendln("iterations:$it") }
113-
config.warmups?.let { appendln("warmups:$it") }
114-
config.iterationTime?.let { appendln("iterationTime:$it") }
115-
config.iterationTimeUnit?.let { appendln("iterationTimeUnit:$it") }
116-
config.outputTimeUnit?.let { appendln("outputTimeUnit:$it") }
117-
config.mode?.let { appendln("mode:$it") }
108+
appendLine("name:$name")
109+
appendLine("reportFile:$reportFile")
110+
appendLine("traceFormat:$format")
111+
config.reportFormat?.let { appendLine("reportFormat:$it") }
112+
config.iterations?.let { appendLine("iterations:$it") }
113+
config.warmups?.let { appendLine("warmups:$it") }
114+
config.iterationTime?.let { appendLine("iterationTime:$it") }
115+
config.iterationTimeUnit?.let { appendLine("iterationTimeUnit:$it") }
116+
config.outputTimeUnit?.let { appendLine("outputTimeUnit:$it") }
117+
config.mode?.let { appendLine("mode:$it") }
118118

119119
config.includes.forEach {
120-
appendln("include:$it")
120+
appendLine("include:$it")
121121
}
122122
config.excludes.forEach {
123-
appendln("exclude:$it")
123+
appendLine("exclude:$it")
124124
}
125125
config.params.forEach { (param, values) ->
126-
values.forEach { value -> appendln("param:$param=$value") }
126+
values.forEach { value -> appendLine("param:$param=$value") }
127127
}
128128
config.advanced.forEach { (param, value) ->
129-
appendln("$param:$value")
129+
appendLine("$param:$value")
130130
}
131131
})
132132
return file

runtime/commonMain/src/kotlinx/benchmark/BenchmarkReportFormatter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sealed class BenchmarkReportFormatter {
66
abstract fun format(results: Collection<ReportBenchmarkResult>): String
77

88
companion object {
9-
fun create(format: String): BenchmarkReportFormatter = when (format.toLowerCase()) {
9+
fun create(format: String): BenchmarkReportFormatter = when (format.lowercase()) {
1010
"json" -> JsonBenchmarkReportFormatter
1111
"csv" -> CsvBenchmarkReportFormatter(",")
1212
"scsv" -> CsvBenchmarkReportFormatter(";")
@@ -96,9 +96,9 @@ internal object TextBenchmarkReportFormatter : BenchmarkReportFormatter() {
9696
val names = s.split(".")
9797
if (first) {
9898
first = false
99-
names.takeWhile { it.toLowerCase() == it }
99+
names.takeWhile { it.lowercase() == it }
100100
} else {
101-
val common = prefix.zip(names).takeWhile { (p, n) -> p == n && n.toLowerCase() == n }
101+
val common = prefix.zip(names).takeWhile { (p, n) -> p == n && n.lowercase() == n }
102102
if (prefix.size != common.size) prefixCut = true
103103
prefix.take(common.size)
104104
}

runtime/commonMain/src/kotlinx/benchmark/ExecutorConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class BenchmarkConfiguration private constructor(
4141
parseTimeUnit(getParameterValue("iterationTimeUnit")),
4242
parseTimeUnit(getParameterValue("outputTimeUnit")),
4343
getParameterValue("mode").toMode(),
44-
NativeIterationMode.valueOf(getParameterValue("nativeIterationMode").capitalize()),
45-
NativeGCCollectMode.valueOf(getParameterValue("nativeGCCollectMode").capitalize())
44+
NativeIterationMode.valueOf(getParameterValue("nativeIterationMode").replaceFirstChar { it.uppercaseChar() }),
45+
NativeGCCollectMode.valueOf(getParameterValue("nativeGCCollectMode").replaceFirstChar { it.uppercaseChar() })
4646
)
4747
}
4848
}

runtime/commonMain/src/kotlinx/benchmark/IntelliJLog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal fun ijSuiteFinish(
1717
append("<ijLog>")
1818
append("<event type='afterSuite'>")
1919
append("<test id='$id' parentId='$parent'>")
20-
append("<result resultType='${status.toString().toUpperCase()}' startTime='$startTime' endTime='$endTime'/>")
20+
append("<result resultType='${status.toString().uppercase()}' startTime='$startTime' endTime='$endTime'/>")
2121
append("</test>")
2222
append("</event>")
2323
append("</ijLog>")
@@ -40,7 +40,7 @@ internal fun ijBenchmarkFinish(
4040
append("<ijLog>")
4141
append("<event type='afterTest'>")
4242
append("<test id='$id' parentId='$parent'>")
43-
append("<result resultType='${status.toString().toUpperCase()}' startTime='$startTime' endTime='$endTime'/>")
43+
append("<result resultType='${status.toString().uppercase()}' startTime='$startTime' endTime='$endTime'/>")
4444
append("</test>")
4545
append("</event>")
4646
append("</ijLog>")

runtime/commonMain/src/kotlinx/benchmark/ReportBenchmarksStatistics.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ class ReportBenchmarksStatistics(values: DoubleArray) {
3737
else -> values[values.lastIndex]
3838
}
3939

40-
fun mean(): Double = values.sumByDouble { it } / size
40+
fun mean(): Double = values.sumOf { it } / size
4141

4242
fun standardDeviation(): Double {
4343
// two-pass algorithm for variance, avoids numeric overflow
4444
if (size <= 1)
4545
return 0.0
4646

4747
val mean = mean()
48-
val sum = values.sumByDouble { (it - mean).let { it * it } }
48+
val sum = values.sumOf { (it - mean).let { it * it } }
4949
val variance = sum / values.lastIndex
5050
return sqrt(variance)
5151
}

runtime/commonMain/src/kotlinx/benchmark/RunnerConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ class RunnerConfiguration(config: String) {
7070

7171
val nativeIterationMode = singleValueOrNull(
7272
"nativeIterationMode"
73-
) { NativeIterationMode.valueOf(it.capitalize()) }
73+
) { NativeIterationMode.valueOf(it.replaceFirstChar { firstChar -> firstChar.uppercaseChar() }) }
7474

7575
val nativeGCCollectMode = singleValueOrNull(
7676
"nativeGCCollectMode"
77-
) { NativeGCCollectMode.valueOf(it.capitalize()) }
77+
) { NativeGCCollectMode.valueOf(it.replaceFirstChar { firstChar -> firstChar.uppercaseChar() }) }
7878

7979
override fun toString(): String {
8080
return """$name -> $reportFile ($traceFormat, $reportFormat)

runtime/jvmMain/src/kotlinx/benchmark/jvm/JvmBenchmarkRunner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fun main(args: Array<String>) {
4949
config.forks > 0 -> jmhOptions.forks(config.forks)
5050
}
5151

52-
val reportFormat = ResultFormatType.valueOf(config.reportFormat.toUpperCase())
52+
val reportFormat = ResultFormatType.valueOf(config.reportFormat.uppercase())
5353
val reporter = BenchmarkProgress.create(config.traceFormat)
5454
val output = JmhOutputFormat(reporter, config.name)
5555
try {

0 commit comments

Comments
 (0)