Tests are compiling and all test dependencies are included for test s…

…ource sets

android/billing/build.gradle.kts

@@ -17,4 +17,7 @@ dependencies {
     implementation(project(":core:ui"))
 
     Billing(api = true)
-}
+}
+android {
+    namespace = "com.ivy.billing"
+}

android/billing/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.billing" />
+<manifest />

android/common/build.gradle.kts

@@ -15,4 +15,7 @@ dependencies {
     Hilt()
     AppCompat(api = true)
     Testing()
-}
+}
+android {
+    namespace = "com.ivy.android.common"
+}

android/common/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.android.common" />
+<manifest />

android/file-system/build.gradle.kts

@@ -15,4 +15,7 @@ dependencies {
     implementation(project(":common:main"))
     implementation(project(":android:common"))
     Testing()
-}
+}
+android {
+    namespace = "com.ivy.file"
+}

android/file-system/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.file" />
+<manifest />

android/notifications/build.gradle.kts

@@ -16,4 +16,7 @@ dependencies {
     implementation(project(":common:main"))
     implementation(project(":core:ui"))
     AndroidX(api = false)
-}
+}
+android {
+    namespace = "com.ivy.notifications"
+}

android/notifications/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.notifications" />
+<manifest />

android/notifications/src/main/java/com/ivy/notifications/NotificationService.kt

@@ -6,6 +6,7 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import com.ivy.resources.R
+import java.time.LocalDateTime
 
 class NotificationService(
     private val context: Context

app-locked/build.gradle.kts

@@ -15,4 +15,7 @@ dependencies {
     implementation(project(":design-system"))
     implementation(project(":core:ui"))
     implementation(project(":core:data-model"))
-}
+}
+android {
+    namespace = "com.ivy.locked"
+}

app-locked/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.locked"/>
+<manifest />

app/build.gradle.kts

@@ -21,7 +21,7 @@ android {
         versionCode = com.ivy.buildsrc.Project.versionCode
         versionName = com.ivy.buildsrc.Project.versionName
 
-        testInstrumentationRunner = "com.ivy.wallet.IvyAppTestRunner"
+        testInstrumentationRunner = "com.ivy.common.androidtest.HiltTestRunner"
 
         kapt {
             arguments {
@@ -138,6 +138,7 @@ android {
             it.useJUnitPlatform()
         }
     }
+    namespace = "com.ivy.wallet"
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.ivy.wallet">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

backup/api/build.gradle.kts

@@ -20,4 +20,7 @@ dependencies {
     implementation(project(":backup:old"))
     implementation(project(":backup:impl"))
     Testing()
-}
+}
+android {
+    namespace = "com.ivy.backup.api"
+}

backup/api/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.backup.api" />
+<manifest />

backup/base/build.gradle.kts

@@ -16,4 +16,7 @@ dependencies {
     implementation(project(":core:domain"))
     implementation(project(":android:file-system"))
     Testing()
-}
+}
+android {
+    namespace = "com.ivy.backup.base"
+}

backup/base/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.backup.base" />
+<manifest />

backup/impl/build.gradle.kts

@@ -20,4 +20,7 @@ dependencies {
     implementation(project(":android:file-system"))
     implementation(project(":drive:google-drive"))
     Testing()
-}
+}
+android {
+    namespace = "com.ivy.backup.impl"
+}

backup/impl/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.backup.impl" />
+<manifest />

backup/old/build.gradle.kts

@@ -20,4 +20,7 @@ dependencies {
     api(project(":backup:base"))
     implementation(project(":android:file-system"))
     Testing()
-}
+}
+android {
+    namespace = "com.ivy.backup.old"
+}

backup/old/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ivy.backup.old">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"

build.gradle.kts

@@ -41,12 +41,3 @@ fun isNonStable(version: String): Boolean {
     val isStable = stableKeyword || regex.matches(version)
     return isStable.not()
 }
-
-tasks.register("printPlugins") {
-    doLast {
-        println("Plugins applied in project '${project.name}':")
-        project.plugins.forEach {
-            println(it::class.java.name)
-        }
-    }
-}

buildSrc/build.gradle.kts

@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     //https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
-    implementation("com.android.tools.build:gradle:7.4.0-rc01")
+    implementation("com.android.tools.build:gradle:8.0.2")
 
     //https://kotlinlang.org/docs/releases.html#release-details
     // Must match kotlinVersion from dependencies.kt

buildSrc/src/main/java/com/ivy/buildsrc/IvyPlugin.kt

@@ -3,6 +3,7 @@ package com.ivy.buildsrc
 import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -13,8 +14,7 @@ abstract class IvyPlugin : Plugin<Project> {
         addKotlinCompilerArgs(project)
         setProjectSdkVersions(project)
 
-        // Robolectric doesn't integrate well with JUnit5 and Kotest
-//        robolectric(project)
+        test(project)
         androidTest(project)
         lint(project)
         kspSourceSets(project)
@@ -26,9 +26,21 @@ abstract class IvyPlugin : Plugin<Project> {
 //        }
 //    }
 
+    private fun test(project: Project) {
+        project.dependencies {
+            "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:${Versions.junitJupiter}")
+            testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junitJupiter}")
+            testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.junitJupiter}")
+            testImplementation("com.willowtreeapps.assertk:assertk:${Versions.assertK}")
+            androidTestImplementation("com.willowtreeapps.assertk:assertk:${Versions.assertK}")
+            testImplementation("io.mockk:mockk:${Versions.mockk}")
+            androidTestImplementation("io.mockk:mockk-android:${Versions.mockk}")
+        }
+    }
+
     private fun androidTest(project: Project) {
         project.androidLibrary().defaultConfig {
-            testInstrumentationRunner = "com.ivy.common.androidtest.IvyTestRunner"
+            testInstrumentationRunner = "com.ivy.common.androidtest.HiltTestRunner"
         }
     }
 

buildSrc/src/main/java/com/ivy/buildsrc/dependencies.kt

@@ -16,7 +16,10 @@
 
 package com.ivy.buildsrc
 
+import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.kotlin.dsl.DependencyHandlerScope
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.project
 
 
@@ -78,6 +81,8 @@ object Versions {
     const val junitJupiter: String = "5.9.3"
     const val junit5GradlePlugin = "1.9.3.0"
 
+    const val arrow = "1.0.1"
+
     //https://developer.android.com/training/dependency-injection/hilt-android
     //WARNING: Update hilt gradle plugin from buildSrc
     const val hilt = "2.44"
@@ -160,6 +165,13 @@ object Versions {
     // AssertK
     const val assertK = "0.26.1"
 
+    // MockK
+    const val mockk = "1.12.5"
+    const val mockWebServer = "4.11.0"
+
+    // Turbine
+    const val turbine = "0.7.0"
+
     // endregion
 }
 
@@ -236,6 +248,20 @@ fun DependencyHandler.Accompanist(api: Boolean) {
     )
 }
 
+fun DependencyHandler.FunctionalProgramming(api: Boolean) {
+    Arrow(api)
+}
+
+fun DependencyHandler.Arrow(
+    api: Boolean
+) {
+    dependency(platform("io.arrow-kt:arrow-stack:${Versions.arrow}"), api = api)
+    dependency("io.arrow-kt:arrow-core", api = api)
+    dependency("io.arrow-kt:arrow-fx-coroutines", api = api)
+    dependency("io.arrow-kt:arrow-fx-stm", api = api)
+//    dependency("io.arrow-kt:arrow-optics")
+}
+
 fun DependencyHandler.Coil(api: Boolean) {
     dependency("io.coil-kt:coil-compose:${Versions.composeCoil}", api = api)
 }
@@ -420,6 +446,8 @@ fun DependencyHandler.Coroutines(
     testDependency(
         "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version", api = api
     )
+    testDependency("app.cash.turbine:turbine:${Versions.turbine}", api = api)
+    androidTestDependency("app.cash.turbine:turbine:${Versions.turbine}", api = api)
 }
 
 fun DependencyHandler.ThirdParty() {
@@ -460,6 +488,7 @@ fun DependencyHandler.RealmDb() {
     implementation("io.realm.kotlin:library-base:${Versions.realm}")
 }
 
+
 fun DependencyHandler.JUnit5() {
     testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junitJupiter}")
     testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.junitJupiter}")
@@ -469,6 +498,11 @@ fun DependencyHandler.AssertK() {
     testImplementation("com.willowtreeapps.assertk:assertk:${Versions.assertK}")
 }
 
+fun DependencyHandler.MockK() {
+    testImplementation("io.mockk:mockk:${Versions.mockk}")
+    androidTestImplementation("io.mockk:mockk-android:${Versions.mockk}")
+}
+
 fun DependencyHandler.Testing(
     commonTest: Boolean = true,
     commonAndroidTest: Boolean = true

categories/build.gradle.kts

@@ -19,4 +19,7 @@ dependencies {
     implementation(project(":core:data-model"))
     implementation(project(":navigation"))
     Testing()
-}
+}
+android {
+    namespace = "com.ivy.categories"
+}

categories/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.categories" />
+<manifest />

common/android-test/build.gradle.kts

@@ -30,4 +30,7 @@ dependencies {
         commonAndroidTest = false
     )
     api(project(":common:test")) // expose :common:test classes to all androidTest
-}
+}
+android {
+    namespace = "com.ivy.common.androidtest"
+}

common/android-test/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ivy.common.androidtest" />
+<manifest />

common/android-test/src/main/java/com/ivy/common/androidtest/IvyTestRunner.kt → common/android-test/src/main/java/com/ivy/common/androidtest/HiltTestRunner.kt

@@ -3,11 +3,16 @@ package com.ivy.common.androidtest
 import android.app.Application
 import android.content.Context
 import androidx.test.runner.AndroidJUnitRunner
+import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.HiltTestApplication
 
-@Suppress("UNUSED")
-class IvyTestRunner : AndroidJUnitRunner() {
-    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
+class HiltTestRunner: AndroidJUnitRunner() {
+
+    override fun newApplication(
+        cl: ClassLoader?,
+        className: String?,
+        context: Context?
+    ): Application {
         return super.newApplication(cl, HiltTestApplication::class.java.name, context)
     }
 }