Skip to content

Commit

Permalink
Reformat "libs.versions.toml" and "settings.gradle.kts" (#2846)
Browse files Browse the repository at this point in the history
  • Loading branch information
ShreckYe authored Nov 1, 2024
1 parent e147b02 commit 38977b3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 26 deletions.
48 changes: 24 additions & 24 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ guava = "31.1-jre"
guava24 = "24.1.1-jre"
jackson = "2.13.3"
okio = "3.9.0"
kotlinx-io="0.4.0"
kotlinx-io = "0.4.0"
gson = "2.8.5"
moshi = "1.15.1"
kotlintest = "2.0.7"
Expand All @@ -24,33 +24,33 @@ junit4 = "4.12"
protoc = "3.17.3"

[libraries]
gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin"}
gradlePlugin-kover = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover"}
gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka"}
gradlePlugin-animalsniffer = { module = "ru.vyarus:gradle-animalsniffer-plugin", version.ref = "animalsniffer"}
gradlePlugin-binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "bcv"}
gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
gradlePlugin-kover = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }
gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
gradlePlugin-animalsniffer = { module = "ru.vyarus:gradle-animalsniffer-plugin", version.ref = "animalsniffer" }
gradlePlugin-binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "bcv" }

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

dokka-pathsaver = { module = "org.jetbrains.kotlinx:dokka-pathsaver-plugin", version.ref = "knit"}
knitTest = { module = "org.jetbrains.kotlinx:kotlinx-knit-test", version.ref = "knit"}
jmhCore = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core"}
guava = { module = "com.google.guava:guava", version.ref = "guava"}
guava-24 = { module = "com.google.guava:guava", version.ref = "guava24"}
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson"}
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson"}
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson"}
jackson-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version.ref = "jackson"}
okio = { module = "com.squareup.okio:okio", version.ref = "okio"}
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io"}
gson = { module = "com.google.code.gson:gson", version.ref = "gson"}
kotlintest = { module = "io.kotlintest:kotlintest", version.ref = "kotlintest"}
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines"}
cbor = { module = "com.upokecenter:cbor", version.ref = "cbor"}
typesafe-config = { module = "com.typesafe:config", version.ref = "typesafe-config"}
junit-junit4 = { module = "junit:junit", version.ref = "junit4"}
protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc"}
dokka-pathsaver = { module = "org.jetbrains.kotlinx:dokka-pathsaver-plugin", version.ref = "knit" }
knitTest = { module = "org.jetbrains.kotlinx:kotlinx-knit-test", version.ref = "knit" }
jmhCore = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
guava-24 = { module = "com.google.guava:guava", version.ref = "guava24" }
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
jackson-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version.ref = "jackson" }
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io" }
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
kotlintest = { module = "io.kotlintest:kotlintest", version.ref = "kotlintest" }
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
cbor = { module = "com.upokecenter:cbor", version.ref = "cbor" }
typesafe-config = { module = "com.typesafe:config", version.ref = "typesafe-config" }
junit-junit4 = { module = "junit:junit", version.ref = "junit4" }
protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc" }
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" }
moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
Expand Down
6 changes: 4 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,12 @@ fun overriddenKotlinVersion(): String? {
if (kotlinRepoUrl?.isNotEmpty() == true) {
return repoVersion ?: throw IllegalArgumentException("\"kotlin_version\" Gradle property should be defined")
} else if (bootstrap != null) {
return bootstrapVersion ?: throw IllegalArgumentException("\"kotlin.version.snapshot\" Gradle property should be defined")
return bootstrapVersion
?: throw IllegalArgumentException("\"kotlin.version.snapshot\" Gradle property should be defined")
}
if (buildSnapshotTrain?.isNotEmpty() == true) {
return trainVersion ?: throw IllegalArgumentException("\"kotlin_snapshot_version\" should be defined when building with snapshot compiler")
return trainVersion
?: throw IllegalArgumentException("\"kotlin_snapshot_version\" should be defined when building with snapshot compiler")
}
return null
}

0 comments on commit 38977b3

Please sign in to comment.