erik/akismet-kotlin
erik/akismet-kotlin
1
1
Fork 0
Code Issues Pull requests Releases Activity

Updated dependencies.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-12-15 17:41:18 -08:00
parent 5555f4ffc9
commit 4e1eaebd37
2 changed files with 35 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

60
build.gradle.kts
View file

@ -7,18 +7,17 @@ import java.util.Properties
plugins { plugins {
jacoco jacoco
java java
kotlin("jvm") version "1.3.50" kotlin("jvm") version "1.3.61"
`maven-publish` `maven-publish`
id("com.github.ben-manes.versions") version "0.25.0" id("com.github.ben-manes.versions") version "0.27.0"
id("com.gradle.build-scan") version "2.4.2"
id("com.jfrog.bintray") version "1.8.4" id("com.jfrog.bintray") version "1.8.4"
id("io.gitlab.arturbosch.detekt") version "1.0.1" id("io.gitlab.arturbosch.detekt") version "1.2.2"
id("net.thauvin.erik.gradle.semver") version "1.0.4" id("net.thauvin.erik.gradle.semver") version "1.0.4"
id("org.jetbrains.dokka") version "0.9.18" id("org.jetbrains.dokka") version "0.10.0"
id("org.jetbrains.kotlin.kapt").version("1.3.50") id("org.jetbrains.kotlin.kapt").version("1.3.61")
id("org.jetbrains.kotlin.plugin.serialization").version("1.3.50") id("org.jetbrains.kotlin.plugin.serialization").version("1.3.61")
id("org.jmailen.kotlinter") version "2.1.1" id("org.jmailen.kotlinter") version "2.2.0"
id("org.sonarqube") version "2.7.1" id("org.sonarqube") version "2.8"
} }
group = "net.thauvin.erik" group = "net.thauvin.erik"
@ -56,14 +55,14 @@ dependencies {
compileOnly(semverProcessor) compileOnly(semverProcessor)
compile("javax.servlet:javax.servlet-api:4.0.1") compile("javax.servlet:javax.servlet-api:4.0.1")
compile("com.squareup.okhttp3:okhttp:4.2.0") compile("com.squareup.okhttp3:okhttp:4.2.2")
compile("com.squareup.okhttp3:logging-interceptor:4.2.0") compile("com.squareup.okhttp3:logging-interceptor:4.2.2")
compile(kotlin("stdlib")) compile(kotlin("stdlib"))
compile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0") compile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0")
testImplementation("org.mockito:mockito-core:3.0.0") testImplementation("org.mockito:mockito-core:3.2.0")
testImplementation("org.testng:testng:7.0.0") testImplementation("org.testng:testng:7.1.0")
} }
kapt { kapt {
@ -142,26 +141,24 @@ tasks {
dokka { dokka {
outputFormat = "html" outputFormat = "html"
outputDirectory = "$buildDir/javadoc" outputDirectory = "$buildDir/javadoc"
jdkVersion = 8
linkMapping { configuration {
// See https://github.com/Kotlin/dokka/issues/289 sourceLink {
val f = if (System.getProperty("os.name").contains("windows", true)) { path = "src/main/kotlin"
file("${projectDir}/src/main/kotlin").toURI().toString().replace("file:", "") url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin"
} else { lineSuffix = "#L"
"src/main/kotlin"
} }
dir = f
url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin"
suffix = "#L"
}
externalDocumentationLink { jdkVersion = 8
url = URL("https://javaee.github.io/javaee-spec/javadocs/")
}
includes = listOf("config/dokka/packages.md") externalDocumentationLink {
includeNonPublic = false url = URL("https://javaee.github.io/javaee-spec/javadocs/")
packageListUrl = URL("https://javaee.github.io/javaee-spec/javadocs/package-list")
}
includes = listOf("config/dokka/packages.md")
includeNonPublic = false
}
} }
val copyToDeploy by registering(Copy::class) { val copyToDeploy by registering(Copy::class) {
@ -200,11 +197,6 @@ tasks {
dependsOn(publishToMavenLocal, gitTag) dependsOn(publishToMavenLocal, gitTag)
} }
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}
register("release") { register("release") {
description = "Publishes version ${project.version} to Bintray." description = "Publishes version ${project.version} to Bintray."
group = PublishingPlugin.PUBLISH_TASK_GROUP group = PublishingPlugin.PUBLISH_TASK_GROUP

17
settings.gradle.kts
View file

@ -1,10 +1,11 @@
/* plugins {
* This file was generated by the Gradle 'init' task. id("com.gradle.enterprise").version("3.1.1")
* }
* The settings file is used to specify which projects to include in your build.
*
* Detailed information about configuring a multi-project build in Gradle can be found
* in the user manual at https://docs.gradle.org/5.6.2/userguide/multi_project_builds.html
*/
rootProject.name = "akismet-kotlin" rootProject.name = "akismet-kotlin"
gradleEnterprise {
buildScan {
// plugin configuration
}
}