From a455fc5700e85addb4606a629d1ffcf7de1fea00 Mon Sep 17 00:00:00 2001
From: jason plumb <75337021+breedx-splk@users.noreply.github.com>
Date: Wed, 29 Mar 2023 01:55:35 -0700
Subject: [PATCH] Fix up a few kotlin build warnings (#8152)

I noticed some kotlin deprecation warnings in the build output, so I
thought I would try and fix them up.

Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
---
 ...o.opentelemetry.instrumentation.javaagent-testing.gradle.kts | 2 +-
 conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts   | 2 +-
 .../src/main/kotlin/otel.nullaway-conventions.gradle.kts        | 2 +-
 ...o.opentelemetry.instrumentation.muzzle-generation.gradle.kts | 2 +-
 .../io/opentelemetry/javaagent/muzzle/AcceptableVersions.kt     | 2 +-
 .../kotlin/io/opentelemetry/javaagent/muzzle/MuzzleDirective.kt | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
index 3dee574246..b3d0eaa964 100644
--- a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
+++ b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
@@ -154,7 +154,7 @@ plugins.withId("maven-publish") {
 }
 
 configurations.configureEach {
-  if (name.toLowerCase().endsWith("testruntimeclasspath")) {
+  if (name.endsWith("testruntimeclasspath", ignoreCase = true)) {
     // Added by agent, don't let Gradle bring it in when running tests.
     exclude("io.opentelemetry.javaagent", "opentelemetry-javaagent-bootstrap")
   }
diff --git a/conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts b/conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts
index d77ea53610..c1cc422780 100644
--- a/conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts
+++ b/conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
 }
 
 configurations.configureEach {
-  if (name.toLowerCase().endsWith("testruntimeclasspath")) {
+  if (name.endsWith("testruntimeclasspath", ignoreCase = true)) {
     // Added by agent, don't let Gradle bring it in when running tests.
     exclude(module = "javaagent-bootstrap")
   }
diff --git a/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts b/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts
index c5cd555bd5..6cb4c26c00 100644
--- a/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts
+++ b/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts
@@ -18,7 +18,7 @@ nullaway {
 
 tasks {
   withType<JavaCompile>().configureEach {
-    if (!name.toLowerCase().contains("test")) {
+    if (!name.contains("test", ignoreCase = true)) {
       options.errorprone.nullaway {
         severity.set(CheckSeverity.ERROR)
       }
diff --git a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts
index 6d956dad4a..634ff0c1a9 100644
--- a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts
+++ b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts
@@ -50,7 +50,7 @@ val languageTasks = LANGUAGES.map { language ->
     return@map null
   }
   val compileTask = tasks.named(compileTaskName)
-  createLanguageTask(compileTask, "byteBuddy${language.capitalize()}")
+  createLanguageTask(compileTask, "byteBuddy${language.replaceFirstChar(Char::titlecase)}")
 }.filterNotNull()
 
 tasks {
diff --git a/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/AcceptableVersions.kt b/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/AcceptableVersions.kt
index a72e123c49..fa43a08e74 100644
--- a/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/AcceptableVersions.kt
+++ b/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/AcceptableVersions.kt
@@ -16,7 +16,7 @@ class AcceptableVersions(private val skipVersions: Collection<String>) :
     if (version == null) {
       return false
     }
-    val versionString = version.toString().toLowerCase(Locale.ROOT)
+    val versionString = version.toString().lowercase(Locale.ROOT)
     if (skipVersions.contains(versionString)) {
       return false
     }
diff --git a/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/MuzzleDirective.kt b/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/MuzzleDirective.kt
index 96223740ce..155f8a1a7b 100644
--- a/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/MuzzleDirective.kt
+++ b/gradle-plugins/src/main/kotlin/io/opentelemetry/javaagent/muzzle/MuzzleDirective.kt
@@ -78,7 +78,7 @@ abstract class MuzzleDirective {
 
   internal val normalizedSkipVersions: Set<String>
     get() = skipVersions.getOrElse(setOf()).stream()
-      .map(String::toLowerCase)
+      .map(String::lowercase)
       .collect(Collectors.toSet())
 
   override fun toString(): String {