- Add a workaround for mislaunched CancellationExceptions silently killing Coroutines {

    https://betterprogramming.pub/the-silent-killer-thats-crashing-your-coroutines-9171d1e8f79b
    Kotlin/kotlinx.coroutines#3658 (comment)
    https://kotlinlang.org/docs/exception-handling.html
}

- Create the "Neutral" state for when CancellationExceptions are wrongfully launched (Refer to the above links to know when and how that happens)

- Add an Architecture that uses both By Layer and By Feature separation of concerns (https://www.youtube.com/watch?v=16SwTvzDO0A)

- Refactor dependencies between modules

- Remove datasource dependency from midfield (a.k.a domain)

- Create specific feature modules inside each base layer (ui, midfield (domain) and datasource (data/model))

- Bump dependency versions to newer ones

- Turn common dependencies into bundles

- Replace multiple dependency references with Bundles

- Refactor code

- Remove all occurences of suspend functions being executed using runBlocking from the project

- Remove runBlocking from the project

- Remove fundamental features (Pagination, Upper views management etc...) (Temporarily until I implement them back, but in Compose)

- Create specific modules for both JVM and Integrated/UI tests (The old way, JVM tests had access to Integrated/UI test dependencies and vice-versa, now that's sorted out)

- Split Remote datasource models from Local datasource models (Then, there would be only one class having both kotlin.serialization and Room annotations)

- Create mapping from Remote datasource model to Local datasource model (Entity)

- Create mapping from Local datasource model to clean model (No external dependencies referenced) (Plain Old Kotlin Object)

KNOWN ISSUES:

1- There's no pagination anymore (It will be re-implemented in the future using Paging Compose)
2- There may be UI inconsistencies when CancellationExceptions are launched intentionally or not (Will be addressed in the future)

FEATURES:

No new features have been introduced

Author: caiodev

app/build.gradle

@@ -70,8 +70,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':modules:common:core') because 'Core Module'
-    implementation project(':modules:common:datasource') because 'Datasource Module'
-    implementation project(':modules:common:ui') because 'UI 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'
 
     debugImplementation dep.leakCanary

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
             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"

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

@@ -5,8 +5,8 @@ import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.disk.DiskCache
 import coil.memory.MemoryCache
-import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.di.global
-import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.model.di.userProfileViewModel
+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
@@ -19,7 +19,7 @@ class App : Application(), ImageLoaderFactory {
         startKoin {
             androidContext(this@App)
             androidLogger(Level.DEBUG)
-            modules(global, userProfileViewModel)
+            modules(datasource, profileModule)
         }
     }
 

app/src/main/res/xml/locales_config.xml

@@ -0,0 +1,5 @@
+<?xml version ="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" />
+    <locale android:name="pt-BR" />
+</locale-config>

build.gradle

@@ -24,4 +24,4 @@ allprojects {
 
 tasks.register("clean", Delete) {
     delete layout.buildDirectory
-}
+}

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ targetSdk = '34'
 versionCode = '1'
 versionName = '1.0'
 
-appCompat = '1.7.0-alpha03'
+appCompat = '1.7.0-beta01'
 
 chucker = '4.0.0'
 
@@ -18,15 +18,15 @@ coil = '2.6.0'
 #Compose
 activity = '1.9.0'
 compiler = '1.5.11'
-composeCore = '1.7.0-alpha07'
-material3 = '1.3.0-alpha05'
+composeCore = '1.7.0-alpha08'
+material3 = '1.3.0-alpha06'
 runtimeTracingCompose = '1.0.0-beta01'
 
 coroutines = '1.8.0'
 
-dataStore = '1.1.0'
+dataStore = '1.1.1'
 
-gradle = '8.3.2'
+gradle = '8.4.0'
 
 koin = '3.5.6'
 
@@ -36,11 +36,14 @@ ksp = '1.9.23-1.0.19'
 
 ktor = '2.3.10'
 
-ktxCore = '1.13.0'
+ktxCore = '1.13.1'
 
-lifecycle = '2.8.0-beta01'
+lifecycle = '2.8.0-rc01'
 
-materialDesign = '1.11.0'
+materialDesign = '1.12.0'
+
+#Paging
+paging = '3.3.0-rc01'
 
 #Quality/Performance
 detekt = '1.23.6'
@@ -55,16 +58,16 @@ room = '2.6.1'
 constraintLayout = '2.1.4'
 recyclerView = '1.3.2'
 
-# Test dependency versions #
+# Test Dependencies #
 
 archTest = '2.2.0'
-testCore = '1.6.0-alpha05'
 jacoco = '0.8.12'
-junit = '1.2.0-alpha03'
-kotest = '5.8.1'
+junit = '1.2.0-alpha04'
+junit5 = '5.11.0-M1'
 mockkVersion = '1.13.10'
 robolectric = '4.11.1'
-testRunner = '1.6.0-alpha06'
+testCore = '1.6.0-alpha06'
+testRunner = '1.6.0-alpha07'
 
 ##### Libraries #####
 
@@ -115,6 +118,10 @@ lifecycleViewmodelKtx = { group = "androidx.lifecycle", name = "lifecycle-viewmo
 
 materialDesign = { group = "com.google.android.material", name = "material", version.ref = "materialDesign" }
 
+#Paging
+pagingCompose = { group = "androidx.paging", name = "paging-compose", version.ref = "paging" }
+pagingRuntimeKtx = { group = "androidx.paging", name = "paging-runtime", version.ref = "paging" }
+
 #Room
 room = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
 roomCompiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
@@ -128,23 +135,19 @@ recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version
 
 ##### Testing Section #####
 
+# Common #
+
 coroutinesTest = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
+jacoco = { group = "org.jacoco", name = "org.jacoco.core", version.ref = "jacoco" }
 
 # JVM #
 
-jacoco = { group = "org.jacoco", name = "org.jacoco.core", version.ref = "jacoco" }
+#JUnit5
+junit5Api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit5" }
+junit5Engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit5" }
 
 koinTest = { group = "io.insert-koin", name = "koin-android-test", version.ref = "koin" }
-
-#Kotest
-kotestCore = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
-kotestProperty = { group = "io.kotest", name = "kotest-property", version.ref = "kotest" }
-kotestRunner = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotest" }
-
-#MockK
-mockkAgent = { group = "io.mockk", name = "mockk-agent", version.ref = "mockkVersion" }
-mockkAndroid = { group = "io.mockk", name = "mockk-android", version.ref = "mockkVersion" }
-
+mockk = { group = "io.mockk", name = "mockk", version.ref = "mockkVersion" }
 robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
 
 # Instrumented/UI #
@@ -154,9 +157,13 @@ composeTestJUnit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", ve
 composeTestManifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "composeCore" }
 
 #JUnit
-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
+junitAndroid = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
 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" }
+
 #TestCore
 archTest = { group = "androidx.arch.core", name = "core-testing", version.ref = "archTest" }
 testCore = { group = "androidx.test", name = "core-ktx", version.ref = "testCore" }
@@ -207,6 +214,11 @@ lifecycle = [
     "lifecycleViewmodelKtx"
 ]
 
+paging = [
+    "pagingCompose",
+    "pagingRuntimeKtx"
+]
+
 room = [
     "room",
     "roomKtx"
@@ -219,24 +231,26 @@ views = [
 
 # Test Bundles #
 
-junit = [
-    "junit",
-    "junitKtx"
-]
-
-kotest = [
-    "kotestCore",
-    "kotestProperty",
-    "kotestRunner"
+common = [
+    "coroutinesTest",
+    "jacoco"
 ]
 
-mockk = [
-    "mockkAgent",
-    "mockkAndroid"
-]
-
-testCore = [
+instrumented = [
     "archTest",
+    "composeTestJUnit4",
+    "composeTestManifest",
+    "junitAndroid",
+    "junitKtx",
+    "mockkAgent",
+    "mockkAndroid",
     "testCore",
     "testRunner"
+]
+
+jvm = [
+    "junit5Engine",
+    "koinTest",
+    "mockk",
+    "robolectric"
 ]

modules/common/core/build.gradle

@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlinx-serialization'
 }
 
 apply from: "$project.rootDir/flavors/flavors.gradle"
@@ -13,7 +12,6 @@ android {
     defaultConfig {
         minSdkVersion dep.versions.minSdk.get()
         targetSdkVersion dep.versions.targetSdk.get()
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
@@ -49,9 +47,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation project(':modules:common:testing') because 'Android Testing Module'
-    testImplementation project(':modules:common:testing') because 'JVM Testing Module'
-
-    api dep.ktxCore
-    api dep.bundles.lifecycle
+    testImplementation project(':modules:common:testing:jvm') because 'JVM Testing Module'
+    api dep.koin
 }

modules/common/core/src/main/java/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/core/extensions/ViewModel.kt

@@ -2,19 +2,21 @@ package githubprofilesearcher.caiodev.com.br.githubprofilesearcher.core
 
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.core.cast.ValueCasting
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.core.types.number.defaultInteger
-import io.kotest.core.spec.style.FunSpec
-import io.kotest.matchers.shouldBe
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
-internal class ValueCastingTest : FunSpec({
-    test("castTo should return a valid value") {
+internal class ValueCastingTest {
+    @Test
+    fun `castToNullable should return a valid value`() {
         ValueCasting.castTo<List<Int>>(arrayListOf(defaultInteger()))
             ?.first()
-            .shouldBe(defaultInteger())
+            ?.apply { assertEquals(defaultInteger(), this) }
     }
 
-    test("castToNonNullable should return a valid value") {
+    @Test
+    fun `castToNonNullable should return a valid value`() {
         ValueCasting.castToNonNullable<List<Int>>(arrayListOf(defaultInteger()))
             .first()
-            .shouldBe(defaultInteger())
+            .apply { assertEquals(defaultInteger(), this) }
     }
-})
+}

modules/common/core/src/main/java/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/core/cast/ValueCasting.kt renamed to modules/common/core/src/main/kotlin/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/core/cast/ValueCasting.kt

@@ -69,11 +69,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':modules:common:core') because 'Core Module'
-    androidTestImplementation project(':modules:common:testing') because 'Android Testing Module'
-    testImplementation project(':modules:common:testing') because 'JVM Testing Module'
+    androidTestImplementation project(':modules:common:testing:instrumented') because 'Android Testing Module'
+    testImplementation project(':modules:common:testing:jvm') because 'JVM Testing Module'
 
     api dep.bundles.apiConnection
-    api dep.koin
 
     //Logging
     debugImplementation dep.debugChucker
@@ -82,6 +81,6 @@ dependencies {
     api dep.preferencesDataStore
 
     //Room
-    implementation dep.bundles.room
+    api dep.bundles.room
     ksp dep.roomCompiler
 }

modules/common/core/src/main/java/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/core/contracts/OnItemClicked.kt renamed to modules/common/core/src/main/kotlin/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/core/contracts/OnItemClicked.kt

@@ -7,10 +7,11 @@ import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.fet
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.fetchers.remote.RemoteFetcher
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.fetchers.remote.api.newInstance
 import kotlinx.coroutines.Dispatchers
+import okhttp3.Interceptor
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 
-val global =
+val datasource =
     module {
         single<Database> {
             Room.databaseBuilder(
@@ -19,7 +20,7 @@ val global =
                 AppDatabase.DATABASE_NAME,
             ).build()
         }
-        single { ChuckerInterceptor(androidContext()) }
+        single<Interceptor> { ChuckerInterceptor(androidContext()) }
         single { newInstance(interceptor = get()) }
         single { RemoteFetcher() }
         single { Dispatchers.IO }

modules/common/core/src/main/java/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/core/types/bool/Boolean.kt renamed to modules/common/core/src/main/kotlin/githubprofilesearcher/caiodev/com/br/githubprofilesearcher/core/types/bool/Boolean.kt

@@ -1,7 +1,6 @@
-package githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.cell
+package githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.fetchers.handler
 
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.core.cast.ValueCasting
-import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.cell.contracts.ICell
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.states.ClientSide
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.states.Connect
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.states.Error
@@ -16,26 +15,25 @@ import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.sta
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.datasource.states.UnknownHost
 import githubprofilesearcher.caiodev.com.br.githubprofilesearcher.core.R as Core
 
-inline fun <reified T> ICell.handleResult(
-    value: State<*>,
-    onSuccess: (success: Success<*>) -> T,
+inline fun <reified S, T> State<*>.handleResult(
+    onSuccess: (success: S?) -> T,
     crossinline onFailure: (error: Error) -> T,
 ): T =
-    if (value is Success<*>) {
-        onSuccess(value)
+    if (this is Success<*>) {
+        onSuccess(ValueCasting.castTo<S>(this.data))
     } else {
-        onFailure(handleError(ValueCasting.castTo(value)))
+        onFailure(handleError(ValueCasting.castTo(this)))
     }
 
 @PublishedApi
 internal fun handleError(errorState: ErrorState?): Error {
     when (errorState) {
-        UnknownHost, SocketTimeout, Connect -> Core.string.unknown_host_and_socket_timeout
-        SSLHandshake -> Core.string.ssl_handshake
         ClientSide -> Core.string.client_side
-        ServerSide -> Core.string.server_side
-        SearchQuotaReached -> Core.string.query_limit
+        Connect, UnknownHost, SocketTimeout -> Core.string.unknown_host_and_socket_timeout
         ResultLimitReached -> Core.string.limit_of_profile_results
+        SearchQuotaReached -> Core.string.query_limit
+        ServerSide -> Core.string.server_side
+        SSLHandshake -> Core.string.ssl_handshake
         else -> Core.string.generic
     }.apply { return Error(error = this) }
 }