- Migrate to Kotlin 2.0

- Migrate to KSP2
- Add .kotlin folder to .gitignore
- Create a Network security config xml file
- Change the direct Datasource module call from App to the first feature loaded
- Implement Koin's Lazy Modules throughout the project so modules are instantiated in the background not afecting Initial Time To Display metric (ITTD)
- Replace Koin's single {} with singleOf() where possible to improve code conciseness and readability
- Replace StateFlow with SharedFlow so everytime a new value is emitted, it gets collected by the View through its internal caching (Replay) system
- Remove mutable lists from Cells so now they are confined to method scopes
- Turn Room into the Single Source Of Truth of the app (It is not finished since Paging is still not present but it will once I migrate the current UI to Compose so I can migrate to Paging Compose instead of implementing it now with XML and then having to migrate to Paging Compose)
- Finish migration to Mixed modularization (By Feature + By Layer: https://www.youtube.com/watch?v=16SwTvzDO0A) (I probably will adopt the "By Feature/Feature Module" only approach since the current approach does not adhere to Clean Architecture and I'm sensing it will get progressively bureaucratic/harder to maintain once/if this project scales and it might me valid to other projects as well)
- Refactor the way viewModelScope is told to check on its coroutines status
- Create a mapper to map ProfileState into ProfileUIState since there are fields in ProfileUIState that should not be accessible/visible by layers outside UI
- Create mutableSharedFlowOf extension function so there is no need to add the replay parameter everytime a MutableSharedFLow is needed
- Re-add inline and crossinline to runTaskOnBackground extension function so there is no memory waste
- Refactor ResultHandler1s handleResult() so State<*> is accessible through context
- Bump dependency version to newer ones
- Refactor code
- Implement the new way to reference the Compose Compiler
- Remove blank spaces from profile strings by using .trim() on them before being sent to the Github API

Author: caiodev

.gitignore

@@ -7,4 +7,5 @@
 /config
 /.gradle
 /.idea
+/.kotlin
 /local.properties

app/build.gradle

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlinx-serialization'
+    alias dep.plugins.androidApplication
+    alias dep.plugins.kotlinPlugin
+    alias dep.plugins.serialization
 }
 
 apply from: "$project.rootDir/flavors/flavors.gradle"
@@ -70,7 +70,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':modules:common:core') because 'Core Module'
-    implementation project(':modules:common:datasource:datasource') because 'Datasource Module'
     implementation project(':modules:common:ui:ui') because 'UI Module'
     implementation project(':modules:features:profile') because 'Profile Module'
 

app/src/main/AndroidManifest.xml

@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
-            android:name=".App"
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:localeConfig="@xml/locales_config" tools:targetApi="tiramisu"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme"
-            tools:ignore="AllowBackup">
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:ignore="AllowBackup"
+        tools:targetApi="tiramisu">
 
-        <profileable tools:targetApi="q" android:shell="true" />
+        <profileable
+            android:shell="true"
+            tools:targetApi="q" />
 
         <activity
-                android:name=".view.activity.ProfileListingActivity"
-                android:configChanges="uiMode"
-                android:exported="true">
+            android:name=".ui.profile.activity.ProfileListingActivity"
+            android:configChanges="uiMode"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/kotlin/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/App.kt

@@ -5,21 +5,20 @@ import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.disk.DiskCache
 import coil.memory.MemoryCache
-import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.di.datasource
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.di.profileModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
+import org.koin.core.lazyModules
 import org.koin.core.logger.Level
-import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.ui.R as UI
 
 class App : Application(), ImageLoaderFactory {
     override fun onCreate() {
         super.onCreate()
         startKoin {
             androidContext(this@App)
             androidLogger(Level.DEBUG)
-            modules(datasource, profileModule)
+            lazyModules(profileModule)
         }
     }
 
@@ -37,8 +36,8 @@ class App : Application(), ImageLoaderFactory {
                     .maxSizePercent(MEMORY_CACHE_CAP)
                     .build()
             }
-            .placeholder(UI.mipmap.ic_launcher)
-            .error(UI.mipmap.ic_launcher)
+            .placeholder(R.mipmap.ic_launcher)
+            .error(R.mipmap.ic_launcher)
             .build()
     }
 

modules/common/ui/ui/src/main/res/mipmap-anydpi/ic_launcher.xml renamed to app/src/main/res/mipmap-anydpi/ic_launcher.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="false" />
+</network-security-config>

modules/common/ui/ui/src/main/res/mipmap-anydpi/ic_launcher_round.xml renamed to app/src/main/res/mipmap-anydpi/ic_launcher_round.xml

@@ -1,6 +1,7 @@
 plugins {
     alias dep.plugins.androidApplication apply false
     alias dep.plugins.androidLibrary apply false
+    alias dep.plugins.composeCompiler apply false
     alias dep.plugins.detekt apply false
     alias dep.plugins.kotlinPlugin apply false
     alias dep.plugins.ksp apply false

modules/common/ui/ui/src/main/res/mipmap-hdpi/ic_launcher.webp renamed to app/src/main/res/mipmap-hdpi/ic_launcher.webp

@@ -9,46 +9,45 @@ targetSdk = '34'
 versionCode = '1'
 versionName = '1.0'
 
-appCompat = '1.7.0-beta01'
+appCompat = '1.7.0-rc01'
 
 chucker = '4.0.0'
 
 coil = '2.6.0'
 
 #Compose
 activity = '1.9.0'
-compiler = '1.5.11'
-composeCore = '1.7.0-alpha08'
-material3 = '1.3.0-alpha06'
+composeCore = '1.7.0-beta01'
+material3 = '1.3.0-beta01'
 runtimeTracingCompose = '1.0.0-beta01'
 
 coroutines = '1.8.0'
 
 dataStore = '1.1.1'
 
-gradle = '8.4.0'
+gradle = '8.4.1'
 
-koin = '3.5.6'
+koin = '3.6.0-Beta4'
 
-kotlin = '1.9.23'
+kotlin = '2.0.0'
 
-ksp = '1.9.23-1.0.19'
+ksp = '2.0.0-1.0.21'
 
 ktor = '2.3.10'
 
 ktxCore = '1.13.1'
 
-lifecycle = '2.8.0-rc01'
+lifecycle = '2.8.0'
 
 materialDesign = '1.12.0'
 
 #Paging
-paging = '3.3.0-rc01'
+paging = '3.3.0'
 
 #Quality/Performance
 detekt = '1.23.6'
 ktlint = '1.2.1'
-ktlintPlugin = '12.1.0'
+ktlintPlugin = '12.1.1'
 leakCanary = '2.14'
 runtimeTracing = '1.3.0-alpha02'
 
@@ -62,12 +61,12 @@ recyclerView = '1.3.2'
 
 archTest = '2.2.0'
 jacoco = '0.8.12'
-junit = '1.2.0-alpha04'
+junit = '1.2.0-beta01'
 junit5 = '5.11.0-M1'
-mockkVersion = '1.13.10'
+mockk = '1.13.10'
 robolectric = '4.11.1'
-testCore = '1.6.0-alpha06'
-testRunner = '1.6.0-alpha07'
+testCore = '1.6.0-beta01'
+testRunner = '1.6.0-beta01'
 
 ##### Libraries #####
 
@@ -108,7 +107,10 @@ ktxCore = { group = "androidx.core", name = "core-ktx", version.ref = "ktxCore"
 
 preferencesDataStore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "dataStore" }
 
-koin = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
+koinAndroid = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
+koinCompose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
+koinCore = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
+koinCoroutines = { group = "io.insert-koin", name = "koin-core-coroutines", version.ref = "koin" }
 
 leakCanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakCanary" }
 
@@ -147,7 +149,7 @@ junit5Api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.r
 junit5Engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit5" }
 
 koinTest = { group = "io.insert-koin", name = "koin-android-test", version.ref = "koin" }
-mockk = { group = "io.mockk", name = "mockk", version.ref = "mockkVersion" }
+mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
 robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
 
 # Instrumented/UI #
@@ -161,8 +163,8 @@ junitAndroid = { group = "androidx.test.ext", name = "junit", version.ref = "jun
 junitKtx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "junit" }
 
 #MockK
-mockkAgent = { group = "io.mockk", name = "mockk-agent", version.ref = "mockkVersion" }
-mockkAndroid = { group = "io.mockk", name = "mockk-android", version.ref = "mockkVersion" }
+mockkAgent = { group = "io.mockk", name = "mockk-agent", version.ref = "mockk" }
+mockkAndroid = { group = "io.mockk", name = "mockk-android", version.ref = "mockk" }
 
 #TestCore
 archTest = { group = "androidx.arch.core", name = "core-testing", version.ref = "archTest" }
@@ -174,6 +176,7 @@ testRunner = { group = "androidx.test", name = "runner", version.ref = "testRunn
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "gradle" }
 androidLibrary = { id = "com.android.library", version.ref = "gradle" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotlinPlugin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
@@ -209,6 +212,13 @@ compose = [
     "uiToolingPreviewCompose"
 ]
 
+koin = [
+    "koinAndroid",
+    "koinCompose",
+    "koinCore",
+    "koinCoroutines"
+]
+
 lifecycle = [
     "lifecycleRuntimeKtx",
     "lifecycleViewmodelKtx"

modules/common/ui/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp renamed to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp

@@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
+    alias dep.plugins.androidLibrary
+    alias dep.plugins.kotlinPlugin
 }
 
 apply from: "$project.rootDir/flavors/flavors.gradle"
@@ -48,5 +48,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation project(':modules:common:testing:jvm') because 'JVM Testing Module'
-    api dep.koin
+    api dep.bundles.koin
 }

modules/common/ui/ui/src/main/res/mipmap-hdpi/ic_launcher_round.webp renamed to app/src/main/res/mipmap-hdpi/ic_launcher_round.webp

@@ -1,8 +1,11 @@
 package githubprofilesearcher.caiodev.com.br.githubprofilesearcher.core.types.number
 
 private const val DEFAULT_INTEGER = 0
+private const val ONE = 1
 private const val DEFAULT_LONG = 0L
 
 fun defaultInteger(): Int = DEFAULT_INTEGER
 
+fun one(): Int = ONE
+
 fun defaultLong(): Long = DEFAULT_LONG

modules/common/ui/ui/src/main/res/mipmap-mdpi/ic_launcher.webp renamed to app/src/main/res/mipmap-mdpi/ic_launcher.webp

@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id 'com.android.library'
-    id 'com.google.devtools.ksp'
-    id 'kotlin-android'
-    id 'kotlinx-serialization'
+    alias dep.plugins.androidLibrary
+    alias dep.plugins.kotlinPlugin
+    alias dep.plugins.ksp
+    alias dep.plugins.serialization
 }
 
 apply from: "$project.rootDir/flavors/flavors.gradle"

modules/common/ui/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp renamed to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp

@@ -9,19 +9,22 @@ import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.fet
 import kotlinx.coroutines.Dispatchers
 import okhttp3.Interceptor
 import org.koin.android.ext.koin.androidContext
-import org.koin.dsl.module
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.bind
+import org.koin.dsl.lazyModule
+import kotlin.coroutines.CoroutineContext
 
 val datasource =
-    module {
-        single<Database> {
+    lazyModule {
+        single {
             Room.databaseBuilder(
                 androidContext(),
                 AppDatabase::class.java,
                 AppDatabase.DATABASE_NAME,
             ).build()
-        }
-        single<Interceptor> { ChuckerInterceptor(androidContext()) }
+        } bind Database::class
+        singleOf(::ChuckerInterceptor) bind Interceptor::class
         single { newInstance(interceptor = get()) }
-        single { RemoteFetcher() }
-        single { Dispatchers.IO }
+        singleOf(::RemoteFetcher)
+        single { Dispatchers.IO } bind CoroutineContext::class
     }

modules/common/ui/ui/src/main/res/mipmap-mdpi/ic_launcher_round.webp renamed to app/src/main/res/mipmap-mdpi/ic_launcher_round.webp

@@ -20,7 +20,7 @@ inline fun <reified S, T> State<*>.handleResult(
     crossinline onFailure: (error: Error) -> T,
 ): T =
     if (this is Success<*>) {
-        onSuccess(ValueCasting.castTo<S>(this.data))
+        onSuccess(ValueCasting.castTo<S>(data))
     } else {
         onFailure(handleError(ValueCasting.castTo(this)))
     }
@@ -29,7 +29,7 @@ inline fun <reified S, T> State<*>.handleResult(
 internal fun handleError(errorState: ErrorState?): Error {
     when (errorState) {
         ClientSide -> Core.string.client_side
-        Connect, UnknownHost, SocketTimeout -> Core.string.unknown_host_and_socket_timeout
+        Connect, SocketTimeout, UnknownHost -> Core.string.unknown_host_and_socket_timeout
         ResultLimitReached -> Core.string.limit_of_profile_results
         SearchQuotaReached -> Core.string.query_limit
         ServerSide -> Core.string.server_side

modules/common/ui/ui/src/main/res/mipmap-xhdpi/ic_launcher.webp renamed to app/src/main/res/mipmap-xhdpi/ic_launcher.webp

@@ -1,6 +1,8 @@
 package githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.fetchers.local.database.features.profile.dao
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Upsert
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.fetchers.local.database.features.profile.entity.UserEntity
@@ -10,6 +12,9 @@ interface User {
     @Query("SELECT * " + "FROM User LIMIT 20")
     suspend fun get(): List<UserEntity>?
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(profileList: List<UserEntity>)
+
     @Upsert
     suspend fun upsert(profileList: List<UserEntity>)
 

modules/common/ui/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp renamed to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp

@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id 'com.android.library'
-    id 'com.google.devtools.ksp'
-    id 'kotlin-android'
-    id 'kotlinx-serialization'
+    alias dep.plugins.androidLibrary
+    alias dep.plugins.kotlinPlugin
+    alias dep.plugins.ksp
+    alias dep.plugins.serialization
 }
 
 apply from: "$project.rootDir/flavors/flavors.gradle"