fix(deps): update spotless packages to v7 (major) (#6993)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jack Berg <jberg@newrelic.com>
This commit is contained in:
parent
ccccd1b0a5
commit
1a84cbd00f
|
@ -2,7 +2,7 @@ plugins {
|
|||
`kotlin-dsl`
|
||||
|
||||
// When updating, update below in dependencies too
|
||||
id("com.diffplug.spotless") version "6.25.0"
|
||||
id("com.diffplug.spotless") version "7.0.0"
|
||||
}
|
||||
|
||||
if (!hasLauncherForJavaVersion(17)) {
|
||||
|
@ -53,7 +53,7 @@ dependencies {
|
|||
implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.2.0"))
|
||||
implementation("com.google.auto.value:auto-value-annotations:1.11.0")
|
||||
// When updating, update above in plugins too
|
||||
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
|
||||
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.0")
|
||||
// Needed for japicmp but not automatically brought in for some reason.
|
||||
implementation("com.google.guava:guava:33.4.0-jre")
|
||||
implementation("com.squareup:javapoet:1.13.0")
|
||||
|
|
|
@ -70,7 +70,7 @@ spotless {
|
|||
"*.sh",
|
||||
"src/**/*.properties",
|
||||
)
|
||||
indentWithSpaces()
|
||||
leadingTabsToSpaces()
|
||||
trimTrailingWhitespace()
|
||||
endWithNewline()
|
||||
}
|
||||
|
|
|
@ -13,17 +13,13 @@ import kotlin.coroutines.CoroutineContext
|
|||
* Returns a [CoroutineContext] which will make this [Context] current when resuming a coroutine
|
||||
* and restores the previous [Context] on suspension.
|
||||
*/
|
||||
fun Context.asContextElement(): CoroutineContext {
|
||||
return KotlinContextElement(this)
|
||||
}
|
||||
fun Context.asContextElement(): CoroutineContext = KotlinContextElement(this)
|
||||
|
||||
/**
|
||||
* Returns a [CoroutineContext] which will make this [ImplicitContextKeyed] current when resuming a
|
||||
* coroutine and restores the previous [Context] on suspension.
|
||||
*/
|
||||
fun ImplicitContextKeyed.asContextElement(): CoroutineContext {
|
||||
return KotlinContextElement(Context.current().with(this))
|
||||
}
|
||||
fun ImplicitContextKeyed.asContextElement(): CoroutineContext = KotlinContextElement(Context.current().with(this))
|
||||
|
||||
/**
|
||||
* Returns the [Context] in this [CoroutineContext] if present, or the root otherwise.
|
||||
|
|
|
@ -114,7 +114,7 @@ class DoubleRandomFixedSizeExemplarReservoirTest {
|
|||
@Override
|
||||
public int nextInt(int max) {
|
||||
switch (max) {
|
||||
// Force one sample in bucket 1 and two in bucket 0.
|
||||
// Force one sample in bucket 1 and two in bucket 0.
|
||||
case 2:
|
||||
return 1;
|
||||
default:
|
||||
|
|
|
@ -114,7 +114,7 @@ class LongRandomFixedSizeExemplarReservoirTest {
|
|||
@Override
|
||||
public int nextInt(int max) {
|
||||
switch (max) {
|
||||
// Force one sample in bucket 1 and two in bucket 0.
|
||||
// Force one sample in bucket 1 and two in bucket 0.
|
||||
case 2:
|
||||
return 1;
|
||||
default:
|
||||
|
|
Loading…
Reference in New Issue