Skip to content

Commit 5a56511

Browse files
Changed package name of io.architecture.room -> io.architecture.database.imp.room.
Enabled multidex due to exceed max method number in single DEX
1 parent f2df690 commit 5a56511

File tree

23 files changed

+9
-250
lines changed

23 files changed

+9
-250
lines changed

compose-app/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ android {
2323
targetSdk = 34
2424
versionCode = 1
2525
versionName = "1.0"
26-
26+
multiDexEnabled = true
2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828
}
2929

@@ -81,6 +81,7 @@ dependencies {
8181

8282

8383
implementation(libs.lifecycle.android)
84+
implementation("androidx.multidex:multidex:2.0.1")
8485
// Lifecycles
8586
implementation(libs.androidx.lifecycle)
8687
implementation(libs.androidx.lifecycleKtx)

compose-app/src/main/java/io/architecture/playground/di/DatasourceModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import dagger.Binds
44
import dagger.Module
55
import dagger.hilt.InstallIn
66
import dagger.hilt.components.SingletonComponent
7+
import io.architecture.database.imp.room.DefaultLocalDataSource
78
import io.architecture.datasource.api.LocalDataSource
89
import io.architecture.datasource.api.NetworkDataSource
910
import io.architecture.ktor.KtorNetworkDataSource
10-
import io.architecture.room.DefaultLocalDataSource
1111
import javax.inject.Singleton
1212

1313
@Module

core/database/imp/room/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ plugins {
77
}
88

99
android {
10-
namespace = "io.architecture.room"
10+
namespace = "io.architecture.database.imp.room"
1111
compileSdk = 34
1212

13-
14-
1513
buildTypes {
1614
release {
1715
isMinifyEnabled = false
18-
1916
}
2017
}
2118
compileOptions {

core/database/imp/room/src/androidTest/java/io/architecture/room/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

core/database/imp/room/src/main/java/io/architecture/room/DefaultLocalDataSource.kt renamed to core/database/imp/room/src/main/java/io/architecture/database/imp/room/DefaultLocalDataSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.architecture.room
1+
package io.architecture.database.imp.room
22

33
import io.architecture.api.dao.NodeDao
44
import io.architecture.api.dao.RouteDao

core/database/imp/room/src/main/java/io/architecture/room/InMemoryDatabase.kt renamed to core/database/imp/room/src/main/java/io/architecture/database/imp/room/InMemoryDatabase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import io.architecture.api.dao.TraceDao
99
import io.architecture.api.model.NodeEntity
1010
import io.architecture.api.model.RouteEntity
1111
import io.architecture.api.model.TraceEntity
12-
import io.architecture.room.convertors.DateTypeConvertor
13-
import io.architecture.room.convertors.ListCoordinatesTypeConvertor
12+
import io.architecture.database.imp.room.convertors.DateTypeConvertor
13+
import io.architecture.database.imp.room.convertors.ListCoordinatesTypeConvertor
1414

1515
@Database(
1616
entities = [NodeEntity::class, TraceEntity::class, RouteEntity::class],

core/database/imp/room/src/main/java/io/architecture/room/convertors/DateTypeConvertor.kt renamed to core/database/imp/room/src/main/java/io/architecture/database/imp/room/convertors/DateTypeConvertor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.architecture.room.convertors
1+
package io.architecture.database.imp.room.convertors
22

33
import androidx.room.TypeConverter
44
import java.util.Date

core/database/imp/room/src/main/java/io/architecture/room/convertors/ListCoordinatesTypeConvertor.kt renamed to core/database/imp/room/src/main/java/io/architecture/database/imp/room/convertors/ListCoordinatesTypeConvertor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.architecture.room.convertors
1+
package io.architecture.database.imp.room.convertors
22

33
import androidx.room.TypeConverter
44
import io.architecture.api.model.CoordinateEntity

core/database/imp/room/src/test/java/io/architecture/room/ExampleUnitTest.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)