Skip to content

Commit 38977b3

Browse files
authored
Reformat "libs.versions.toml" and "settings.gradle.kts" (#2846)
1 parent e147b02 commit 38977b3

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

gradle/libs.versions.toml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ guava = "31.1-jre"
1313
guava24 = "24.1.1-jre"
1414
jackson = "2.13.3"
1515
okio = "3.9.0"
16-
kotlinx-io="0.4.0"
16+
kotlinx-io = "0.4.0"
1717
gson = "2.8.5"
1818
moshi = "1.15.1"
1919
kotlintest = "2.0.7"
@@ -24,33 +24,33 @@ junit4 = "4.12"
2424
protoc = "3.17.3"
2525

2626
[libraries]
27-
gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin"}
28-
gradlePlugin-kover = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover"}
29-
gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka"}
30-
gradlePlugin-animalsniffer = { module = "ru.vyarus:gradle-animalsniffer-plugin", version.ref = "animalsniffer"}
31-
gradlePlugin-binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "bcv"}
27+
gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
28+
gradlePlugin-kover = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }
29+
gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
30+
gradlePlugin-animalsniffer = { module = "ru.vyarus:gradle-animalsniffer-plugin", version.ref = "animalsniffer" }
31+
gradlePlugin-binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "bcv" }
3232

3333
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
3434
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
3535

36-
dokka-pathsaver = { module = "org.jetbrains.kotlinx:dokka-pathsaver-plugin", version.ref = "knit"}
37-
knitTest = { module = "org.jetbrains.kotlinx:kotlinx-knit-test", version.ref = "knit"}
38-
jmhCore = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core"}
39-
guava = { module = "com.google.guava:guava", version.ref = "guava"}
40-
guava-24 = { module = "com.google.guava:guava", version.ref = "guava24"}
41-
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson"}
42-
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson"}
43-
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson"}
44-
jackson-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version.ref = "jackson"}
45-
okio = { module = "com.squareup.okio:okio", version.ref = "okio"}
46-
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io"}
47-
gson = { module = "com.google.code.gson:gson", version.ref = "gson"}
48-
kotlintest = { module = "io.kotlintest:kotlintest", version.ref = "kotlintest"}
49-
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines"}
50-
cbor = { module = "com.upokecenter:cbor", version.ref = "cbor"}
51-
typesafe-config = { module = "com.typesafe:config", version.ref = "typesafe-config"}
52-
junit-junit4 = { module = "junit:junit", version.ref = "junit4"}
53-
protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc"}
36+
dokka-pathsaver = { module = "org.jetbrains.kotlinx:dokka-pathsaver-plugin", version.ref = "knit" }
37+
knitTest = { module = "org.jetbrains.kotlinx:kotlinx-knit-test", version.ref = "knit" }
38+
jmhCore = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
39+
guava = { module = "com.google.guava:guava", version.ref = "guava" }
40+
guava-24 = { module = "com.google.guava:guava", version.ref = "guava24" }
41+
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
42+
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
43+
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
44+
jackson-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version.ref = "jackson" }
45+
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
46+
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io" }
47+
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
48+
kotlintest = { module = "io.kotlintest:kotlintest", version.ref = "kotlintest" }
49+
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
50+
cbor = { module = "com.upokecenter:cbor", version.ref = "cbor" }
51+
typesafe-config = { module = "com.typesafe:config", version.ref = "typesafe-config" }
52+
junit-junit4 = { module = "junit:junit", version.ref = "junit4" }
53+
protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc" }
5454
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" }
5555
moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
5656
moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }

settings.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@ fun overriddenKotlinVersion(): String? {
104104
if (kotlinRepoUrl?.isNotEmpty() == true) {
105105
return repoVersion ?: throw IllegalArgumentException("\"kotlin_version\" Gradle property should be defined")
106106
} else if (bootstrap != null) {
107-
return bootstrapVersion ?: throw IllegalArgumentException("\"kotlin.version.snapshot\" Gradle property should be defined")
107+
return bootstrapVersion
108+
?: throw IllegalArgumentException("\"kotlin.version.snapshot\" Gradle property should be defined")
108109
}
109110
if (buildSnapshotTrain?.isNotEmpty() == true) {
110-
return trainVersion ?: throw IllegalArgumentException("\"kotlin_snapshot_version\" should be defined when building with snapshot compiler")
111+
return trainVersion
112+
?: throw IllegalArgumentException("\"kotlin_snapshot_version\" should be defined when building with snapshot compiler")
111113
}
112114
return null
113115
}

0 commit comments

Comments
 (0)