Update dependencies

Author: rubengees

gradle/versions.gradle

@@ -2,26 +2,26 @@ ext {
     version = "5.1.1"
     group = "com.github.proxer"
 
-    gradleVersion = "6.6"
+    gradleVersion = "6.7.1"
 
-    kotlinVersion = "1.3.72"
-    dokkaVersion = "0.9.18"
+    kotlinVersion = "1.4.21"
+    dokkaVersion = "1.4.20"
 
-    jacocoVersion = "0.8.5"
-    ktlintVersion = "9.2.1"
-    detektVersion = "1.10.0"
+    jacocoVersion = "0.8.6"
+    ktlintVersion = "9.4.1"
+    detektVersion = "1.15.0"
 
-    gradleVersionsPluginVersion = "0.28.0"
+    gradleVersionsPluginVersion = "0.36.0"
     buildConfigPluginVersion = "1.1.8"
 
     retrofitVersion = "2.9.0"
-    okHttpVersion = "4.8.1"
-    okioVersion = "2.6.0"
-    moshiVersion = "1.9.3"
+    okHttpVersion = "4.9.0"
+    okioVersion = "2.9.0"
+    moshiVersion = "1.11.0"
     moshiLazyAdaptersVersion = "2.2"
 
-    junitVersion = "5.6.1"
+    junitVersion = "5.7.0"
     concurrentUnitVersion = "0.4.6"
-    kluentVersion = "1.61"
-    mockkVersion = "1.10.0"
+    kluentVersion = "1.64"
+    mockkVersion = "1.10.3"
 }

gradle/wrapper/gradle-wrapper.properties

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

library/build.gradle

@@ -18,24 +18,25 @@ plugins {
 
 apply from: "${rootDir}/gradle/dependencies.gradle"
 
-task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
-    outputFormat = "html"
-    outputDirectory = javadoc.destinationDir
-    enabled = JavaVersion.current().isJava8()
-
-    includeNonPublic = false
-    jdkVersion = 8
-
-    externalDocumentationLink { url = new URL("https://square.github.io/retrofit/2.x/retrofit/") }
-    externalDocumentationLink { url = new URL("https://square.github.io/okhttp/3.x/okhttp/") }
-    externalDocumentationLink { url = new URL("https://square.github.io/moshi/1.x/moshi/") }
+tasks.withType(org.jetbrains.dokka.gradle.DokkaTask).configureEach {
+    dokkaSourceSets {
+        configureEach {
+            sourceLink {
+                localDirectory.set(file("src/main/kotlin"))
+                remoteUrl.set(uri("https://github.com/proxer/ProxerLibJava/tree/master/library/src/main/kotlin").toURL())
+            }
 
-    packageOptions {
-        prefix = "com.github.proxer.library.enums"
-        reportUndocumented = false
+            externalDocumentationLink { url.set(new URL("https://square.github.io/retrofit/2.x/retrofit/")) }
+            externalDocumentationLink { url.set(new URL("https://square.github.io/okhttp/3.x/okhttp/")) }
+            externalDocumentationLink { url.set(new URL("https://square.github.io/moshi/1.x/moshi/")) }
+        }
     }
 }
 
+tasks.dokkaJavadoc.configure {
+    outputDirectory.set(javadoc.destinationDir)
+}
+
 task sourceJar(type: Jar) {
     archiveClassifier = "sources"
 
@@ -56,6 +57,12 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     }
 }
 
+tasks.named("dependencyUpdates").configure {
+    rejectVersionIf {
+        !(it.candidate.version ==~ /^[0-9,.v-]+(-r)?$/)
+    }
+}
+
 kapt {
     useBuildCache = true
 }
@@ -84,6 +91,7 @@ jacocoTestReport {
 
 ktlint {
     disabledRules = ["import-ordering"]
+
     reporters {
         reporter "checkstyle"
     }

library/src/main/kotlin/me/proxer/library/ProxerCall.kt

@@ -72,21 +72,23 @@ class ProxerCall<T> internal constructor(private val internalCall: Call<ProxerRe
      */
     @JvmOverloads
     fun enqueue(callback: ((T?) -> Unit)? = null, errorCallback: ((ProxerException) -> Unit)? = null) {
-        internalCall.enqueue(object : Callback<ProxerResponse<T>> {
-            override fun onResponse(call: Call<ProxerResponse<T>>, response: Response<ProxerResponse<T>>) {
-                try {
-                    callback?.invoke(processResponse(response))
-                } catch (error: ProxerException) {
-                    errorCallback?.invoke(error)
+        internalCall.enqueue(
+            object : Callback<ProxerResponse<T>> {
+                override fun onResponse(call: Call<ProxerResponse<T>>, response: Response<ProxerResponse<T>>) {
+                    try {
+                        callback?.invoke(processResponse(response))
+                    } catch (error: ProxerException) {
+                        errorCallback?.invoke(error)
+                    }
                 }
-            }
 
-            override fun onFailure(call: Call<ProxerResponse<T>>, error: Throwable) {
-                if (error is Exception && errorCallback != null) {
-                    errorCallback.invoke(processNonProxerError(error))
+                override fun onFailure(call: Call<ProxerResponse<T>>, error: Throwable) {
+                    if (error is Exception && errorCallback != null) {
+                        errorCallback.invoke(processNonProxerError(error))
+                    }
                 }
             }
-        })
+        )
     }
 
     /**

library/src/main/kotlin/me/proxer/library/api/list/TranslatorGroupProjectListEndpoint.kt

@@ -36,7 +36,11 @@ class TranslatorGroupProjectListEndpoint internal constructor(
 
     override fun build(): ProxerCall<List<TranslatorGroupProject>> {
         return internalApi.translatorGroupProjectList(
-            id, projectState, includeHentai, page, limit
+            id,
+            projectState,
+            includeHentai,
+            page,
+            limit
         )
     }
 }

library/src/main/kotlin/me/proxer/library/api/user/UserCommentsEndpoint.kt

@@ -65,7 +65,14 @@ class UserCommentsEndpoint internal constructor(
         val joinedHasContent = hasContent?.joinToString(DELIMITER) { ProxerUtils.getSafeApiEnumName(it) }
 
         return internalApi.comments(
-            userId, username, category, page, limit, minimumLength, joinedStates, joinedHasContent
+            userId,
+            username,
+            category,
+            page,
+            limit,
+            minimumLength,
+            joinedStates,
+            joinedHasContent
         )
     }
 }

library/src/main/kotlin/me/proxer/library/internal/adapter/ConferenceInfoAdapter.kt

@@ -17,8 +17,12 @@ internal class ConferenceInfoAdapter {
     @FromJson
     fun fromJson(json: IntermediateConferenceInfoContainer): ConferenceInfo {
         return ConferenceInfo(
-            json.info.topic, json.info.participantAmount, json.info.firstMessageTime,
-            json.info.lastMessageTime, json.info.leaderId, json.participants
+            json.info.topic,
+            json.info.participantAmount,
+            json.info.firstMessageTime,
+            json.info.lastMessageTime,
+            json.info.leaderId,
+            json.participants
         )
     }
 

library/src/main/kotlin/me/proxer/library/internal/adapter/EpisodeInfoAdapter.kt

@@ -37,8 +37,12 @@ internal class EpisodeInfoAdapter {
         }
 
         return EpisodeInfo(
-            json.firstEpisode, json.lastEpisode, json.category, json.availableLanguages,
-            json.userProgress, episodes
+            json.firstEpisode,
+            json.lastEpisode,
+            json.category,
+            json.availableLanguages,
+            json.userProgress,
+            episodes
         )
     }
 
@@ -60,8 +64,12 @@ internal class EpisodeInfoAdapter {
         }
 
         return IntermediateEpisodeInfo(
-            value.firstEpisode, value.lastEpisode, value.category, value.availableLanguages,
-            value.userProgress, episodes
+            value.firstEpisode,
+            value.lastEpisode,
+            value.category,
+            value.availableLanguages,
+            value.userProgress,
+            episodes
         )
     }
 

library/src/main/kotlin/me/proxer/library/internal/adapter/NotificationAdapter.kt

@@ -25,15 +25,26 @@ internal class NotificationAdapter {
             .build()
 
         return Notification(
-            json.id, json.type, json.contentId, properContentLink, json.text, json.date, json.additionalDescription
+            json.id,
+            json.type,
+            json.contentId,
+            properContentLink,
+            json.text,
+            json.date,
+            json.additionalDescription
         )
     }
 
     @ToJson
     fun toJson(value: Notification): IntermediateNotification {
         return IntermediateNotification(
-            value.id, value.type, value.contentId, value.contentLink.toString(),
-            value.text, value.date, value.additionalDescription
+            value.id,
+            value.type,
+            value.contentId,
+            value.contentLink.toString(),
+            value.text,
+            value.date,
+            value.additionalDescription
         )
     }
 

library/src/main/kotlin/me/proxer/library/internal/adapter/NotificationInfoAdapter.kt

@@ -26,8 +26,10 @@ internal class NotificationInfoAdapter {
         }
 
         return NotificationInfo(
-            json[MESSAGE_FIELD_LOCATION], json[FRIEND_REQUEST_FIELD_LOCATION],
-            json[NEWS_FIELD_LOCATION], json[NOTIFICATIONS_FIELD_LOCATION]
+            json[MESSAGE_FIELD_LOCATION],
+            json[FRIEND_REQUEST_FIELD_LOCATION],
+            json[NEWS_FIELD_LOCATION],
+            json[NOTIFICATIONS_FIELD_LOCATION]
         )
     }