Updated dependencies.

This commit is contained in:
Erik C. Thauvin 2020-03-05 22:47:39 -08:00
parent fc4b25bda4
commit 5550f076ca
11 changed files with 55 additions and 44 deletions

View file

@ -8,16 +8,16 @@ import java.util.Properties
plugins {
jacoco
java
kotlin("jvm") version "1.3.61"
`maven-publish`
id("com.github.ben-manes.versions") version "0.27.0"
id("com.github.ben-manes.versions") version "0.28.0"
id("com.jfrog.bintray") version "1.8.4"
id("io.gitlab.arturbosch.detekt") version "1.5.1"
id("io.gitlab.arturbosch.detekt") version "1.6.0"
id("net.thauvin.erik.gradle.semver") version "1.0.4"
id("org.jetbrains.dokka") version "0.10.1"
id("org.jetbrains.kotlin.kapt").version("1.3.61")
id("org.jetbrains.kotlin.plugin.serialization").version("1.3.61")
id("org.jmailen.kotlinter") version "2.3.0"
id("org.jetbrains.kotlin.jvm") version "1.3.70"
id("org.jetbrains.kotlin.kapt") version "1.3.70"
id("org.jetbrains.kotlin.plugin.serialization") version "1.3.70"
id("org.jmailen.kotlinter") version "2.3.2"
id("org.sonarqube") version "2.8"
}
@ -34,7 +34,7 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
val publicationName = "mavenJava"
object VersionInfo {
const val okhttp = "4.3.1"
const val okhttp = "4.4.0"
}
val versions: VersionInfo by extra { VersionInfo }
@ -61,15 +61,17 @@ dependencies {
kapt(semverProcessor)
compileOnly(semverProcessor)
compile("javax.servlet:javax.servlet-api:4.0.1")
implementation("javax.servlet:javax.servlet-api:4.0.1")
compile("com.squareup.okhttp3:okhttp:${versions.okhttp}")
compile("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
implementation("com.squareup.okhttp3:okhttp:${versions.okhttp}")
implementation("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
compile(kotlin("stdlib"))
compile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0")
// Align versions of all Kotlin components
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation(kotlin("stdlib"))
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0-1.3.70-eap-274-2")
testImplementation("org.mockito:mockito-core:3.2.4")
testImplementation("org.mockito:mockito-core:3.3.1")
testImplementation("org.testng:testng:7.1.1")
}
@ -96,6 +98,11 @@ jacoco {
toolVersion = "0.8.3"
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
sonarqube {
properties {
property("sonar.projectKey", "ethauvin_$name")
@ -152,7 +159,7 @@ tasks {
}
}
withType<KotlinCompile> {
withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = "1.8"
}
@ -176,7 +183,7 @@ tasks {
configuration {
sourceLink {
path = "src/main/kotlin"
path = file("$projectDir/src/main/kotlin").toURI().toString().replace("file:", "")
url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin"
lineSuffix = "#L"
}
@ -191,6 +198,7 @@ tasks {
includes = listOf("config/dokka/packages.md")
includeNonPublic = false
}
dependsOn(dokkaDocs)
}
val copyToDeploy by registering(Copy::class) {