Skip to content

Commit 9151849

Browse files
committed
Address more deprecation warnings
1 parent b3dcba9 commit 9151849

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/FunctionalTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package de.mannodermaus.gradle.plugins.junit5
22

33
import com.google.common.truth.Truth.assertWithMessage
44
import de.mannodermaus.gradle.plugins.junit5.annotations.DisabledOnCI
5+
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.capitalized
56
import de.mannodermaus.gradle.plugins.junit5.util.BuildResultSubject
67
import de.mannodermaus.gradle.plugins.junit5.util.TestEnvironment
78
import de.mannodermaus.gradle.plugins.junit5.util.TestedAgp
89
import de.mannodermaus.gradle.plugins.junit5.util.TestedJUnit
910
import de.mannodermaus.gradle.plugins.junit5.util.prettyPrint
1011
import de.mannodermaus.gradle.plugins.junit5.util.projects.FunctionalTestProjectCreator
1112
import de.mannodermaus.gradle.plugins.junit5.util.withPrunedPluginClasspath
12-
import org.gradle.configurationcache.extensions.capitalized
1313
import org.gradle.testkit.runner.BuildResult
1414
import org.gradle.testkit.runner.GradleRunner
1515
import org.gradle.testkit.runner.TaskOutcome

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/AgpJacocoExclusionRuleTests.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package de.mannodermaus.gradle.plugins.junit5.plugin
22

33
import com.google.common.truth.Truth.assertThat
4+
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.capitalized
45
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
56
import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5JacocoReport
67
import de.mannodermaus.gradle.plugins.junit5.tasks.JACOCO_TASK_NAME
78
import de.mannodermaus.gradle.plugins.junit5.util.evaluate
89
import de.mannodermaus.gradle.plugins.junit5.util.get
910
import org.gradle.api.Project
10-
import org.gradle.configurationcache.extensions.capitalized
11-
import org.junit.jupiter.api.Disabled
1211
import org.junit.jupiter.api.DynamicTest
1312
import org.junit.jupiter.api.DynamicTest.dynamicTest
1413
import org.junit.jupiter.api.TestFactory

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/AgpJacocoVariantTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package de.mannodermaus.gradle.plugins.junit5.plugin
33
import com.google.common.truth.Truth.assertThat
44
import com.google.common.truth.Truth.assertWithMessage
55
import de.mannodermaus.gradle.plugins.junit5.extensions.android
6+
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.capitalized
67
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
78
import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5JacocoReport
89
import de.mannodermaus.gradle.plugins.junit5.tasks.JACOCO_TASK_NAME
910
import de.mannodermaus.gradle.plugins.junit5.util.assertAll
1011
import de.mannodermaus.gradle.plugins.junit5.util.evaluate
1112
import de.mannodermaus.gradle.plugins.junit5.util.get
1213
import de.mannodermaus.gradle.plugins.junit5.util.getDependentTaskNames
13-
import org.gradle.configurationcache.extensions.capitalized
1414
import org.gradle.testing.jacoco.tasks.JacocoReport
1515
import org.junit.jupiter.api.DynamicTest
1616
import org.junit.jupiter.api.DynamicTest.dynamicTest

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/AgpVariantTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package de.mannodermaus.gradle.plugins.junit5.plugin
22

33
import com.google.common.truth.Truth.assertThat
4+
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.capitalized
45
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
56
import org.junit.jupiter.api.TestFactory
67

78
interface AgpVariantTests : AgpVariantAwareTests {
89

910
@TestFactory
1011
fun `does not create a build-type-specific jacoco task`() = forEachBuildType { project, buildType ->
11-
val buildTypeName = buildType.capitalize()
12+
val buildTypeName = buildType.capitalized()
1213
val name = "jacocoTestReport$buildTypeName"
1314

1415
assertThat(project.tasks.findByName(name)).isNull()

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/projects/SemanticVersion.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.mannodermaus.gradle.plugins.junit5.util.projects
22

3-
import java.util.*
3+
import java.util.Locale
44

55
private val NUMERICAL_REGEX = Regex("(\\d+)")
66

@@ -44,7 +44,7 @@ private fun String.extractSuffixValue(): Int {
4444
if ('-' in this) {
4545
val suffix = this
4646
.substringAfter('-')
47-
.toLowerCase(Locale.ROOT)
47+
.lowercase(Locale.ROOT)
4848

4949
// Find known suffix types
5050
val suffixMultiplier = when {

0 commit comments

Comments
 (0)