Dependencies and syntax updates.
This commit is contained in:
parent
bca09bbfce
commit
ba4cc22f25
1 changed files with 105 additions and 120 deletions
175
build.gradle.kts
175
build.gradle.kts
|
|
@ -1,28 +1,23 @@
|
|||
import com.jfrog.bintray.gradle.BintrayExtension
|
||||
import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
import org.gradle.api.publish.maven.MavenPom
|
||||
import org.jetbrains.dokka.DokkaConfiguration
|
||||
import org.jetbrains.dokka.gradle.DokkaTask
|
||||
import org.jetbrains.dokka.gradle.LinkMapping
|
||||
import java.io.FileInputStream
|
||||
import java.net.URL
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
kotlin("jvm") version "1.2.50"
|
||||
kotlin("jvm") version "1.3.21"
|
||||
`build-scan`
|
||||
java
|
||||
`maven-publish`
|
||||
id("com.github.ben-manes.versions") version "0.20.0"
|
||||
id("com.jfrog.bintray") version "1.8.3"
|
||||
id("com.github.ben-manes.versions") version "0.21.0"
|
||||
id("com.jfrog.bintray") version "1.8.4"
|
||||
id("org.jetbrains.dokka") version "0.9.17"
|
||||
id("org.jlleitschuh.gradle.ktlint") version "4.1.0"
|
||||
id("io.gitlab.arturbosch.detekt") version "1.0.0.RC7"
|
||||
id("org.jlleitschuh.gradle.ktlint") version "7.2.1"
|
||||
id("io.gitlab.arturbosch.detekt") version "1.0.0-RC14"
|
||||
}
|
||||
|
||||
group = "net.thauvin.erik"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1-beta"
|
||||
description = "Pinboard Poster for Kotlin/Java"
|
||||
|
||||
val gitHub = "ethauvin/$name"
|
||||
|
|
@ -30,6 +25,8 @@ val mavenUrl = "https://github.com/$gitHub"
|
|||
val deployDir = "deploy"
|
||||
var isRelease = "release" in gradle.startParameter.taskNames
|
||||
|
||||
val publicationName = "mavenJava"
|
||||
|
||||
// Load local.properties
|
||||
File("local.properties").apply {
|
||||
if (exists()) {
|
||||
|
|
@ -50,19 +47,27 @@ repositories {
|
|||
|
||||
dependencies {
|
||||
compile(kotlin("stdlib"))
|
||||
compile("com.squareup.okhttp3:okhttp:3.10.0")
|
||||
compile("com.squareup.okhttp3:okhttp:3.14.0")
|
||||
testCompile("org.testng:testng:6.14.3")
|
||||
}
|
||||
|
||||
detekt {
|
||||
profile("main", Action {
|
||||
//config = "default-detekt-config.yml"
|
||||
input = "src/main/kotlin"
|
||||
input = files("src/main/kotlin")
|
||||
filters = ".*/resources/.*,.*/build/.*"
|
||||
output = "$buildDir/reports/detekt-reports"
|
||||
outputName = "detekt-report"
|
||||
baseline = "detekt-baseline.xml"
|
||||
})
|
||||
baseline = project.rootDir.resolve("detekt-baseline.xml")
|
||||
}
|
||||
|
||||
val sourcesJar by tasks.creating(Jar::class) {
|
||||
archiveClassifier.set("sources")
|
||||
from(sourceSets.getByName("main").allSource)
|
||||
}
|
||||
|
||||
val javadocJar by tasks.creating(Jar::class) {
|
||||
dependsOn(tasks.dokka)
|
||||
from(tasks.dokka)
|
||||
archiveClassifier.set("javadoc")
|
||||
description = "Assembles a JAR of the generated Javadoc."
|
||||
group = JavaBasePlugin.DOCUMENTATION_GROUP
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
@ -74,49 +79,34 @@ tasks {
|
|||
kotlinOptions.jvmTarget = "1.8"
|
||||
}
|
||||
|
||||
val sourcesJar by creating(Jar::class) {
|
||||
classifier = "sources"
|
||||
from(java.sourceSets["main"].allSource)
|
||||
withType<GenerateMavenPom> {
|
||||
destination = file("$projectDir/pom.xml")
|
||||
}
|
||||
|
||||
val dokka by getting(DokkaTask::class) {
|
||||
dependsOn(java.sourceSets["main"].classesTaskName)
|
||||
dokka {
|
||||
outputFormat = "html"
|
||||
outputDirectory = "$buildDir/javadoc"
|
||||
// See https://github.com/Kotlin/dokka/issues/196
|
||||
externalDocumentationLink(delegateClosureOf<DokkaConfiguration.ExternalDocumentationLink.Builder> {
|
||||
url = URL("https://docs.oracle.com/javase/8/docs/api/")
|
||||
packageListUrl = URL("https://docs.oracle.com/javase/8/docs/api/package-list")
|
||||
})
|
||||
jdkVersion = 8
|
||||
val mapping = LinkMapping().apply {
|
||||
dir = project.rootDir.toPath().resolve("src/main/kotlin").toFile().path
|
||||
url = "https://github.com/ethauvin/pinboard-poster/blob/${project.version}/src/main/kotlin"
|
||||
suffix = "#L"
|
||||
}
|
||||
linkMappings = arrayListOf(mapping)
|
||||
|
||||
includeNonPublic = false
|
||||
}
|
||||
|
||||
val javadocJar by creating(Jar::class) {
|
||||
dependsOn(dokka)
|
||||
from(dokka.outputDirectory)
|
||||
classifier = "javadoc"
|
||||
description = "Assembles a JAR of the generated Javadoc"
|
||||
group = JavaBasePlugin.DOCUMENTATION_GROUP
|
||||
}
|
||||
|
||||
"assemble" {
|
||||
dependsOn(sourcesJar, javadocJar)
|
||||
}
|
||||
|
||||
val copyToDeploy by creating(Copy::class) {
|
||||
val copyToDeploy by registering(Copy::class) {
|
||||
from(configurations.runtime)
|
||||
from(tasks["jar"])
|
||||
from(jar)
|
||||
into(deployDir)
|
||||
}
|
||||
|
||||
"deploy" {
|
||||
register("deploy") {
|
||||
description = "Copies all needed files to the $deployDir directory."
|
||||
group = PublishingPlugin.PUBLISH_TASK_GROUP
|
||||
dependsOn("build")
|
||||
|
|
@ -125,13 +115,13 @@ tasks {
|
|||
mustRunAfter("clean")
|
||||
}
|
||||
|
||||
val gitIsDirty by creating(Exec::class) {
|
||||
val gitIsDirty by registering(Exec::class) {
|
||||
description = "Fails if git has uncommitted changes."
|
||||
group = "verification"
|
||||
commandLine("git", "diff", "--quiet", "--exit-code")
|
||||
}
|
||||
|
||||
val gitTag by creating(Exec::class) {
|
||||
val gitTag by registering(Exec::class) {
|
||||
description = "Tags the local repository with version ${project.version}"
|
||||
group = PublishingPlugin.PUBLISH_TASK_GROUP
|
||||
dependsOn(gitIsDirty)
|
||||
|
|
@ -140,14 +130,57 @@ tasks {
|
|||
}
|
||||
}
|
||||
|
||||
val check by getting {
|
||||
"check" {
|
||||
dependsOn("ktlintCheck")
|
||||
}
|
||||
|
||||
val publicationName = "mavenJava"
|
||||
val bintrayUpload by existing(BintrayUploadTask::class) {
|
||||
dependsOn(publishToMavenLocal, gitTag)
|
||||
}
|
||||
|
||||
buildScan {
|
||||
setTermsOfServiceUrl("https://gradle.com/terms-of-service")
|
||||
setTermsOfServiceAgree("yes")
|
||||
}
|
||||
|
||||
register("release") {
|
||||
description = "Publishes version ${project.version} to Bintray."
|
||||
group = PublishingPlugin.PUBLISH_TASK_GROUP
|
||||
dependsOn("wrapper", bintrayUpload)
|
||||
}
|
||||
}
|
||||
|
||||
fun findProperty(s: String) = project.findProperty(s) as String?
|
||||
bintray {
|
||||
user = findProperty("bintray.user")
|
||||
key = findProperty("bintray.apikey")
|
||||
publish = isRelease
|
||||
setPublications(publicationName)
|
||||
pkg.apply {
|
||||
repo = "maven"
|
||||
name = project.name
|
||||
desc = description
|
||||
websiteUrl = mavenUrl
|
||||
issueTrackerUrl = "$mavenUrl/issues"
|
||||
githubRepo = gitHub
|
||||
githubReleaseNotesFile = "README.md"
|
||||
vcsUrl = "$mavenUrl.git"
|
||||
setLabels("kotlin", "java", "pinboard", "poster", "bookmarks")
|
||||
publicDownloadNumbers = true
|
||||
version.apply {
|
||||
name = project.version as String
|
||||
desc = description
|
||||
vcsTag = project.version as String
|
||||
gpg.apply {
|
||||
sign = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
(publications) {
|
||||
publicationName(MavenPublication::class) {
|
||||
publications {
|
||||
create<MavenPublication>(publicationName) {
|
||||
from(components["java"])
|
||||
artifact(sourcesJar)
|
||||
artifact(javadocJar)
|
||||
|
|
@ -183,51 +216,3 @@ tasks {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
val generatePomFileForMavenJavaPublication by getting(GenerateMavenPom::class) {
|
||||
destination = file("$projectDir/pom.xml")
|
||||
}
|
||||
|
||||
val bintrayUpload by getting(BintrayUploadTask::class) {
|
||||
dependsOn(generatePomFileForMavenJavaPublication, gitTag)
|
||||
}
|
||||
|
||||
fun findProperty(s: String) = project.findProperty(s) as String?
|
||||
bintray {
|
||||
user = findProperty("bintray.user")
|
||||
key = findProperty("bintray.apikey")
|
||||
publish = isRelease
|
||||
setPublications(publicationName)
|
||||
pkg.apply {
|
||||
repo = "maven"
|
||||
name = project.name
|
||||
desc = description
|
||||
websiteUrl = mavenUrl
|
||||
issueTrackerUrl = "$mavenUrl/issues"
|
||||
githubRepo = gitHub
|
||||
githubReleaseNotesFile = "README.md"
|
||||
vcsUrl = "$mavenUrl.git"
|
||||
setLabels("kotlin", "java", "pinboard", "poster", "bookmarks")
|
||||
publicDownloadNumbers = true
|
||||
version.apply {
|
||||
name = project.version as String
|
||||
desc = description
|
||||
vcsTag = project.version as String
|
||||
gpg.apply {
|
||||
sign = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildScan {
|
||||
setTermsOfServiceUrl("https://gradle.com/terms-of-service")
|
||||
setTermsOfServiceAgree("yes")
|
||||
}
|
||||
|
||||
"release" {
|
||||
description = "Publishes version ${project.version} to Bintray."
|
||||
group = PublishingPlugin.PUBLISH_TASK_GROUP
|
||||
dependsOn("wrapper", bintrayUpload)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue