Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kotlin to 2.x, update and cleanup other dependencies #248

Merged
merged 3 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions buildSrc/src/main/kotlin/faker-kotlin-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,6 @@ tasks.withType<Jar> {
}
}

tasks {
getByName(integrationTest.name).dependsOn(test)
jar { dependsOn(integrationTest) }
}

tasks.withType<DokkaTask>().configureEach {
onlyIf("Not dev") { !isDev.get() }
onlyIf("Release or snapshot") { isRelease.get() || isSnapshot.get() }
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/faker-lib-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
plugins {
`java-library`
id("org.jetbrains.dokka")
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
id("faker-kotlin-conventions")
id("faker-pub-conventions")
}
Expand Down
6 changes: 3 additions & 3 deletions cli-bot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
application
kotlin("jvm")
id("org.graalvm.buildtools.native") version "0.10.1"
id("com.github.johnrengelman.shadow")
id("org.graalvm.buildtools.native") version "0.10.2"
id("com.gradleup.shadow")
}

val mainFunction = "io.github.serpro69.kfaker.app.KFakerKt"
Expand Down Expand Up @@ -32,7 +32,7 @@ val fakers = listOf(
dependencies {
implementation(project(path = ":core", configuration = "shadow"))
fakers.forEach { implementation(project(path = ":faker:$it", configuration = "shadow")) }
implementation("info.picocli:picocli:4.7.5")
implementation("info.picocli:picocli:4.7.6")
testImplementation(libs.bundles.test.kotest)
}

Expand Down
27 changes: 12 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[versions]
classgraph = "4.8.165"
commons-io = "2.15.1"
icu4j = "73.2"
jackson = "2.15.3"
kotlin = "1.9.21"
icu4j = "75.1"
jackson = "2.17.2"
kotlin = "2.0.20"
kotlinpoet = "1.15.3"
ksp = "1.9.21-1.0.16"
rgxgen = "2.0"
# buildsrc and plugins
snakeyaml = "2.2"
plugin-bcv = "0.16.3"
plugin-dokka = "1.9.10"
plugin-shadow = "8.1.1"
plugin-dokka = "1.9.20"
plugin-shadow = "8.3.0"
plugin-semantic-versioning = "0.13.0"
plugin-devpublish = "0.4.1"
plugin-nexus-publish = "2.0.0"
plugin-benmanes-versions = "0.51.0"
# test
kotest = "5.8.1"
junit = "5.10.1"
kctfork = "0.4.1"
kotest = "5.9.1"
junit = "5.11.0"

### Java compilation ###
# Kotest's minimum supported Java version.
Expand All @@ -41,7 +41,6 @@ kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }
ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
rgxgen = { module = "com.github.curious-odd-man:rgxgen", version.ref = "rgxgen" }

# Plugins and dependencies for use in buildSrc/build.gradle.kts
Expand All @@ -51,14 +50,12 @@ gradle-plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", v
gradle-plugin-bcv = { module = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin", version.ref = "plugin-bcv" }
gradle-plugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "plugin-dokka" }
gradle-plugin-semantic-versioning = { module = "io.github.serpro69:semantic-versioning", version.ref = "plugin-semantic-versioning" }
gradle-plugin-shadow = { module = "com.github.johnrengelman:shadow", version.ref = "plugin-shadow" }
gradle-plugin-shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "plugin-shadow" }
snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "snakeyaml" }
gradle-plugin-devpublish = { module = "dev.adamko.gradle:dev-publish-plugin", version.ref = "plugin-devpublish" }

# Test
test-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
test-kctfork = { module = "dev.zacsweers.kctfork:core", version.ref = "kctfork" }
test-kctfork-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref = "kctfork" }
test-kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
test-kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
test-kotest-runner = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
Expand All @@ -73,5 +70,5 @@ test-kotest = ["test-kotest-runner", "test-kotest-assertions-core", "test-kotest
[plugins]
# these are for root build.gradle.kts
# most plugins are imported using Maven coordinates (see above), not the Gradle plugin ID
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
benmanes-versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "plugin-nexus-publish" }
benmanes-versions = { id = "com.github.ben-manes.versions", version.ref = "plugin-benmanes-versions" }