From 1e487d14681a9596a0c0edd099b71b7889371ccc Mon Sep 17 00:00:00 2001
From: Michael Bull <mikebull94@gmail.com>
Date: Thu, 30 May 2019 13:28:56 +0100
Subject: [PATCH] Replace deprecated gradle configurations

---
 build.gradle.kts         | 20 ++++++++++++--------
 example/build.gradle.kts |  6 +++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3f9a825..2f9c67e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
 allprojects {
     repositories {
         mavenCentral()
+        jcenter()
     }
 
     plugins.withType<KotlinPluginWrapper> {
@@ -42,8 +43,8 @@ dependencies {
 val SourceSet.kotlin: SourceDirectorySet
     get() = withConvention(KotlinSourceSet::class) { kotlin }
 
-fun BintrayExtension.pkg(configure: BintrayExtension.PackageConfig.() -> Unit): Any? {
-    return pkg(closureOf(configure))
+fun BintrayExtension.pkg(configure: BintrayExtension.PackageConfig.() -> Unit) {
+    pkg(delegateClosureOf(configure))
 }
 
 val dokka by tasks.existing(DokkaTask::class) {
@@ -54,16 +55,16 @@ val dokka by tasks.existing(DokkaTask::class) {
 }
 
 dokka {
-    kotlinTasks(closureOf<Any?> { emptyList() })
     sourceDirs = sourceSets["main"].kotlin.srcDirs
     outputFormat = "javadoc"
     outputDirectory = "$buildDir/docs/javadoc"
+    kotlinTasks(::defaultKotlinTasks)
 }
 
 val javadocJar by tasks.registering(Jar::class) {
     group = LifecycleBasePlugin.BUILD_GROUP
     description = "Assembles a jar archive containing the Javadoc API documentation."
-    classifier = "javadoc"
+    archiveClassifier.set("javadoc")
     dependsOn(dokka)
     from(dokka.get().outputDirectory)
 }
@@ -71,7 +72,7 @@ val javadocJar by tasks.registering(Jar::class) {
 val sourcesJar by tasks.registering(Jar::class) {
     group = LifecycleBasePlugin.BUILD_GROUP
     description = "Assembles a jar archive containing the main classes with sources."
-    classifier = "sources"
+    archiveClassifier.set("sources")
     from(sourceSets["main"].allSource)
 }
 
@@ -85,9 +86,12 @@ publishing {
     }
 }
 
+val bintrayUser: String? by project
+val bintrayKey: String? by project
+
 bintray {
-    user = project.findProperty("bintrayUser")?.toString() ?: ""
-    key = project.findProperty("bintrayKey")?.toString() ?: ""
+    user = bintrayUser
+    key = bintrayKey
     setPublications("mavenJava")
 
     pkg {
@@ -105,6 +109,6 @@ val bintrayUpload by tasks.existing(BintrayUploadTask::class) {
     dependsOn(javadocJar)
 }
 
-tasks.named<Task>("afterReleaseBuild") {
+tasks.named("afterReleaseBuild") {
     dependsOn(bintrayUpload)
 }
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index 65a25a6..465167f 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation(project(":"))
     implementation(kotlin("stdlib-jdk8"))
     implementation("ch.qos.logback:logback-classic:1.2.3")
-    implementation("io.ktor:ktor-server-core:${ktorVersion}")
-    implementation("io.ktor:ktor-server-netty:${ktorVersion}")
-    implementation("io.ktor:ktor-gson:${ktorVersion}")
+    implementation("io.ktor:ktor-server-core:$ktorVersion")
+    implementation("io.ktor:ktor-server-netty:$ktorVersion")
+    implementation("io.ktor:ktor-gson:$ktorVersion")
 }