Skip to content

Commit 2342b20

Browse files
artikhonbabichev.a
artikhon
and
babichev.a
authored
replace shared module (#533)
* adding unit-tests * fixing unit-tests * moving di * fix paging * rename :shared-compose-ui to :shared module * renaming :shared-compose-ui to :shared module --------- Co-authored-by: babichev.a <babichev.a@promail366.com>
1 parent cdbe62b commit 2342b20

File tree

195 files changed

+753
-3228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+753
-3228
lines changed

‎.github/workflows/kmp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- '**'
77
tags-ignore:
88
- '**'
9+
pull_request:
910

1011
jobs:
1112
build_job:

‎android-compose-app/build.gradle.kts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ android {
6565
}
6666

6767
dependencies {
68+
implementation(project(":core:domain"))
69+
implementation(project(":core:data"))
70+
implementation(project(":core:presentation"))
6871
implementation(project(":shared"))
69-
implementation(project(":shared-compose-ui"))
7072
implementation(kotlin("reflect"))
7173
implementation(libs.androidx.activity.compose)
7274
implementation(compose.ui)
@@ -75,6 +77,8 @@ dependencies {
7577
debugImplementation(compose.uiTooling)
7678
debugImplementation(libs.androidx.compose.test.manifest)
7779
implementation(libs.androidx.navigation.compose)
80+
implementation(libs.material.theme.prefs)
81+
implementation(libs.napier)
7882
implementation(platform(libs.koin.bom))
7983
implementation(libs.koin.android)
8084
implementation(libs.koin.androidx.compose)
@@ -89,6 +93,8 @@ dependencies {
8993
testImplementation(libs.junit)
9094
testImplementation(libs.bundles.mockito)
9195
androidTestImplementation(project(":jvm-compose-test"))
96+
androidTestImplementation(libs.commonsware.saferoom)
97+
androidTestImplementation(libs.sqlDelight.android)
9298
androidTestImplementation(libs.androidx.test.ext.junit)
9399
androidTestImplementation(libs.androidx.test.runner)
94100
androidTestUtil(libs.androidx.test.orchestrator)

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/CryptInstrumentedTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.softartdev.notedelight
33
import android.text.SpannableStringBuilder
44
import androidx.test.ext.junit.runners.AndroidJUnit4
55
import androidx.test.filters.MediumTest
6-
import com.softartdev.notedelight.shared.PlatformSQLiteState
7-
import com.softartdev.notedelight.shared.db.SafeRepo
6+
import com.softartdev.notedelight.model.PlatformSQLiteState
7+
import com.softartdev.notedelight.repository.SafeRepo
88
import org.junit.Assert.assertEquals
99
import org.junit.Test
1010
import org.junit.runner.RunWith

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/CryptUseCaseInstrumentedTest.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ package com.softartdev.notedelight
22

33
import androidx.test.ext.junit.runners.AndroidJUnit4
44
import androidx.test.filters.MediumTest
5-
import com.softartdev.notedelight.shared.PlatformSQLiteState
6-
import com.softartdev.notedelight.shared.db.SafeRepo
7-
import com.softartdev.notedelight.shared.usecase.crypt.ChangePasswordUseCase
8-
import com.softartdev.notedelight.shared.usecase.crypt.CheckPasswordUseCase
5+
import com.softartdev.notedelight.model.PlatformSQLiteState
6+
import com.softartdev.notedelight.repository.SafeRepo
7+
import com.softartdev.notedelight.usecase.crypt.*
98
import kotlinx.coroutines.runBlocking
109
import org.junit.Assert.assertFalse
1110
import org.junit.Assert.assertTrue

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/SqlDelightCipherInstrumentedTest.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import app.cash.sqldelight.db.SqlDriver
1212
import app.cash.sqldelight.driver.android.AndroidSqliteDriver
1313
import com.commonsware.cwac.saferoom.SQLCipherUtils
1414
import com.commonsware.cwac.saferoom.SafeHelperFactory
15-
import com.softartdev.notedelight.shared.db.SafeRepo.Companion.DB_NAME
16-
import com.softartdev.notedelight.shared.db.TestSchema
17-
import com.softartdev.notedelight.shared.db.TestSchema.firstNote
18-
import com.softartdev.notedelight.shared.db.TestSchema.secondNote
19-
import com.softartdev.notedelight.shared.db.TestSchema.thirdNote
20-
import com.softartdev.notedelight.shared.db.createQueryWrapper
15+
import com.softartdev.notedelight.db.NoteDb
16+
import com.softartdev.notedelight.db.TestSchema
17+
import com.softartdev.notedelight.db.TestSchema.firstNote
18+
import com.softartdev.notedelight.db.TestSchema.secondNote
19+
import com.softartdev.notedelight.db.TestSchema.thirdNote
20+
import com.softartdev.notedelight.db.createQueryWrapper
21+
import com.softartdev.notedelight.repository.SafeRepo.Companion.DB_NAME
2122
import com.softartdev.notedelight.shared.db.Note
22-
import com.softartdev.notedelight.shared.db.NoteDb
2323
import org.junit.Assert.assertEquals
2424
import org.junit.Test
2525
import org.junit.runner.RunWith

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/ui/RotationTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import com.softartdev.notedelight.MainActivity
1313
import kotlinx.coroutines.test.runTest
1414
import leakcanary.DetectLeaksAfterTestSuccess
1515
import leakcanary.TestDescriptionHolder
16-
import notedelight.shared_compose_ui.generated.resources.Res
17-
import notedelight.shared_compose_ui.generated.resources.create_note
16+
import notedelight.shared.generated.resources.Res
17+
import notedelight.shared.generated.resources.create_note
1818
import org.jetbrains.compose.resources.getString
1919
import org.junit.Ignore
2020
import org.junit.Rule

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/ui/SignOutTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import com.softartdev.notedelight.MainActivity
1111
import kotlinx.coroutines.test.runTest
1212
import leakcanary.DetectLeaksAfterTestSuccess
1313
import leakcanary.TestDescriptionHolder
14-
import notedelight.shared_compose_ui.generated.resources.Res
15-
import notedelight.shared_compose_ui.generated.resources.create_note
14+
import notedelight.shared.generated.resources.Res
15+
import notedelight.shared.generated.resources.create_note
1616
import org.jetbrains.compose.resources.getString
1717
import org.junit.Assert.assertTrue
1818
import org.junit.Rule

‎android-compose-app/src/main/java/com/softartdev/notedelight/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.softartdev.notedelight
33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
6-
import com.softartdev.notedelight.shared.navigation.Router
6+
import com.softartdev.notedelight.navigation.Router
77
import org.koin.android.ext.android.inject
88

99
class MainActivity : ComponentActivity() {

‎android-compose-app/src/main/java/com/softartdev/notedelight/MainApplication.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.softartdev.notedelight
22

33
import android.app.Application
4+
import com.softartdev.notedelight.di.sharedModules
45
import com.softartdev.notedelight.di.uiModules
5-
import com.softartdev.notedelight.shared.di.sharedModules
6-
import com.softartdev.notedelight.shared.util.NapierKoinLogger
6+
import com.softartdev.notedelight.util.NapierKoinLogger
77
import com.softartdev.notedelight.util.isInLeakCanaryAnalyzerProcess
88
import com.softartdev.notedelight.util.log.CrashlyticsAntilog
99
import io.github.aakira.napier.DebugAntilog
@@ -24,4 +24,4 @@ class MainApplication : Application() {
2424
modules(sharedModules + uiModules)
2525
}
2626
}
27-
}
27+
}

‎core/data/build.gradle.kts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@ kotlin {
2525
implementation(libs.stately.common)
2626
}
2727
commonTest.dependencies {
28+
implementation(kotlin("test"))
29+
implementation(project(":core:test"))
30+
implementation(project.dependencies.platform(libs.coroutines.bom))
31+
implementation(libs.coroutines.test)
32+
implementation(libs.napier)
2833
}
2934
androidMain.dependencies {
3035
implementation(libs.sqlDelight.android)
3136
implementation(libs.commonsware.saferoom)
3237
implementation(libs.android.sqlcipher)
3338
}
3439
androidUnitTest.dependencies {
40+
implementation(kotlin("test-junit"))
41+
implementation(libs.bundles.mockito)
42+
implementation(libs.sqlDelight.jvm)
3543
}
3644
iosMain.dependencies {
3745
implementation(libs.sqlDelight.native)

0 commit comments

Comments
 (0)