Skip to content

Commit

Permalink
Upgrade all dependencies and gradle to latest milestone versions
Browse files Browse the repository at this point in the history
  • Loading branch information
serpro69 committed Feb 27, 2021
1 parent 2e3daea commit 668a98a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import io.qameta.allure.gradle.task.AllureServe

plugins {
// `kotlin-dsl` version "1.3.6" apply false
kotlin("jvm") version "1.4.0" apply false
kotlin("jvm") version "1.4.31" apply false
id("net.vivin.gradle-semantic-build-versioning") apply false
id("com.adarshr.test-logger") version "2.0.0" apply false
id("com.github.ben-manes.versions") version "0.28.0" apply false
Expand Down Expand Up @@ -43,16 +43,16 @@ subprojects {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("reflect"))
implementation("org.slf4j:slf4j-api:1.7.30")
testImplementation("io.kotest:kotest-runner-junit5:4.2.2")
testImplementation("io.kotest:kotest-extensions-allure:4.2.2")
testImplementation("io.kotest:kotest-runner-junit5-jvm:4.2.2")
testImplementation("io.kotest:kotest-assertions-core-jvm:4.2.2")
testImplementation("io.kotest:kotest-property-jvm:4.2.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
testImplementation("io.kotest:kotest-runner-junit5:4.4.1")
testImplementation("io.kotest:kotest-extensions-allure:4.4.1")
testImplementation("io.kotest:kotest-runner-junit5-jvm:4.4.1")
testImplementation("io.kotest:kotest-assertions-core-jvm:4.4.1")
testImplementation("io.kotest:kotest-property-jvm:4.4.1")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.1")
testRuntimeOnly("ch.qos.logback:logback-core:1.2.3")
testRuntimeOnly("ch.qos.logback:logback-classic:1.2.3")
testRuntimeOnly("org.codehaus.groovy:groovy:3.0.5")
testRuntimeOnly("org.codehaus.groovy:groovy:3.0.7")
}

configure<JavaPluginConvention> {
Expand Down Expand Up @@ -127,9 +127,9 @@ subprojects {
aspectjweaver = false
aspectjVersion = "1.9.6"
autoconfigure = true
allureJavaVersion = "2.13.3"
allureJavaVersion = "2.13.8"
useJUnit5 {
version = "2.13.5"
version = "2.13.8"
}
}
}
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,17 +3,17 @@ import com.adarshr.gradle.testlogger.theme.ThemeType

plugins {
kotlin("jvm")
id("com.github.johnrengelman.shadow") version "6.0.0"
id("com.github.johnrengelman.shadow") version "6.1.0"
application
id("com.palantir.graal") version "0.7.1"
id("com.palantir.graal") version "0.7.2"
}

val mainFunction = "io.github.serpro69.kfaker.app.KFakerKt"
val mainAppClass = "io.github.serpro69.kfaker.app.KFaker"

dependencies {
implementation(project(":core"))
implementation("info.picocli:picocli:4.5.1")
implementation("info.picocli:picocli:4.6.1")
}

application {
Expand Down
10 changes: 5 additions & 5 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ plugins {
kotlin("jvm")
`maven-publish`
id("com.jfrog.bintray") version "1.8.5"
id("org.jetbrains.dokka") version "1.4.0-rc"
id("org.jetbrains.dokka") version "1.4.20"
}

dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind:2.11.2")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.2")
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.1")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.1")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.1")
implementation("com.github.mifmif:generex:1.0.2")
runtimeOnly(kotlin("script-runtime"))
}
Expand Down Expand Up @@ -49,7 +49,7 @@ val sourcesJar by tasks.creating(Jar::class) {

val dokkaJavadocJar by tasks.creating(Jar::class) {
dependsOn(tasks.dokkaJavadoc)
from(tasks.dokkaJavadoc.get().getOutputDirectoryAsFile())
from(tasks.dokkaJavadoc.get().outputDirectory.orNull)
archiveClassifier.set("javadoc")
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 668a98a

Please sign in to comment.