Update plugin.kotlinter to v4 (major) (#167)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | org.jmailen.kotlinter | `3.16.0` -> `4.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jmailen.kotlinter/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jmailen.kotlinter/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jmailen.kotlinter/3.16.0/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jmailen.kotlinter/3.16.0/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jmailen.gradle:kotlinter-gradle](https://togithub.com/jeremymailen/kotlinter-gradle) | `3.16.0` -> `4.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jmailen.gradle:kotlinter-gradle/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jmailen.gradle:kotlinter-gradle/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jmailen.gradle:kotlinter-gradle/3.16.0/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jmailen.gradle:kotlinter-gradle/3.16.0/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>jeremymailen/kotlinter-gradle (org.jmailen.gradle:kotlinter-gradle)</summary> ### [`v4.0.0`](https://togithub.com/jeremymailen/kotlinter-gradle/releases/tag/4.0.0) [Compare Source](https://togithub.com/jeremymailen/kotlinter-gradle/compare/3.16.0...4.0.0) Upgrade to ktlint 1.0.0 - Official stable 1.0 of ktlint 🎉 - Lots of changes, see here: https://github.com/pinterest/ktlint/releases/tag/1.0.0 - See kotlinter [compatibility matrix](https://togithub.com/jeremymailen/kotlinter-gradle#compatibility) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/julioromano/mooviez).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Marco Romano <[email protected]>
julioromano · Nov 7, 2023 · c99af3e · c99af3e
1 parent c94b8ed
commit c99af3e
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 41 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,3 +12,5 @@ max_line_length = 100
 trim_trailing_whitespace = true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_code_style = intellij_idea
+ktlint_standard_function-naming = disabled
diff --git a/app/src/main/kotlin/net/marcoromano/mooviez/app/ui/AppNavHost.kt b/app/src/main/kotlin/net/marcoromano/mooviez/app/ui/AppNavHost.kt
@@ -15,7 +15,7 @@ fun AppNavHost() {
   val context = LocalContext.current
   NavHost(
     navController = navController,
-    startDestination = TrendingNavigation.route,
+    startDestination = TrendingNavigation.ROUTE,
     modifier = Modifier.fillMaxSize(),
     route = "mainGraph",
   ) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ plugin-google-firebase-appDistribution = "4.0.1"
 plugin-google-firebase-crashlytics = "2.9.9"
 plugin-google-ksp = "1.9.20-1.0.14"
 plugin-google-services = "4.4.0"
-plugin-kotlinter = "3.16.0"
+plugin-kotlinter = "4.0.0"
 plugin-playPublisher = "3.8.5"
 square-moshi = "1.15.0"
 square-okhttp = "4.12.0"

diff --git a/httpapi/public/src/main/kotlin/net/marcoromano/mooviez/httpapi/HttpApi.kt b/httpapi/public/src/main/kotlin/net/marcoromano/mooviez/httpapi/HttpApi.kt
@@ -13,7 +13,5 @@ public interface HttpApi {
   ): TrendingMovies
 
   @GET("3/movie/{movie_id}")
-  public suspend fun movie(
-    @Path("movie_id") movieId: Long,
-  ): Movie
+  public suspend fun movie(@Path("movie_id") movieId: Long): Movie
 }
diff --git a/movie/src/main/kotlin/net/marcoromano/mooviez/movie/MovieNavigation.kt b/movie/src/main/kotlin/net/marcoromano/mooviez/movie/MovieNavigation.kt
@@ -11,10 +11,7 @@ import me.tatarka.inject.annotations.Inject
 public class MovieNavigation(
   private val movieScreen: MovieScreen,
 ) {
-  public fun navGraphBuilder(
-    navGraphBuilder: NavGraphBuilder,
-    navBack: () -> Unit,
-  ) {
+  public fun navGraphBuilder(navGraphBuilder: NavGraphBuilder, navBack: () -> Unit) {
     navGraphBuilder.composable(
       route = "movie/{id}",
       arguments = listOf(

diff --git a/movie/src/main/kotlin/net/marcoromano/mooviez/movie/MovieScreen.kt b/movie/src/main/kotlin/net/marcoromano/mooviez/movie/MovieScreen.kt
@@ -51,10 +51,7 @@ public fun MovieScreen(
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun MovieScreen(
-  state: MovieState,
-  navBack: () -> Unit,
-) {
+private fun MovieScreen(state: MovieState, navBack: () -> Unit) {
   val behavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
   Scaffold(
     modifier = Modifier.nestedScroll(behavior.nestedScrollConnection),

diff --git a/movie/src/main/kotlin/net/marcoromano/mooviez/movie/widgets/Movie.kt b/movie/src/main/kotlin/net/marcoromano/mooviez/movie/widgets/Movie.kt
@@ -38,10 +38,7 @@ import net.marcoromano.mooviez.movie.demoMovieStateMovie
 import net.marcoromano.mooviez.widgets.UserScore
 
 @Composable
-internal fun Movie(
-  modifier: Modifier = Modifier,
-  movie: MovieState.Movie,
-) {
+internal fun Movie(modifier: Modifier = Modifier, movie: MovieState.Movie) {
   Column(
     modifier = modifier,
   ) {

diff --git a/trending/src/main/kotlin/net/marcoromano/mooviez/trending/TrendingNavigation.kt b/trending/src/main/kotlin/net/marcoromano/mooviez/trending/TrendingNavigation.kt
@@ -10,15 +10,12 @@ public class TrendingNavigation(
   private val trendingScreen: TrendingScreen,
 ) {
   public companion object {
-    public const val route: String = "feature"
+    public const val ROUTE: String = "feature"
   }
 
-  public fun navGraphBuilder(
-    navGraphBuilder: NavGraphBuilder,
-    navToDetail: (id: Long) -> Unit,
-  ) {
+  public fun navGraphBuilder(navGraphBuilder: NavGraphBuilder, navToDetail: (id: Long) -> Unit) {
     navGraphBuilder.composable(
-      route = route,
+      route = ROUTE,
     ) {
       trendingScreen(
         navToDetail,
@@ -27,6 +24,6 @@ public class TrendingNavigation(
   }
 
   public fun navigate(navController: NavController) {
-    navController.navigate(route)
+    navController.navigate(ROUTE)
   }
 }
diff --git a/trending/src/main/kotlin/net/marcoromano/mooviez/trending/TrendingScreen.kt b/trending/src/main/kotlin/net/marcoromano/mooviez/trending/TrendingScreen.kt
@@ -40,10 +40,7 @@ public fun TrendingScreen(
 @OptIn(ExperimentalMaterial3Api::class)
 @Inject
 @Composable
-private fun TrendingScreen(
-  pager: Flow<PagingData<Movie>>,
-  navToDetail: (id: Long) -> Unit,
-) {
+private fun TrendingScreen(pager: Flow<PagingData<Movie>>, navToDetail: (id: Long) -> Unit) {
   val behavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
   Scaffold(
     modifier = Modifier.nestedScroll(behavior.nestedScrollConnection),

diff --git a/trending/src/main/kotlin/net/marcoromano/mooviez/trending/TrendingViewModel.kt b/trending/src/main/kotlin/net/marcoromano/mooviez/trending/TrendingViewModel.kt
@@ -22,7 +22,8 @@ public class TrendingViewModel(
   @OptIn(ExperimentalPagingApi::class)
   internal val pager = Pager(
     config = PagingConfig(
-      pageSize = 20, // 20 comes from tmdb api docs
+      // 20 comes from tmdb api docs
+      pageSize = 20,
       enablePlaceholders = true,
     ),
     remoteMediator = Mediator(httpApi = httpApi, database = database),
@@ -41,10 +42,7 @@ private class Mediator(
   private val httpApi: HttpApi,
   private val database: Database,
 ) : RemoteMediator<Int, Movie>() {
-  override suspend fun load(
-    loadType: LoadType,
-    state: PagingState<Int, Movie>,
-  ): MediatorResult {
+  override suspend fun load(loadType: LoadType, state: PagingState<Int, Movie>): MediatorResult {
     return try {
       val loadPage: Long? = when (loadType) {
         LoadType.REFRESH -> null

diff --git a/trending/src/main/kotlin/net/marcoromano/mooviez/trending/widgets/trending/Movie.kt b/trending/src/main/kotlin/net/marcoromano/mooviez/trending/widgets/trending/Movie.kt
@@ -30,10 +30,7 @@ import net.marcoromano.mooviez.database.Movie
 import net.marcoromano.mooviez.widgets.UserScore
 
 @Composable
-internal fun Movie(
-  movie: Movie,
-  navToDetail: (id: Long) -> Unit,
-) {
+internal fun Movie(movie: Movie, navToDetail: (id: Long) -> Unit) {
   Column(
     modifier = Modifier
       .padding(8.dp)

diff --git a/widgets/src/main/kotlin/net/marcoromano/mooviez/widgets/UserScore.kt b/widgets/src/main/kotlin/net/marcoromano/mooviez/widgets/UserScore.kt
@@ -23,10 +23,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
 @Composable
-public fun UserScore(
-  modifier: Modifier = Modifier,
-  userScore: Int,
-) {
+public fun UserScore(modifier: Modifier = Modifier, userScore: Int) {
   val text = remember(userScore) {
     buildAnnotatedString {
       withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {