Update Detekt configuration and add formatting plugin

.github/actions/java/action.yml

@@ -5,9 +5,9 @@ runs:
   using: "composite"
   steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 17
+    - name: set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: "17"
+        java-version: "21"
         distribution: "temurin"
         cache: gradle

.github/workflows/linter.yaml

@@ -0,0 +1,21 @@
+name: Linter
+
+on:
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  linter:
+    runs-on: ubuntu-latest
+    env:
+      MOVIE_DB_API_TOKEN: ${{ secrets.MOVIE_DB_API_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: ./.github/actions/java
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Run Detekt
+        run: ./gradlew detekt

androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/CustomApplication.kt

@@ -2,8 +2,8 @@ package com.codandotv.streamplayerapp.presentation
 
 import android.app.Application
 import com.codandotv.streamplayerapp.core.shared.ui.R
-import com.codandotv.streamplayerapp.core_background_work.worker.WorkScheduler
-import com.codandotv.streamplayerapp.di.streamPlayerApplication
+import com.codandotv.streamplayerapp.core.background.work.WorkScheduler
+import com.codandotv.streamplayerapp.composeApp.presentation.di.streamPlayerApplication
 import com.mmk.kmpnotifier.notification.NotifierManager
 import com.mmk.kmpnotifier.notification.configuration.NotificationPlatformConfiguration
 import org.koin.android.ext.koin.androidContext

androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/MainActivity.kt

@@ -3,7 +3,7 @@ package com.codandotv.streamplayerapp.presentation
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import com.codandotv.streamplayerapp.StreamPlayerApp
+import com.codandotv.streamplayerapp.composeApp.StreamPlayerApp
 import com.google.firebase.Firebase
 import com.google.firebase.initialize
 import com.mmk.kmpnotifier.permission.permissionUtil

build-logic/src/main/java/com.streamplayer.detekt.gradle.kts

@@ -1,16 +1,24 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+
 plugins {
     id("io.gitlab.arturbosch.detekt")
 }
 
+val libs = the<LibrariesForLibs>()
+
 detekt {
     config.setFrom(file(project.rootDir.path.plus("/config/detekt/detekt.yml")))
     buildUponDefaultConfig = true
 
     source.from(
-        "src/main/java",
-        "src/test/java",
-        "src/main/kotlin",
-        "src/test/kotlin"
+        files(
+            "src/commonMain/kotlin",
+            "src/androidMain/kotlin",
+            "src/iosMain/kotlin"
+        )
     )
 
+    dependencies {
+        detektPlugins(libs.detekt.formatting)
+    }
 }

composeApp/src/androidMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.android.kt → composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.android.kt

@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue

composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/StreamPlayerApp.kt → composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/StreamPlayerApp.kt

@@ -1,9 +1,9 @@
-package com.codandotv.streamplayerapp
+package com.codandotv.streamplayerapp.composeApp
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.compose.rememberNavController
-import com.codandotv.streamplayerapp.core_shared_ui.theme.StreamPlayerTheme
-import com.codandotv.streamplayerapp.navigation.NavigationGraph
+import com.codandotv.streamplayerapp.composeApp.presentation.navigation.NavigationGraph
+import com.codandotv.streamplayerapp.core.shared.ui.theme.StreamPlayerTheme
 
 @Composable
 fun StreamPlayerApp() {

composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/SyncBridge.kt → composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/SyncBridge.kt

@@ -1,16 +1,14 @@
-package com.codandotv.streamplayerapp
+package com.codandotv.streamplayerapp.composeApp.presentation
 
-import com.codandotv.streamplayerapp.core_background_work.SyncManager
+import com.codandotv.streamplayerapp.core.background.work.SyncManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.koin.core.context.startKoin
-import org.koin.dsl.module
-import org.koin.mp.KoinPlatform.getKoin
+import org.koin.mp.KoinPlatform
 
 object SyncBridge {
     suspend fun syncData() {
-        getKoin().get<SyncManager>().syncData()
+        KoinPlatform.getKoin().get<SyncManager>().syncData()
     }
 
     fun syncData(completionHandler: () -> Unit) {

composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.kt → composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.kt

@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/di/AppModule.kt → composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/AppModule.kt

@@ -1,14 +1,13 @@
-package com.codandotv.streamplayerapp.di
+package com.codandotv.streamplayerapp.composeApp.presentation.di
 
-import com.codandotv.streamplayerapp.core_background_work.di.SyncModule
-import com.codandotv.streamplayerapp.core_local_storage.di.LocalStorageModule
-import com.codandotv.streamplayerapp.core_networking.di.NetworkModule
-import com.codandotv.streamplayerapp.core_shared.qualifier.QualifierDispatcherIO
-import com.codandotv.streamplayerapp.feature_list_streams.list.di.ListStreamModule
-import com.codandotv.streamplayerapp.feature_news.di.NewsScreenModule
-import com.codandotv.streamplayerapp.feature_search.di.SearchModule
-import com.codandotv.streamplayerapp.feature_search.presentation.widgets.StreamsError
-import com.codandotv.streamplayerapp.profile.di.ProfilePickerStreamModule
+import com.codandotv.streamplayerapp.core.background.work.di.SyncModule
+import com.codandotv.streamplayerapp.core.local.storage.di.LocalStorageModule
+import com.codandotv.streamplayerapp.core.networking.di.NetworkModule
+import com.codandotv.streamplayerapp.core.shared.qualifier.QualifierDispatcherIO
+import com.codandotv.streamplayerapp.feature.liststreams.list.di.ListStreamModule
+import com.codandotv.streamplayerapp.feature.news.di.NewsScreenModule
+import com.codandotv.streamplayerapp.feature.profile.di.ProfilePickerStreamModule
+import com.codandotv.streamplayerapp.feature.search.di.SearchModule
 import io.kotzilla.generated.monitoring
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
@@ -48,4 +47,3 @@ fun streamPlayerApplication(platformBlock: KoinApplication.() -> Unit): KoinAppl
         }
     }
 }
-

composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt → composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/NavigationGraph.kt

@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.navigation
+@file:Suppress("MagicNumber")
+
+package com.codandotv.streamplayerapp.composeApp.presentation.navigation
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -14,15 +16,14 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes
-import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.navigation.listStreamsNavGraph
-import com.codandotv.streamplayerapp.profile.presentation.navigation.profilePickerStreamNavGraph
-import com.codandotv.streamplayerapp.presentation.navigation.splashNavGraph
-import com.codandotv.streamplayerapp.feature_detail.presentation.navigation.detailStreamNavGraph
-import com.codandotv.streamplayerapp.feature_news.presentation.navigation.newsStreamNavGraph
-import com.codandotv.streamplayerapp.feature_search.presentation.navigation.searchStreamsNavGraph
+import com.codandotv.streamplayerapp.core.navigation.bottomnavigation.StreamPlayerBottomNavigation
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes
+import com.codandotv.streamplayerapp.feature.detail.presentation.navigation.detailStreamNavGraph
+import com.codandotv.streamplayerapp.feature.liststreams.list.presentation.navigation.listStreamsNavGraph
+import com.codandotv.streamplayerapp.feature.news.presentation.navigation.newsStreamNavGraph
+import com.codandotv.streamplayerapp.feature.profile.presentation.navigation.profilePickerStreamNavGraph
+import com.codandotv.streamplayerapp.feature.search.presentation.navigation.searchStreamsNavGraph
 
 @Composable
 fun NavigationGraph(navController: NavHostController) {

composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/navigation/SplashNavigation.kt → composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/SplashNavigation.kt

@@ -1,11 +1,11 @@
-package com.codandotv.streamplayerapp.presentation.navigation
+package com.codandotv.streamplayerapp.composeApp.presentation.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes
-import com.codandotv.streamplayerapp.presentation.screens.SplashScreen
+import com.codandotv.streamplayerapp.composeApp.presentation.screens.SplashScreen
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes
 
 fun NavGraphBuilder.splashNavGraph(navController: NavHostController) {
     composable(Routes.Splash) {

composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/screens/SplashScreen.kt → composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/screens/SplashScreen.kt

@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.presentation.screens
+package com.codandotv.streamplayerapp.composeApp.presentation.screens
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -15,7 +15,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.codandotv.streamplayerapp.presentation.components.LottieComponent
+import com.codandotv.streamplayerapp.composeApp.presentation.components.LottieComponent
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import streamplayerapp_kmp.composeapp.generated.resources.Res
 

composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/MainViewController.kt → composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/MainViewController.kt

@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp
+package com.codandotv.streamplayerapp.composeApp
 
 import androidx.compose.ui.window.ComposeUIViewController
 

composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.ios.kt → composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.ios.kt

@@ -1,11 +1,10 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.UIKitView
 import org.koin.mp.KoinPlatform
 import platform.UIKit.UIColor
-import platform.UIKit.UIView
 
 @Composable
 actual fun LottieComponent(
@@ -18,7 +17,7 @@ actual fun LottieComponent(
     UIKitView(
         modifier = modifier,
         factory = {
-            val view = provider.provideLottieView(jsonString,onAnimationFinished)
+            val view = provider.provideLottieView(jsonString, onAnimationFinished)
             view.backgroundColor = UIColor.blackColor()
             view
         }

composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieViewProvider.kt → composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieViewProvider.kt

@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import platform.UIKit.UIView
 
 interface LottieViewProvider {
-    fun provideLottieView(lottieAnimationJson: String, onAnimationFinish : () -> Unit) : UIView
+    fun provideLottieView(lottieAnimationJson: String, onAnimationFinish: () -> Unit): UIView
 }

composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/di/KoinIosHelper.kt → composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/KoinIosHelper.kt

@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.di
+package com.codandotv.streamplayerapp.composeApp.presentation.di
 
-import com.codandotv.streamplayerapp.presentation.components.LottieViewProvider
+import com.codandotv.streamplayerapp.composeApp.presentation.components.LottieViewProvider
 import org.koin.dsl.module
 
 class KoinIosHelper {