Refactor/#134 local common

gradle.properties

@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

core/database/build.gradle.kts → local/common/build.gradle.kts

@@ -12,7 +12,7 @@ ksp {
 }
 
 android {
-  namespace = "com.suwiki.core.database"
+  namespace = "com.suwiki.local.common"
 
   sourceSets {
     // Adds exported schema location as test app assets.

core/database/src/androidTest/java/com/suwiki/database/TimetableDatabaseMigrate1To2Test.kt → local/common/src/androidTest/java/com/suwiki/local/common/TimetableDatabaseMigrate1To2Test.kt

@@ -1,11 +1,11 @@
-package com.suwiki.database
+package com.suwiki.local.common
 
 import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.suwiki.core.database.database.TimetableDatabase
-import com.suwiki.core.database.database.migration.TIMETABLE_MIGRATION_1_2
-import com.suwiki.core.database.di.DatabaseName
+import com.suwiki.local.common.database.TimetableDatabase
+import com.suwiki.local.common.database.di.DatabaseName
+import com.suwiki.local.common.database.migration.TIMETABLE_MIGRATION_1_2
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -23,7 +23,7 @@ class TimetableDatabaseMigrate1To2Test {
   @Test
   @Throws(IOException::class)
   fun testTimetableDBMigrate1To2() {
-    var db = helper.createDatabase(DatabaseName.TIMETABLE, 1).apply {
+    helper.createDatabase(DatabaseName.TIMETABLE, 1).apply {
       val testCellList = """
         [
           {"color":-9728172,"credit":"","day":"목","endTime":"4","location":"미래520","name":"도전과창조-기업가정신","professor":"김기선","startTime":"3"},
@@ -45,7 +45,7 @@ class TimetableDatabaseMigrate1To2Test {
       close()
     }
 
-    db = helper.runMigrationsAndValidate(
+    helper.runMigrationsAndValidate(
       /* name = */ DatabaseName.TIMETABLE,
       /* version = */ 1,
       /* validateDroppedTables = */ true,

core/database/src/main/AndroidManifest.xml → local/common/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-</manifest>
+</manifest>

core/database/src/main/java/com/suwiki/core/database/database/OpenMajorDatabase.kt → local/common/src/main/java/com/suwiki/local/common/database/OpenMajorDatabase.kt

@@ -1,12 +1,12 @@
-package com.suwiki.core.database.database
+package com.suwiki.local.common.database
 
 import androidx.room.AutoMigration
 import androidx.room.Database
 import androidx.room.RenameTable
 import androidx.room.RoomDatabase
 import androidx.room.migration.AutoMigrationSpec
-import com.suwiki.core.database.dao.OpenMajorDao
-import com.suwiki.core.database.model.OpenMajorEntity
+import com.suwiki.local.common.database.dao.OpenMajorDao
+import com.suwiki.local.common.database.entity.OpenMajorEntity
 
 @Database(
   entities = [OpenMajorEntity::class],

core/database/src/main/java/com/suwiki/core/database/database/TimetableDatabase.kt → local/common/src/main/java/com/suwiki/local/common/database/TimetableDatabase.kt

@@ -1,11 +1,11 @@
-package com.suwiki.core.database.database
+package com.suwiki.local.common.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.suwiki.core.database.dao.TimeTableDao
-import com.suwiki.core.database.database.converter.TimetableCellListConverter
-import com.suwiki.core.database.model.TimetableEntity
+import com.suwiki.local.common.database.converter.TimetableCellListConverter
+import com.suwiki.local.common.database.dao.TimeTableDao
+import com.suwiki.local.common.database.entity.TimetableEntity
 
 @Database(
   entities = [TimetableEntity::class],

core/database/src/main/java/com/suwiki/core/database/database/converter/TimetableCellListConverter.kt → local/common/src/main/java/com/suwiki/local/common/database/converter/TimetableCellListConverter.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.database.database.converter
+package com.suwiki.local.common.database.converter
 
 import androidx.room.TypeConverter
 import com.suwiki.core.model.timetable.TimetableCell

core/database/src/main/java/com/suwiki/core/database/dao/OpenMajorDao.kt → local/common/src/main/java/com/suwiki/local/common/database/dao/OpenMajorDao.kt

@@ -1,9 +1,9 @@
-package com.suwiki.core.database.dao
+package com.suwiki.local.common.database.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
-import com.suwiki.core.database.model.OpenMajorEntity
+import com.suwiki.local.common.database.entity.OpenMajorEntity
 
 @Dao
 interface OpenMajorDao {

core/database/src/main/java/com/suwiki/core/database/dao/TimeTableDao.kt → local/common/src/main/java/com/suwiki/local/common/database/dao/TimeTableDao.kt

@@ -1,11 +1,11 @@
-package com.suwiki.core.database.dao
+package com.suwiki.local.common.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
-import com.suwiki.core.database.model.TimetableEntity
+import com.suwiki.local.common.database.entity.TimetableEntity
 
 @Dao
 interface TimeTableDao {

core/database/src/main/java/com/suwiki/core/database/di/DaoModule.kt → local/common/src/main/java/com/suwiki/local/common/database/di/DaoModule.kt

@@ -1,9 +1,9 @@
-package com.suwiki.core.database.di
+package com.suwiki.local.common.database.di
 
-import com.suwiki.core.database.dao.OpenMajorDao
-import com.suwiki.core.database.dao.TimeTableDao
-import com.suwiki.core.database.database.OpenMajorDatabase
-import com.suwiki.core.database.database.TimetableDatabase
+import com.suwiki.local.common.database.OpenMajorDatabase
+import com.suwiki.local.common.database.TimetableDatabase
+import com.suwiki.local.common.database.dao.OpenMajorDao
+import com.suwiki.local.common.database.dao.TimeTableDao
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

core/database/src/main/java/com/suwiki/core/database/di/DatabaseModule.kt → local/common/src/main/java/com/suwiki/local/common/database/di/DatabaseModule.kt

@@ -1,10 +1,10 @@
-package com.suwiki.core.database.di
+package com.suwiki.local.common.database.di
 
 import android.content.Context
 import androidx.room.Room
-import com.suwiki.core.database.database.OpenMajorDatabase
-import com.suwiki.core.database.database.TimetableDatabase
-import com.suwiki.core.database.database.migration.TIMETABLE_MIGRATION_1_2
+import com.suwiki.local.common.database.OpenMajorDatabase
+import com.suwiki.local.common.database.TimetableDatabase
+import com.suwiki.local.common.database.migration.TIMETABLE_MIGRATION_1_2
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn