Migrate to latest Gradle and modern plugins style

Author: rubengees

gradle/dependencies.gradle

@@ -5,17 +5,20 @@ dependencies {
     api "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
     api "com.squareup.okhttp3:okhttp:$okHttpVersion"
     api "com.squareup.moshi:moshi:$moshiVersion"
-    api "com.serjltt.moshi:moshi-lazy-adapters:$moshiLazyAdaptersVersion"
 
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
+    implementation "com.serjltt.moshi:moshi-lazy-adapters:$moshiLazyAdaptersVersion"
+
+    runtime "com.squareup.okio:okio:$okioVersion"
 
-    implementation "com.squareup.okio:okio:$okioVersion"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
 
     testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
+
     testImplementation "net.jodah:concurrentunit:$concurrentUnitVersion"
     testImplementation "org.amshove.kluent:kluent:$kluentVersion"
     testImplementation "io.mockk:mockk:$mockkVersion"
+
     testImplementation "com.squareup.okhttp3:okhttp-tls:$okHttpVersion"
     testImplementation "com.squareup.okhttp3:mockwebserver:$okHttpVersion"
 }

gradle/versions.gradle

@@ -2,14 +2,14 @@ ext {
     version = "5.0.1"
     group = "com.github.proxer"
 
-    gradleVersion = "5.5.1"
+    gradleVersion = "5.6-rc-2"
 
     kotlinVersion = "1.3.41"
     dokkaVersion = "0.9.18"
 
     jacocoVersion = "0.8.4"
-    ktlintVersion = "8.1.0"
-    detektVersion = "1.0.0-RC15"
+    ktlintVersion = "8.2.0"
+    detektVersion = "1.0.0-RC16"
 
     gradleVersionsPluginVersion = "0.21.0"
     buildConfigPluginVersion = "1.1.8"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-rc-2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle

@@ -1,17 +1,20 @@
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-apply plugin: "java-library"
-apply plugin: "maven-publish"
-apply plugin: "org.jetbrains.dokka"
+plugins {
+    id "org.jetbrains.kotlin.jvm"
+    id "org.jetbrains.kotlin.kapt"
+    id "org.jetbrains.dokka"
 
-apply plugin: "jacoco"
-apply plugin: "io.gitlab.arturbosch.detekt"
-apply plugin: "org.jlleitschuh.gradle.ktlint"
+    id "java-library"
+    id "maven-publish"
 
-apply plugin: "com.github.ben-manes.versions"
-apply plugin: "de.fuerstenau.buildconfig"
+    id "jacoco"
+    id "io.gitlab.arturbosch.detekt"
+    id "org.jlleitschuh.gradle.ktlint"
 
-apply plugin: "idea"
+    id "com.github.ben-manes.versions"
+    id "de.fuerstenau.buildconfig"
+
+    id "idea"
+}
 
 apply from: "${rootDir}/gradle/dependencies.gradle"
 

sample/build.gradle

@@ -1,7 +1,9 @@
-apply plugin: "kotlin"
-apply plugin: "application"
+plugins {
+    id "org.jetbrains.kotlin.jvm"
+    id "application"
 
-apply plugin: "idea"
+    id "idea"
+}
 
 mainClassName = "me.proxer.sample.News"
 

…e/src/main/java/me/proxer/sample/News.kt …src/main/kotlin/me/proxer/sample/News.ktsample/src/main/java/me/proxer/sample/News.kt renamed to sample/src/main/kotlin/me/proxer/sample/News.kt sample/src/main/java/me/proxer/sample/News.kt renamed to sample/src/main/kotlin/me/proxer/sample/News.kt

@@ -1,3 +1,5 @@
+@file:JvmName("News")
+
 package me.proxer.sample
 
 import me.proxer.library.ProxerApi
@@ -10,7 +12,7 @@ fun main() {
         val news = api.notifications.news()
             .build()
             .safeExecute()
-            .map { (_, _, _, _, subject, _, _, _, author) -> "$subject written by $author" }
+            .joinToString("\n") { (_, _, _, _, subject, _, _, _, author) -> "$subject written by $author" }
 
         println()
         println("These are the latest news:\n$news")

settings.gradle

@@ -1 +1,17 @@
+pluginManagement {
+    apply from: "gradle/versions.gradle"
+
+    plugins {
+        id "org.jetbrains.kotlin.jvm" version "${kotlinVersion}"
+        id "org.jetbrains.kotlin.kapt" version "${kotlinVersion}"
+        id "org.jetbrains.dokka" version "${dokkaVersion}"
+
+        id "io.gitlab.arturbosch.detekt" version "${detektVersion}"
+        id "org.jlleitschuh.gradle.ktlint" version "${ktlintVersion}"
+
+        id "com.github.ben-manes.versions" version "${gradleVersionsPluginVersion}"
+        id "de.fuerstenau.buildconfig" version "${buildConfigPluginVersion}"
+    }
+}
+
 include ":library", ":sample"