refactor dependencies

app/build.gradle

@@ -1,6 +1,5 @@
-import com.owenlejeune.tvtime.buildsrc.Dependencies
-import com.owenlejeune.tvtime.buildsrc.Versions
 import com.owenlejeune.tvtime.buildsrc.Config
+import com.owenlejeune.tvtime.buildsrc.Versions
 
 plugins {
     id 'com.android.application'
@@ -55,36 +54,36 @@ android {
 
 dependencies {
 
-    implementation Dependencies.AndroidX.ktxCore
-    implementation Dependencies.AndroidX.paging
+    implementation "androidx.core:core-ktx:${Versions.core_ktx}"
+    implementation "androidx.paging:paging-common-ktx:${Versions.paging}"
 
-    implementation Dependencies.Compose.ui
-    implementation Dependencies.Compose.material3
-    implementation Dependencies.Compose.material
-    implementation Dependencies.Compose.uiToolingPreview
-    implementation Dependencies.Compose.activity
-    implementation Dependencies.Compose.accompanistSystemUi
-    implementation Dependencies.Compose.navigation
-    implementation Dependencies.Compose.paging
+    implementation "androidx.compose.ui:ui:${Versions.compose}"
+    implementation "androidx.compose.material3:material3:${Versions.compose_material3}"
+    implementation "androidx.compose.material:material:${Versions.compose}"
+    implementation "androidx.compose.ui:ui-tooling-preview:${Versions.compose}"
+    implementation "androidx.activity:activity-compose:${Versions.activity_compose}"
+    implementation "com.google.accompanist:accompanist-systemuicontroller:${Versions.compose_accompanist}"
+    implementation "androidx.navigation:navigation-compose:${Versions.compose_navigation}"
+    implementation "androidx.paging:paging-compose:${Versions.compose_paging}"
 
-    implementation Dependencies.Lifecycle.runtime
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle_runtime}"
 
-    implementation Dependencies.Network.retrofit
-    implementation Dependencies.Network.retrofitGson
-    implementation Dependencies.Network.gson
-    implementation Dependencies.Network.stetho
-    implementation Dependencies.Network.stethoOkHttp
+    implementation "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
+    implementation "com.squareup.retrofit2:converter-gson:${Versions.retrofit}"
+    implementation "com.google.code.gson:gson:${Versions.gson}"
+    implementation "com.facebook.stetho:stetho:${Versions.stetho}"
+    implementation "com.facebook.stetho:stetho-okhttp3:${Versions.stetho}"
 
-    implementation Dependencies.DI.koin
+    implementation "io.insert-koin:koin-android:${Versions.koin}"
 
-    implementation Dependencies.Coil.coil
+    implementation "io.coil-kt:coil-compose:${Versions.coil}"
 
     //Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
 
-    testImplementation Dependencies.Testing.junit
-    androidTestImplementation Dependencies.Testing.androidXJunit
-    androidTestImplementation Dependencies.Testing.espressoCore
-    androidTestImplementation Dependencies.Testing.composeJunit
-    debugImplementation Dependencies.Compose.uiTooling
+    testImplementation "junit:junit:${Versions.junit}"
+    androidTestImplementation "androidx.test.ext:junit:${Versions.androidx_junit}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:${Versions.espresso_core}"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:${Versions.compose}"
+    debugImplementation "androidx.compose.ui:ui-tooling:${Versions.compose}"
 }

build.gradle

@@ -1,13 +1,11 @@
-import com.owenlejeune.tvtime.buildsrc.Dependencies
-
 buildscript {
     repositories {
         google()
         mavenCentral()
 
         dependencies {
-            classpath Dependencies.BuildPlugins.kotlinGradle
-            classpath Dependencies.BuildPlugins.androidGradle
+            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+            classpath "com.android.tools.build:gradle:7.1.1"
         }
     }
 }

buildSrc/src/main/java/com/owenlejeune/tvtime/buildsrc/Dependencies.kt

@@ -1,56 +0,0 @@
-package com.owenlejeune.tvtime.buildsrc
-
-object Dependencies {
-
-    object AndroidX {
-        const val appCompat = "androidx.appcompat:appcompat:${Versions.androidx}"
-        const val ktxCore = "androidx.core:core-ktx:${Versions.core_ktx}"
-        const val paging = "androidx.paging:paging-common-ktx:${Versions.paging}"
-    }
-
-    object Compose {
-        const val material3 = "androidx.compose.material3:material3:${Versions.compose_material3}"
-        const val material = "androidx.compose.material:material:${Versions.compose}"
-        const val ui = "androidx.compose.ui:ui:${Versions.compose}"
-        const val uiToolingPreview = "androidx.compose.ui:ui-tooling-preview:${Versions.compose}"
-        const val uiTooling = "androidx.compose.ui:ui-tooling:${Versions.compose}"
-        const val activity = "androidx.activity:activity-compose:${Versions.activity_compose}"
-        const val accompanistSystemUi = "com.google.accompanist:accompanist-systemuicontroller:${Versions.compose_accompanist}"
-        const val navigation = "androidx.navigation:navigation-compose:${Versions.compose_navigation}"
-        const val paging = "androidx.paging:paging-compose:${Versions.compose_paging}"
-    }
-
-    object Lifecycle {
-        const val runtime = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle_runtime}"
-    }
-
-    object Testing {
-        const val junit = "junit:junit:${Versions.junit}"
-        const val composeJunit = "androidx.compose.ui:ui-test-junit4:${Versions.compose}"
-        const val androidXJunit = "androidx.test.ext:junit:${Versions.androidx_junit}"
-        const val espressoCore = "androidx.test.espresso:espresso-core:${Versions.espresso_core}"
-    }
-
-    object BuildPlugins {
-        const val kotlin = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}"
-        const val androidGradle = "com.android.tools.build:gradle:${Versions.gradle}"
-        const val kotlinGradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
-        const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:${Versions.kotlin}"
-    }
-
-    object Network {
-        const val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
-        const val retrofitGson = "com.squareup.retrofit2:converter-gson:${Versions.retrofit}"
-        const val gson = "com.google.code.gson:gson:${Versions.gson}"
-        const val stetho = "com.facebook.stetho:stetho:${Versions.stetho}"
-        const val stethoOkHttp = "com.facebook.stetho:stetho-okhttp3:${Versions.stetho}"
-    }
-
-    object DI {
-        const val koin = "io.insert-koin:koin-android:${Versions.koin}"
-    }
-
-    object Coil {
-        const val coil = "io.coil-kt:coil-compose:${Versions.coil}"
-    }
-}

buildSrc/src/main/java/com/owenlejeune/tvtime/buildsrc/Versions.kt

@@ -6,7 +6,7 @@ object Versions {
     const val compose_material3 = "1.0.0-alpha04"
     const val compose_accompanist = "0.22.1-rc"
     const val compose_navigation = "2.4.0"
-    const val compose_paging = "1.0.0-alpha04"
+    const val compose_paging = "1.0.0-alpha14"
     const val gradle = "7.1.0"
     const val junit = "4.13.2"
     const val androidx_junit = "1.1.3"