Apply new spotless rules

Author: ChrisKruegerDev

build.gradle.kts

@@ -29,7 +29,13 @@ allprojects {
         mavenLocal()
     }
 
-    apply(plugin = rootProject.libs.plugins.spotless.get().pluginId)
+    apply(
+        plugin =
+            rootProject.libs.plugins.spotless
+                .get()
+                .pluginId,
+    )
+
     configure<SpotlessExtension> {
         kotlin {
             target("**/*.kt")

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
 kotlin = "2.0.21"
-spotless = "6.23.3"
+spotless = "7.0.0.BETA4"
 ben-manes-versions = "0.51.0"
 dokka = "1.9.20"
 kotlinx-datetime = "0.6.1"
 kotlinx-serialization = "1.7.3"
 coroutines = "1.9.0"
 ktor = "3.0.1"
-ktlint = "1.1.1"
+ktlint = "1.4.1"
 junit-jupiter = "5.11.3"
 truth = "1.4.4"
 junit = "4.13.2"

lib/src/commonMain/kotlin/app/moviebase/trakt/Trakt.kt

@@ -23,8 +23,9 @@ fun Trakt(block: TraktClientConfig.() -> Unit): Trakt {
     return Trakt(config)
 }
 
-class Trakt internal constructor(private val config: TraktClientConfig) {
-
+class Trakt internal constructor(
+    private val config: TraktClientConfig,
+) {
     constructor(traktApiKey: String) : this(TraktClientConfig.withKey(traktApiKey))
 
     val client: HttpClient by lazy {
@@ -54,7 +55,8 @@ class Trakt internal constructor(private val config: TraktClientConfig) {
     val recommendations by buildApi(::TraktRecommendationsApi)
     val comments by buildApi(::TraktCommentsApi)
 
-    private inline fun <T> buildApi(crossinline builder: (HttpClient) -> T) = lazy {
-        builder(client)
-    }
+    private inline fun <T> buildApi(crossinline builder: (HttpClient) -> T) =
+        lazy {
+            builder(client)
+        }
 }

lib/src/commonMain/kotlin/app/moviebase/trakt/TraktClientConfig.kt

@@ -10,7 +10,6 @@ import io.ktor.client.plugins.logging.LoggingConfig
 
 @TraktDsl
 class TraktClientConfig {
-
     var traktApiKey: String? = null
     var clientSecret: String? = null
 
@@ -54,16 +53,15 @@ class TraktClientConfig {
     }
 
     companion object {
-
-        internal fun withKey(tmdbApiKey: String) = TraktClientConfig().apply {
-            this.traktApiKey = tmdbApiKey
-        }
+        internal fun withKey(tmdbApiKey: String) =
+            TraktClientConfig().apply {
+                this.traktApiKey = tmdbApiKey
+            }
     }
 }
 
 @TraktDsl
 class TraktAuthCredentials {
-
     internal var refreshTokensProvider: suspend () -> BearerTokens? = { null }
     internal var loadTokensProvider: suspend () -> BearerTokens? = { null }
 

lib/src/commonMain/kotlin/app/moviebase/trakt/TraktWebConfig.kt

@@ -36,7 +36,9 @@ internal object TraktUrlParameter {
     const val EPISODES = "episodes"
 }
 
-enum class TraktExtended(val value: String) {
+enum class TraktExtended(
+    val value: String,
+) {
     FULL("full"),
     NO_SEASONS("noseasons"),
     EPISODES("episodes"),

lib/src/commonMain/kotlin/app/moviebase/trakt/api/TraktAuthApi.kt

@@ -14,23 +14,24 @@ class TraktAuthApi(
     private val client: HttpClient,
     private val config: TraktClientConfig,
 ) {
-
-    suspend fun postToken(request: TraktTokenRefreshRequest): TraktAccessToken = client.postByPaths("oauth", "token") {
-        contentType(ContentType.Application.Json)
-        setBody(request)
-    }
+    suspend fun postToken(request: TraktTokenRefreshRequest): TraktAccessToken =
+        client.postByPaths("oauth", "token") {
+            contentType(ContentType.Application.Json)
+            setBody(request)
+        }
 
     suspend fun requestAccessToken(
         redirectUri: String,
         code: String,
     ): TraktAccessToken {
-        val requestToken = TraktTokenRefreshRequest(
-            clientId = config.traktApiKey,
-            clientSecret = config.clientSecret,
-            redirectUri = redirectUri,
-            grantType = TraktGrantType.AUTHORIZATION_CODE,
-            code = code,
-        )
+        val requestToken =
+            TraktTokenRefreshRequest(
+                clientId = config.traktApiKey,
+                clientSecret = config.clientSecret,
+                redirectUri = redirectUri,
+                grantType = TraktGrantType.AUTHORIZATION_CODE,
+                code = code,
+            )
         return postToken(requestToken)
     }
 
@@ -40,13 +41,14 @@ class TraktAuthApi(
     ): TraktAccessToken {
         require(refreshToken.isNotBlank()) { "refresh token is empty" }
 
-        val requestToken = TraktTokenRefreshRequest(
-            clientId = config.traktApiKey,
-            clientSecret = config.clientSecret,
-            redirectUri = redirectUri,
-            grantType = TraktGrantType.REFRESH_TOKEN,
-            refreshToken = refreshToken,
-        )
+        val requestToken =
+            TraktTokenRefreshRequest(
+                clientId = config.traktApiKey,
+                clientSecret = config.clientSecret,
+                redirectUri = redirectUri,
+                grantType = TraktGrantType.REFRESH_TOKEN,
+                refreshToken = refreshToken,
+            )
         return postToken(requestToken)
     }
 }

lib/src/commonMain/kotlin/app/moviebase/trakt/api/TraktCheckinApi.kt

@@ -11,12 +11,14 @@ import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
 
-class TraktCheckinApi(private val client: HttpClient) {
-
-    suspend fun postCheckin(item: TraktCheckinItem): TraktCheckin.Active = client.postByPaths("checkin") {
-        contentType(ContentType.Application.Json)
-        setBody(item)
-    }
+class TraktCheckinApi(
+    private val client: HttpClient,
+) {
+    suspend fun postCheckin(item: TraktCheckinItem): TraktCheckin.Active =
+        client.postByPaths("checkin") {
+            contentType(ContentType.Application.Json)
+            setBody(item)
+        }
 
     suspend fun deleteCheckin(): TraktCheckin.Active = client.delete(urlString = buildPaths("checkin")).body()
 }

lib/src/commonMain/kotlin/app/moviebase/trakt/api/TraktCommentsApi.kt

@@ -14,8 +14,9 @@ import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
 
-class TraktCommentsApi(private val client: HttpClient) {
-
+class TraktCommentsApi(
+    private val client: HttpClient,
+) {
     suspend fun postComment(comment: TraktPostComment): TraktCheckin.Active =
         client.postByPaths("comments") {
             contentType(ContentType.Application.Json)
@@ -25,24 +26,25 @@ class TraktCommentsApi(private val client: HttpClient) {
     suspend fun updateComment(
         id: Int,
         comment: TraktPostComment,
-    ): TraktComment = client.put(urlString = buildPaths("comments", id.toString())) {
-        contentType(ContentType.Application.Json)
-        setBody(comment)
-    }.body()
+    ): TraktComment =
+        client
+            .put(urlString = buildPaths("comments", id.toString())) {
+                contentType(ContentType.Application.Json)
+                setBody(comment)
+            }.body()
 
     suspend fun getComment(id: Int): TraktComment = client.getByPaths("comments", id.toString())
 
-    suspend fun deleteComment(id: Int): TraktComment =
-        client.delete(urlString = buildPaths("comments", id.toString())).body()
+    suspend fun deleteComment(id: Int): TraktComment = client.delete(urlString = buildPaths("comments", id.toString())).body()
 
-    suspend fun getCommentReplies(id: Int): List<TraktComment> =
-        client.getByPaths("comments", id.toString(), "replies")
+    suspend fun getCommentReplies(id: Int): List<TraktComment> = client.getByPaths("comments", id.toString(), "replies")
 
     suspend fun postCommentReplies(
         id: Int,
         comment: TraktPostComment,
-    ): List<TraktComment> = client.postByPaths("comments", id.toString(), "replies") {
-        contentType(ContentType.Application.Json)
-        setBody(comment)
-    }
+    ): List<TraktComment> =
+        client.postByPaths("comments", id.toString(), "replies") {
+            contentType(ContentType.Application.Json)
+            setBody(comment)
+        }
 }

lib/src/commonMain/kotlin/app/moviebase/trakt/api/TraktEpisodesApi.kt

@@ -7,16 +7,18 @@ import app.moviebase.trakt.model.TraktEpisode
 import app.moviebase.trakt.model.TraktRating
 import io.ktor.client.HttpClient
 
-class TraktEpisodesApi(private val client: HttpClient) {
-
+class TraktEpisodesApi(
+    private val client: HttpClient,
+) {
     suspend fun getSummary(
         traktSlug: String,
         seasonNumber: Int,
         episodeNumber: Int,
         extended: TraktExtended = TraktExtended.FULL,
-    ): TraktEpisode = client.getByPaths(*pathEpisodes(traktSlug, seasonNumber, episodeNumber)) {
-        parameterExtended(extended)
-    }
+    ): TraktEpisode =
+        client.getByPaths(*pathEpisodes(traktSlug, seasonNumber, episodeNumber)) {
+            parameterExtended(extended)
+        }
 
     suspend fun getRating(
         traktSlug: String,

lib/src/commonMain/kotlin/app/moviebase/trakt/api/TraktMoviesApi.kt

@@ -6,13 +6,18 @@ import app.moviebase.trakt.model.TraktMovie
 import app.moviebase.trakt.model.TraktRating
 import io.ktor.client.HttpClient
 
-class TraktMoviesApi(private val client: HttpClient) {
-
-    suspend fun getSummary(traktSlug: String): TraktMovie = client.getByPaths(*pathMovies(traktSlug)) {
-        parameterExtended()
-    }
+class TraktMoviesApi(
+    private val client: HttpClient,
+) {
+    suspend fun getSummary(traktSlug: String): TraktMovie =
+        client.getByPaths(*pathMovies(traktSlug)) {
+            parameterExtended()
+        }
 
     suspend fun getRating(traktSlug: String): TraktRating = client.getByPaths(*pathMovies(traktSlug, "ratings"))
 
-    private fun pathMovies(traktSlug: String, vararg paths: String) = arrayOf("movies", traktSlug, *paths)
+    private fun pathMovies(
+        traktSlug: String,
+        vararg paths: String,
+    ) = arrayOf("movies", traktSlug, *paths)
 }