Skip to content

Commit ab7e9f4

Browse files
committed
refactor: Rename androidUnitTest to androidHostTest and update related documentation
1 parent fca907a commit ab7e9f4

File tree

43 files changed

+175
-216
lines changed

Some content is hidden

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

43 files changed

+175
-216
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
alias(libs.plugins.compose) apply false
99
alias(libs.plugins.compose.compiler) apply false
1010
alias(libs.plugins.android.application) apply false
11-
alias(libs.plugins.android.library) apply false
11+
alias(libs.plugins.android.kotlin.multiplatform.library) apply false
1212
alias(libs.plugins.sqlDelight) apply false
1313
alias(libs.plugins.room) apply false
1414
alias(libs.plugins.gms) apply false

core/data/db-room/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class NoteRoomDAOTest {
234234
./gradlew :core:data:db-room:test
235235

236236
# Platform-specific
237-
./gradlew :core:data:db-room:testDebugUnitTest
237+
./gradlew :core:data:db-room:androidHostTest
238238
./gradlew :core:data:db-room:iosSimulatorArm64Test
239239
```
240240

@@ -350,4 +350,3 @@ val db = Room.databaseBuilder(
350350
- [Room KMP](https://developer.android.com/kotlin/multiplatform/room)
351351
- [KSP](https://kotlinlang.org/docs/ksp-overview.html)
352352
- [SQLCipher](https://www.zetetic.net/sqlcipher/)
353-

core/data/db-room/build.gradle.kts

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
import org.gradle.internal.os.OperatingSystem
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.gradle.convention)
56
alias(libs.plugins.kotlin.multiplatform)
67
alias(libs.plugins.ksp)
7-
alias(libs.plugins.android.library)
8+
alias(libs.plugins.android.kotlin.multiplatform.library)
89
alias(libs.plugins.room)
910
alias(libs.plugins.kotlin.cocoapods)
1011
}
1112

1213
kotlin {
1314
jvmToolchain(libs.versions.jdk.get().toInt())
1415
jvm()
15-
androidTarget()
16+
android {
17+
namespace = "com.softartdev.notedelight.core.data"
18+
compileSdk = libs.versions.compileSdk.get().toInt()
19+
minSdk = libs.versions.minSdk.get().toInt()
20+
compilerOptions {
21+
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jdk.get()))
22+
}
23+
withHostTest { }
24+
}
1625
iosArm64()
1726
iosSimulatorArm64()
1827

@@ -37,9 +46,11 @@ kotlin {
3746
implementation(libs.commonsware.saferoom)
3847
implementation(libs.android.sqlcipher)
3948
}
40-
androidUnitTest.dependencies {
41-
implementation(kotlin("test-junit"))
42-
implementation(libs.bundles.mockito)
49+
val androidHostTest by getting {
50+
dependencies {
51+
implementation(kotlin("test-junit"))
52+
implementation(libs.bundles.mockito)
53+
}
4354
}
4455
iosMain.dependencies {
4556
}
@@ -66,24 +77,6 @@ kotlin {
6677
compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")
6778
}
6879

69-
android {
70-
namespace = "com.softartdev.notedelight.core.data"
71-
compileSdk = libs.versions.compileSdk.get().toInt()
72-
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
73-
defaultConfig {
74-
minSdk = libs.versions.minSdk.get().toInt()
75-
}
76-
compileOptions {
77-
isCoreLibraryDesugaringEnabled = true
78-
sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
79-
targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
80-
}
81-
dependencies {
82-
coreLibraryDesugaring(libs.desugar)
83-
}
84-
testOptions.unitTests.isReturnDefaultValues = true
85-
}
86-
8780
room {
8881
schemaDirectory("$projectDir/schemas")
8982
}
@@ -95,4 +88,5 @@ dependencies {
9588
add("kspJvm", libs.room.compiler)
9689
add("kspIosSimulatorArm64", libs.room.compiler)
9790
add("kspIosArm64", libs.room.compiler)
98-
}
91+
coreLibraryDesugaring(libs.desugar)
92+
}

core/data/db-room/src/androidUnitTest/kotlin/com/softartdev/notedelight/BaseTest.android.kt renamed to core/data/db-room/src/androidHostTest/kotlin/com/softartdev/notedelight/BaseTest.android.kt

File renamed without changes.

core/data/db-room/src/androidUnitTest/kotlin/com/softartdev/notedelight/CryptUseCaseUnitTest.kt renamed to core/data/db-room/src/androidHostTest/kotlin/com/softartdev/notedelight/CryptUseCaseUnitTest.kt

File renamed without changes.

core/data/db-room/src/androidUnitTest/kotlin/com/softartdev/notedelight/JdbcDatabaseTestHolder.kt renamed to core/data/db-room/src/androidHostTest/kotlin/com/softartdev/notedelight/JdbcDatabaseTestHolder.kt

File renamed without changes.

core/data/db-room/src/androidUnitTest/kotlin/com/softartdev/notedelight/JvmTestSafeRepo.kt renamed to core/data/db-room/src/androidHostTest/kotlin/com/softartdev/notedelight/JvmTestSafeRepo.kt

File renamed without changes.

core/data/db-sqldelight/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ See "Platform-Specific Implementations" section above for details.
217217
- Repository tests
218218

219219
### Integration Tests
220-
- Android instrumented tests (`androidInstrumentedTest/`)
220+
- Android instrumented tests (`androidDeviceTest/`)
221221
- Platform-specific tests for each target
222222

223223
### Running Tests
@@ -312,4 +312,3 @@ val notesFlow: Flow<List<Note>> = database.noteQueries
312312
- [SQLDelight Documentation](https://cashapp.github.io/sqldelight/)
313313
- [SQLCipher](https://www.zetetic.net/sqlcipher/)
314314
- [SafeRoom](https://github.com/commonsguy/cwac-saferoom)
315-

core/data/db-sqldelight/build.gradle.kts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import org.gradle.internal.os.OperatingSystem
44
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
5+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
56

67
plugins {
78
alias(libs.plugins.gradle.convention)
89
alias(libs.plugins.kotlin.multiplatform)
9-
alias(libs.plugins.android.library)
10+
alias(libs.plugins.android.kotlin.multiplatform.library)
1011
alias(libs.plugins.sqlDelight)
1112
alias(libs.plugins.kotlin.cocoapods)
1213
}
@@ -21,7 +22,16 @@ configurations.matching { !it.name.contains("test", ignoreCase = true) }.all {
2122
kotlin {
2223
jvmToolchain(libs.versions.jdk.get().toInt())
2324
jvm()
24-
androidTarget()
25+
android {
26+
namespace = "com.softartdev.notedelight.core.data"
27+
compileSdk = libs.versions.compileSdk.get().toInt()
28+
minSdk = libs.versions.minSdk.get().toInt()
29+
compilerOptions {
30+
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jdk.get()))
31+
}
32+
withHostTest { }
33+
withDeviceTest { }
34+
}
2535
iosArm64()
2636
iosSimulatorArm64()
2737
wasmJs {
@@ -50,14 +60,18 @@ kotlin {
5060
implementation(libs.commonsware.saferoom)
5161
implementation(libs.android.sqlcipher)
5262
}
53-
androidUnitTest.dependencies {
54-
implementation(kotlin("test-junit"))
55-
implementation(libs.bundles.mockito)
56-
implementation(libs.sqlDelight.jvm)
63+
val androidHostTest by getting {
64+
dependencies {
65+
implementation(kotlin("test-junit"))
66+
implementation(libs.bundles.mockito)
67+
implementation(libs.sqlDelight.jvm)
68+
}
5769
}
58-
androidInstrumentedTest.dependencies {
59-
implementation(libs.androidx.test.ext.junit)
60-
implementation(libs.androidx.test.runner)
70+
val androidDeviceTest by getting {
71+
dependencies {
72+
implementation(libs.androidx.test.ext.junit)
73+
implementation(libs.androidx.test.runner)
74+
}
6175
}
6276
iosMain.dependencies {
6377
implementation(libs.sqlDelight.native)
@@ -95,22 +109,8 @@ kotlin {
95109
compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")
96110
}
97111

98-
android {
99-
namespace = "com.softartdev.notedelight.core.data"
100-
compileSdk = libs.versions.compileSdk.get().toInt()
101-
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
102-
defaultConfig {
103-
minSdk = libs.versions.minSdk.get().toInt()
104-
}
105-
compileOptions {
106-
isCoreLibraryDesugaringEnabled = true
107-
sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
108-
targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
109-
}
110-
dependencies {
111-
coreLibraryDesugaring(libs.desugar)
112-
}
113-
testOptions.unitTests.isReturnDefaultValues = true
112+
dependencies {
113+
coreLibraryDesugaring(libs.desugar)
114114
}
115115

116116
sqldelight {

core/data/db-sqldelight/src/androidInstrumentedTest/kotlin/com/softartdev/notedelight/SqlDelightCipherInstrumentedTest.kt renamed to core/data/db-sqldelight/src/androidDeviceTest/kotlin/com/softartdev/notedelight/SqlDelightCipherInstrumentedTest.kt

File renamed without changes.

0 commit comments

Comments
 (0)