Restructure gradle setup and reformat

Author: rubengees

build.gradle

@@ -1,20 +1,13 @@
 buildscript {
     apply from: "gradle/versions.gradle"
+}
 
-    repositories {
-        gradlePluginPortal()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
+plugins {
+    id "org.jetbrains.kotlin.jvm"
+    id "org.jetbrains.kotlin.kapt"
+    id "org.jetbrains.dokka"
 
-        classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintVersion"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
-        
-        classpath "gradle.plugin.de.fuerstenau:BuildConfigPlugin:$buildConfigPluginVersion"
-        classpath "com.github.ben-manes:gradle-versions-plugin:$gradleVersionsPluginVersion"
-    }
+    id "com.github.ben-manes.versions"
 }
 
 allprojects {
@@ -26,6 +19,12 @@ allprojects {
     }
 }
 
+tasks.named("dependencyUpdates").configure {
+    rejectVersionIf {
+        !(it.candidate.version ==~ /^[0-9,.v-]+(-r)?$/)
+    }
+}
+
 wrapper {
     gradleVersion = project.ext.gradleVersion
 }

gradle/versions.gradle

@@ -8,7 +8,8 @@ ext {
     dokkaVersion = "1.4.20"
 
     jacocoVersion = "0.8.6"
-    ktlintVersion = "9.4.1"
+    ktlintPluginVersion = "9.4.1"
+    ktlintVersion = "0.40.0"
     detektVersion = "1.15.0"
 
     gradleVersionsPluginVersion = "0.36.0"

library/build.gradle

@@ -10,10 +10,7 @@ plugins {
     id "io.gitlab.arturbosch.detekt"
     id "org.jlleitschuh.gradle.ktlint"
 
-    id "com.github.ben-manes.versions"
     id "de.fuerstenau.buildconfig"
-
-    id "idea"
 }
 
 apply from: "${rootDir}/gradle/dependencies.gradle"
@@ -57,12 +54,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     }
 }
 
-tasks.named("dependencyUpdates").configure {
-    rejectVersionIf {
-        !(it.candidate.version ==~ /^[0-9,.v-]+(-r)?$/)
-    }
-}
-
 kapt {
     useBuildCache = true
 }
@@ -91,6 +82,7 @@ jacocoTestReport {
 
 ktlint {
     disabledRules = ["import-ordering"]
+    version = ktlintVersion
 
     reporters {
         reporter "checkstyle"

library/src/test/kotlin/me/proxer/library/api/forum/TopicEndpointTest.kt

@@ -24,15 +24,11 @@ class TopicEndpointTest : ProxerTest() {
             id = "811256", parentId = "811201", userId = "139597", username = "Miss-Otaku", image = "139597_cKc2zC.png",
             date = Date(1513626886L * 1000), signature = "", modifiedById = "123", modifiedByName = "test",
             modifiedDate = Date(15135529123L * 1000), modifiedReason = "just a test",
-            message =
-            """
+            message = """
                 |Ich versuche, dass ganze im Rahmen zu halten. Meistens sind es so ungefähr 2-3 Folgen und über
                 | den Tag verteilt. Leider werde ich oft schwach, gerade bei besonders spannenden Anime, dass ich auch
                 | mehrere Folgen am Stück anschaue.
-            """.trimMargin().replace(
-                "\n",
-                ""
-            ),
+            """.trimMargin().replace("\n", ""),
             thankYouAmount = 0
         )
     )

library/src/test/kotlin/me/proxer/library/api/info/EntryEndpointTest.kt

@@ -30,18 +30,14 @@ class EntryEndpointTest : ProxerTest() {
 
     private val expectedEntry = Entry(
         id = "6174", name = "LuCu LuCu", fskConstraints = setOf(),
-        description =
-        """
+        description = """
             |Humans are a despicable lot, committing sin after sin, filling the endless boundaries of the
             | underworld with tortured souls. Now, it would seem, Hell isn't so endless after all, and it has become
             | dangerously close to filling, and then overflowing into the human realm. Princess Lucuha sees this
             | imminent disaster and has a plan: save Hell by making humans decent again. Of course, the angels can't
             | simply allow demons to roam freely on Earth, and they do their best to stop Lucu and her
             | dastardly plans.
-        """.trimMargin().replace(
-            "\n",
-            ""
-        ),
+        """.trimMargin().replace("\n", ""),
         medium = Medium.MANGASERIES, episodeAmount = 90, state = MediaState.FINISHED, ratingSum = 7, ratingAmount = 1,
         clicks = 134, category = Category.MANGA, license = License.NOT_LICENSED,
         adaptionInfo = AdaptionInfo(id = "2793", name = "KissXsis", medium = Medium.MANGASERIES),
@@ -90,27 +86,19 @@ class EntryEndpointTest : ProxerTest() {
                 entryTagId = "175",
                 date = "2018-03-07 23:17:44".toProxerDateTime(),
                 name = "Action",
-                description =
-                """
+                description = """
                     Dynamische Szenen, spannende Wettkämpfe und beeindruckende Kampfszenen prägen dieses Genre.
-                    """.trimIndent().replace(
-                    "\n",
-                    ""
-                )
+                """.trimIndent().replace("\n", "")
             ),
             InfoGenre(
                 id = "120695",
                 entryTagId = "174",
                 date = "2018-03-07 23:17:44".toProxerDateTime(),
                 name = "Adventure",
-                description =
-                """
+                description = """
                     |Es handelt sich meist um eine Geschichte über eine Reise oder Suche.
                     | Kurzum ein Abenteuer, das es zu bestehen gilt.
-                """.trimMargin().replace(
-                    "\n",
-                    ""
-                )
+                """.trimMargin().replace("\n", "")
             )
         )
     )

library/src/test/kotlin/me/proxer/library/api/info/RelationsEndpointTest.kt

@@ -30,8 +30,7 @@ class RelationsEndpointTest : ProxerTest() {
             id = "4167", name = "Sword Art Online",
             genres = setOf("Adventure", "Action", "Comedy", "Drama", "Fantasy", "SciFi"),
             fskConstraints = setOf(FskConstraint.FSK_12, FskConstraint.BAD_LANGUAGE, FskConstraint.VIOLENCE),
-            description =
-            """
+            description = """
                 |Kazuto Kirigaya testet als einer der ersten einen neuen Hightech-Helm, welcher die Psyche
                 | des Nutzers komplett in die Welt des MMORPGs „Sword Art Online“ transferiert. Als Tester der
                 | Beta-Version besitzt er bereits einiges an Erfahrung und kämpfte sich mehr als erfolgreich als
@@ -41,10 +40,7 @@ class RelationsEndpointTest : ProxerTest() {
                 | Möglichkeit wieder in die reale Welt zurückzukehren besteht darin, SAO erfolgreich abzuschließen.
                 | Doch das ist leichter gesagt als getan, denn der Tod in der Fantasy-Welt bedeutet auch den richtigen
                 | Tod in der richtigen Welt.
-            """.trimMargin().replace(
-                "\n",
-                ""
-            ),
+            """.trimMargin().replace("\n", ""),
             medium = Medium.ANIMESERIES, episodeAmount = 25, state = MediaState.FINISHED, ratingSum = 158782,
             ratingAmount = 17935, clicks = 5968, category = Category.ANIME, license = License.LICENSED,
             languages = setOf(MediaLanguage.GERMAN_DUB, MediaLanguage.ENGLISH_SUB, MediaLanguage.ENGLISH_DUB),

library/src/test/kotlin/me/proxer/library/api/list/MediaListEndpointTest.kt

@@ -54,9 +54,6 @@ class MediaListEndpointTest : ProxerTest() {
         request.path shouldBeEqualTo """
                 /api/v1/list/entrylist?kat=anime&medium=animeseries&isH=true&start=abc&
                 sort=rating&sort_type=ASC&p=0&limit=10
-        """.trimIndent().replace(
-            "\n",
-            ""
-        )
+        """.trimIndent().replace("\n", "")
     }
 }

library/src/test/kotlin/me/proxer/library/api/list/MediaSearchEndpointTest.kt

@@ -68,10 +68,7 @@ class MediaSearchEndpointTest : ProxerTest() {
                 /api/v1/list/entrysearch?name=test&language=en&type=all-manga&fsk=fear&sort=clicks&length=300
                 &length-limit=down&tags=3%2B7&notags=5%2B20&taggenre=22%2B33&notaggenre=13%2B17&tagratefilter=rate_1
                 &tagspoilerfilter=spoiler_1&hide_finished=1&p=3&limit=10
-        """.trimIndent().replace(
-            "\n",
-            ""
-        )
+        """.trimIndent().replace("\n", "")
     }
 
     @Test

library/src/test/kotlin/me/proxer/library/api/messenger/CreateConferenceGroupEndpointTest.kt

@@ -48,9 +48,6 @@ class CreateConferenceGroupEndpointTest : ProxerTest() {
 
         request.body.readUtf8() shouldBeEqualTo """
                 topic=topic&text=message&users%5B%5D=someUser&users%5B%5D=anotherUser&users%5B%5D=testUser
-        """.trimIndent().replace(
-            "\n",
-            ""
-        )
+        """.trimIndent().replace("\n", "")
     }
 }

library/src/test/kotlin/me/proxer/library/api/notifications/NewsEndpointTest.kt

@@ -14,14 +14,10 @@ class NewsEndpointTest : ProxerTest() {
 
     private val expectedNews = NewsArticle(
         id = "7709", date = Date(1488654000L * 1000),
-        description =
-        """
+        description = """
             |In der diesjährigen 14. Ausgabe von Shueishas Weekly Shounen Jump-Magazin soll angekündigt werden,
             | dass der Manga To Love-Ru Trouble Darkness eine neue OVA erhält.
-        """.trimMargin().replace(
-            "\n",
-            ""
-        ),
+        """.trimMargin().replace("\n", ""),
         image = "723465714977",
         subject = "To Love-Ru Trouble " + "Darkness – OVA zum zehnjährigen Jubiläum angekündigt", hits = 549,
         threadId = "381362", authorId = "101731", author = "SilentGray", commentAmount = 1, categoryId = "56",