From ce2466c59a472b2dd3f656b80110bb86d65f5baf Mon Sep 17 00:00:00 2001 From: jinukeu Date: Wed, 19 Jun 2024 13:17:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?remove:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uswtimetable/ExampleInstrumentedTest.kt | 22 ---------------- .../kunize/uswtimetable/ExampleUnitTest.kt | 16 ------------ .../core/network/ExampleInstrumentedTest.kt | 22 ---------------- .../editor/ExampleInstrumentedTest.kt | 22 ---------------- .../my/ExampleInstrumentedTest.kt | 22 ---------------- .../viewerreporter/ExampleInstrumentedTest.kt | 22 ---------------- .../data/notice/ExampleInstrumentedTest.kt | 22 ---------------- .../data/signup/ExampleInstrumentedTest.kt | 22 ---------------- .../data/user/ExampleInstrumentedTest.kt | 22 ---------------- .../com/suwiki/data/user/ExampleUnitTest.kt | 16 ------------ .../openmajor/ExampleInstrumentedTest.kt | 22 ---------------- .../com/suwiki/openmajor/ExampleUnitTest.kt | 16 ------------ .../suwiki/user/ExampleInstrumentedTest.kt | 22 ---------------- .../java/com/suwiki/user/ExampleUnitTest.kt | 16 ------------ .../editor/ExampleInstrumentedTest.kt | 22 ---------------- .../editor/ExampleUnitTest.kt | 16 ------------ .../my/ExampleInstrumentedTest.kt | 22 ---------------- .../lectureevaluation/my/ExampleUnitTest.kt | 16 ------------ .../viewerreporter/ExampleInstrumentedTest.kt | 25 ------------------- .../viewerreporter/ExampleUnitTest.kt | 16 ------------ .../suwiki/notice/ExampleInstrumentedTest.kt | 22 ---------------- .../java/com/suwiki/notice/ExampleUnitTest.kt | 16 ------------ .../openmajor/ExampleInstrumentedTest.kt | 22 ---------------- .../com/suwiki/openmajor/ExampleUnitTest.kt | 16 ------------ .../suwiki/signup/ExampleInstrumentedTest.kt | 22 ---------------- .../java/com/suwiki/signup/ExampleUnitTest.kt | 16 ------------ .../suwiki/user/ExampleInstrumentedTest.kt | 22 ---------------- .../java/com/suwiki/user/ExampleUnitTest.kt | 16 ------------ 28 files changed, 553 deletions(-) delete mode 100644 app-compose/src/androidTest/java/com/kunize/uswtimetable/ExampleInstrumentedTest.kt delete mode 100644 app-compose/src/test/java/com/kunize/uswtimetable/ExampleUnitTest.kt delete mode 100644 core/network/src/androidTest/java/com/suwiki/core/network/ExampleInstrumentedTest.kt delete mode 100644 data/lectureevaluation/editor/src/androidTest/java/com/suwiki/data/lectureevaluation/editor/ExampleInstrumentedTest.kt delete mode 100644 data/lectureevaluation/my/src/androidTest/java/com/suwiki/data/lectureevaluation/my/ExampleInstrumentedTest.kt delete mode 100644 data/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/data/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt delete mode 100644 data/notice/src/androidTest/java/com/suwiki/data/notice/ExampleInstrumentedTest.kt delete mode 100644 data/signup/src/androidTest/java/com/suwiki/data/signup/ExampleInstrumentedTest.kt delete mode 100644 data/user/src/androidTest/java/com/suwiki/data/user/ExampleInstrumentedTest.kt delete mode 100644 data/user/src/test/java/com/suwiki/data/user/ExampleUnitTest.kt delete mode 100644 local/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt delete mode 100644 local/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt delete mode 100644 local/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt delete mode 100644 local/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt delete mode 100644 remote/lectureevaluation/editor/src/androidTest/java/com/suwiki/lectureevaluation/editor/ExampleInstrumentedTest.kt delete mode 100644 remote/lectureevaluation/editor/src/test/java/com/suwiki/lectureevaluation/editor/ExampleUnitTest.kt delete mode 100644 remote/lectureevaluation/my/src/androidTest/java/com/suwiki/lectureevaluation/my/ExampleInstrumentedTest.kt delete mode 100644 remote/lectureevaluation/my/src/test/java/com/suwiki/lectureevaluation/my/ExampleUnitTest.kt delete mode 100644 remote/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt delete mode 100644 remote/lectureevaluation/viewerreporter/src/test/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleUnitTest.kt delete mode 100644 remote/notice/src/androidTest/java/com/suwiki/notice/ExampleInstrumentedTest.kt delete mode 100644 remote/notice/src/test/java/com/suwiki/notice/ExampleUnitTest.kt delete mode 100644 remote/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt delete mode 100644 remote/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt delete mode 100644 remote/signup/src/androidTest/java/com/suwiki/signup/ExampleInstrumentedTest.kt delete mode 100644 remote/signup/src/test/java/com/suwiki/signup/ExampleUnitTest.kt delete mode 100644 remote/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt delete mode 100644 remote/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt diff --git a/app-compose/src/androidTest/java/com/kunize/uswtimetable/ExampleInstrumentedTest.kt b/app-compose/src/androidTest/java/com/kunize/uswtimetable/ExampleInstrumentedTest.kt deleted file mode 100644 index 2828e6326..000000000 --- a/app-compose/src/androidTest/java/com/kunize/uswtimetable/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.kunize.uswtimetable - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.kunize.uswtimetable", appContext.packageName) - } -} diff --git a/app-compose/src/test/java/com/kunize/uswtimetable/ExampleUnitTest.kt b/app-compose/src/test/java/com/kunize/uswtimetable/ExampleUnitTest.kt deleted file mode 100644 index 11a666083..000000000 --- a/app-compose/src/test/java/com/kunize/uswtimetable/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.kunize.uswtimetable - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/core/network/src/androidTest/java/com/suwiki/core/network/ExampleInstrumentedTest.kt b/core/network/src/androidTest/java/com/suwiki/core/network/ExampleInstrumentedTest.kt deleted file mode 100644 index f7e4021b8..000000000 --- a/core/network/src/androidTest/java/com/suwiki/core/network/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.core.network - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.core.network.test", appContext.packageName) - } -} diff --git a/data/lectureevaluation/editor/src/androidTest/java/com/suwiki/data/lectureevaluation/editor/ExampleInstrumentedTest.kt b/data/lectureevaluation/editor/src/androidTest/java/com/suwiki/data/lectureevaluation/editor/ExampleInstrumentedTest.kt deleted file mode 100644 index 9c3b5d456..000000000 --- a/data/lectureevaluation/editor/src/androidTest/java/com/suwiki/data/lectureevaluation/editor/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.data.lectureevaluation.editor - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.data.lectureevaluation.editor.test", appContext.packageName) - } -} diff --git a/data/lectureevaluation/my/src/androidTest/java/com/suwiki/data/lectureevaluation/my/ExampleInstrumentedTest.kt b/data/lectureevaluation/my/src/androidTest/java/com/suwiki/data/lectureevaluation/my/ExampleInstrumentedTest.kt deleted file mode 100644 index 84e1d06cf..000000000 --- a/data/lectureevaluation/my/src/androidTest/java/com/suwiki/data/lectureevaluation/my/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.data.lectureevaluation.my - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.data.lectureevaluation.my.test", appContext.packageName) - } -} diff --git a/data/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/data/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt b/data/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/data/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt deleted file mode 100644 index 459f50995..000000000 --- a/data/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/data/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.data.lectureevaluation.viewerreporter - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.data.lectureevaluation.viewer.test", appContext.packageName) - } -} diff --git a/data/notice/src/androidTest/java/com/suwiki/data/notice/ExampleInstrumentedTest.kt b/data/notice/src/androidTest/java/com/suwiki/data/notice/ExampleInstrumentedTest.kt deleted file mode 100644 index 939bc53c6..000000000 --- a/data/notice/src/androidTest/java/com/suwiki/data/notice/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.data.notice - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.data.notice.test", appContext.packageName) - } -} diff --git a/data/signup/src/androidTest/java/com/suwiki/data/signup/ExampleInstrumentedTest.kt b/data/signup/src/androidTest/java/com/suwiki/data/signup/ExampleInstrumentedTest.kt deleted file mode 100644 index 87afebc64..000000000 --- a/data/signup/src/androidTest/java/com/suwiki/data/signup/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.data.signup - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.data.signup.test", appContext.packageName) - } -} diff --git a/data/user/src/androidTest/java/com/suwiki/data/user/ExampleInstrumentedTest.kt b/data/user/src/androidTest/java/com/suwiki/data/user/ExampleInstrumentedTest.kt deleted file mode 100644 index e8b07fc7b..000000000 --- a/data/user/src/androidTest/java/com/suwiki/data/user/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.data.user - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.data.user.test", appContext.packageName) - } -} diff --git a/data/user/src/test/java/com/suwiki/data/user/ExampleUnitTest.kt b/data/user/src/test/java/com/suwiki/data/user/ExampleUnitTest.kt deleted file mode 100644 index ea91d2a86..000000000 --- a/data/user/src/test/java/com/suwiki/data/user/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.data.user - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/local/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt b/local/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt deleted file mode 100644 index f249dacba..000000000 --- a/local/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.openmajor - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.openmajor.test", appContext.packageName) - } -} diff --git a/local/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt b/local/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt deleted file mode 100644 index 6fda3ae44..000000000 --- a/local/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.openmajor - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/local/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt b/local/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt deleted file mode 100644 index af11d8d2e..000000000 --- a/local/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.user - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.user.test", appContext.packageName) - } -} diff --git a/local/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt b/local/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt deleted file mode 100644 index 8baa50a8d..000000000 --- a/local/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.user - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/remote/lectureevaluation/editor/src/androidTest/java/com/suwiki/lectureevaluation/editor/ExampleInstrumentedTest.kt b/remote/lectureevaluation/editor/src/androidTest/java/com/suwiki/lectureevaluation/editor/ExampleInstrumentedTest.kt deleted file mode 100644 index 26822b9c1..000000000 --- a/remote/lectureevaluation/editor/src/androidTest/java/com/suwiki/lectureevaluation/editor/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.lectureevaluation.editor - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.lectureevaluation.editor.test", appContext.packageName) - } -} diff --git a/remote/lectureevaluation/editor/src/test/java/com/suwiki/lectureevaluation/editor/ExampleUnitTest.kt b/remote/lectureevaluation/editor/src/test/java/com/suwiki/lectureevaluation/editor/ExampleUnitTest.kt deleted file mode 100644 index 6764c5457..000000000 --- a/remote/lectureevaluation/editor/src/test/java/com/suwiki/lectureevaluation/editor/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.lectureevaluation.editor - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/remote/lectureevaluation/my/src/androidTest/java/com/suwiki/lectureevaluation/my/ExampleInstrumentedTest.kt b/remote/lectureevaluation/my/src/androidTest/java/com/suwiki/lectureevaluation/my/ExampleInstrumentedTest.kt deleted file mode 100644 index 65e87e204..000000000 --- a/remote/lectureevaluation/my/src/androidTest/java/com/suwiki/lectureevaluation/my/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.lectureevaluation.my - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.lectureevaluation.my.test", appContext.packageName) - } -} diff --git a/remote/lectureevaluation/my/src/test/java/com/suwiki/lectureevaluation/my/ExampleUnitTest.kt b/remote/lectureevaluation/my/src/test/java/com/suwiki/lectureevaluation/my/ExampleUnitTest.kt deleted file mode 100644 index 2ca98481b..000000000 --- a/remote/lectureevaluation/my/src/test/java/com/suwiki/lectureevaluation/my/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.lectureevaluation.my - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/remote/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt b/remote/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt deleted file mode 100644 index 140ce808c..000000000 --- a/remote/lectureevaluation/viewerreporter/src/androidTest/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.suwiki.remote.lectureevaluation.viewerreporter - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals( - "com.suwiki.remote.lectureevaluation.viewerreporter.test", - appContext.packageName, - ) - } -} diff --git a/remote/lectureevaluation/viewerreporter/src/test/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleUnitTest.kt b/remote/lectureevaluation/viewerreporter/src/test/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleUnitTest.kt deleted file mode 100644 index f1e860ee4..000000000 --- a/remote/lectureevaluation/viewerreporter/src/test/java/com/suwiki/remote/lectureevaluation/viewerreporter/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.remote.lectureevaluation.viewerreporter - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/remote/notice/src/androidTest/java/com/suwiki/notice/ExampleInstrumentedTest.kt b/remote/notice/src/androidTest/java/com/suwiki/notice/ExampleInstrumentedTest.kt deleted file mode 100644 index 19101eb50..000000000 --- a/remote/notice/src/androidTest/java/com/suwiki/notice/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.notice - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.notice.test", appContext.packageName) - } -} diff --git a/remote/notice/src/test/java/com/suwiki/notice/ExampleUnitTest.kt b/remote/notice/src/test/java/com/suwiki/notice/ExampleUnitTest.kt deleted file mode 100644 index 0983ae800..000000000 --- a/remote/notice/src/test/java/com/suwiki/notice/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.notice - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/remote/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt b/remote/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt deleted file mode 100644 index f249dacba..000000000 --- a/remote/openmajor/src/androidTest/java/com/suwiki/openmajor/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.openmajor - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.openmajor.test", appContext.packageName) - } -} diff --git a/remote/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt b/remote/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt deleted file mode 100644 index 6fda3ae44..000000000 --- a/remote/openmajor/src/test/java/com/suwiki/openmajor/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.openmajor - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/remote/signup/src/androidTest/java/com/suwiki/signup/ExampleInstrumentedTest.kt b/remote/signup/src/androidTest/java/com/suwiki/signup/ExampleInstrumentedTest.kt deleted file mode 100644 index 99ac59bb7..000000000 --- a/remote/signup/src/androidTest/java/com/suwiki/signup/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.signup - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.signup.test", appContext.packageName) - } -} diff --git a/remote/signup/src/test/java/com/suwiki/signup/ExampleUnitTest.kt b/remote/signup/src/test/java/com/suwiki/signup/ExampleUnitTest.kt deleted file mode 100644 index 615897a80..000000000 --- a/remote/signup/src/test/java/com/suwiki/signup/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.signup - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/remote/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt b/remote/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt deleted file mode 100644 index af11d8d2e..000000000 --- a/remote/user/src/androidTest/java/com/suwiki/user/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.suwiki.user - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import junit.framework.TestCase.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.suwiki.user.test", appContext.packageName) - } -} diff --git a/remote/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt b/remote/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt deleted file mode 100644 index 8baa50a8d..000000000 --- a/remote/user/src/test/java/com/suwiki/user/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.user - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} From 6247a173f5c4e378619de1e35778d1d30fd558ec Mon Sep 17 00:00:00 2001 From: jinukeu Date: Wed, 19 Jun 2024 15:11:51 +0900 Subject: [PATCH 2/2] refactor: core:database -> local:common --- .../com/suwiki/database/ExampleUnitTest.kt | 16 ---- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- {core/database => local/common}/.gitignore | 0 .../common}/build.gradle.kts | 2 +- .../common}/consumer-rules.pro | 0 .../common}/proguard-rules.pro | 0 .../TimetableDatabaseMigrate1To2Test.kt | 12 +-- .../common}/src/main/AndroidManifest.xml | 2 +- .../common}/database/OpenMajorDatabase.kt | 6 +- .../common}/database/TimetableDatabase.kt | 8 +- .../converter/TimetableCellListConverter.kt | 2 +- .../common}/database/dao/OpenMajorDao.kt | 4 +- .../common}/database/dao/TimeTableDao.kt | 4 +- .../local/common}/database/di/DaoModule.kt | 10 +-- .../common}/database/di/DatabaseModule.kt | 8 +- .../database/entity}/OpenMajorEntity.kt | 2 +- .../database/entity}/TimetableEntity.kt | 2 +- .../database/migration/TimetableMigration.kt | 2 +- .../common/datastore}/di/DataStoreModule.kt | 6 +- .../common/datastore}/di/NormalDataStore.kt | 2 +- .../proto/UserPreferenceSerializer.kt | 4 +- .../src/main/proto/user_preference.proto | 2 +- local/openmajor/build.gradle.kts | 2 +- .../local/openmajor/converter/OpenMajor.kt | 2 +- .../LocalOpenMajorDataSourceImpl.kt | 4 +- local/timetable/build.gradle.kts | 2 +- .../converter/Timetable.kt | 2 +- .../converter/TimetableEntity.kt | 2 +- .../LocalTimetableDatasourceImpl.kt | 4 +- local/user/build.gradle.kts | 2 +- .../datasource/LocalUserDataSourceImpl.kt | 2 +- .../1.json | 88 ------------------- .../2.json | 88 ------------------- .../2.json | 40 --------- .../1.json | 88 ------------------- .../1.json | 88 ------------------- .../2.json | 88 ------------------- .../1.json | 40 --------- .../2.json | 40 --------- .../2.json | 58 ------------ .../1.json | 0 .../1.json | 0 settings.gradle.kts | 2 +- 44 files changed, 53 insertions(+), 687 deletions(-) delete mode 100644 core/database/src/test/java/com/suwiki/database/ExampleUnitTest.kt rename {core/database => local/common}/.gitignore (100%) rename {core/database => local/common}/build.gradle.kts (96%) rename {core/database => local/common}/consumer-rules.pro (100%) rename {core/database => local/common}/proguard-rules.pro (100%) rename {core/database/src/androidTest/java/com/suwiki/database => local/common/src/androidTest/java/com/suwiki/local/common}/TimetableDatabaseMigrate1To2Test.kt (86%) rename {core/database => local/common}/src/main/AndroidManifest.xml (90%) rename {core/database/src/main/java/com/suwiki/core/database => local/common/src/main/java/com/suwiki/local/common}/database/OpenMajorDatabase.kt (79%) rename {core/database/src/main/java/com/suwiki/core/database => local/common/src/main/java/com/suwiki/local/common}/database/TimetableDatabase.kt (58%) rename {core/database/src/main/java/com/suwiki/core/database => local/common/src/main/java/com/suwiki/local/common}/database/converter/TimetableCellListConverter.kt (90%) rename {core/database/src/main/java/com/suwiki/core => local/common/src/main/java/com/suwiki/local/common}/database/dao/OpenMajorDao.kt (74%) rename {core/database/src/main/java/com/suwiki/core => local/common/src/main/java/com/suwiki/local/common}/database/dao/TimeTableDao.kt (84%) rename {core/database/src/main/java/com/suwiki/core => local/common/src/main/java/com/suwiki/local/common}/database/di/DaoModule.kt (58%) rename {core/database/src/main/java/com/suwiki/core => local/common/src/main/java/com/suwiki/local/common}/database/di/DatabaseModule.kt (83%) rename {core/database/src/main/java/com/suwiki/core/database/model => local/common/src/main/java/com/suwiki/local/common/database/entity}/OpenMajorEntity.kt (78%) rename {core/database/src/main/java/com/suwiki/core/database/model => local/common/src/main/java/com/suwiki/local/common/database/entity}/TimetableEntity.kt (85%) rename {core/database/src/main/java/com/suwiki/core/database => local/common/src/main/java/com/suwiki/local/common}/database/migration/TimetableMigration.kt (98%) rename {core/database/src/main/java/com/suwiki/core/database => local/common/src/main/java/com/suwiki/local/common/datastore}/di/DataStoreModule.kt (90%) rename {core/database/src/main/java/com/suwiki/core/database => local/common/src/main/java/com/suwiki/local/common/datastore}/di/NormalDataStore.kt (71%) rename {core/database/src/main/java/com/suwiki/core/database => local/common/src/main/java/com/suwiki/local/common/datastore}/proto/UserPreferenceSerializer.kt (89%) rename {core/database => local/common}/src/main/proto/user_preference.proto (81%) delete mode 100644 schemas/com.suwiki.core.database.OpenLectureDatabase/1.json delete mode 100644 schemas/com.suwiki.core.database.OpenLectureDatabase/2.json delete mode 100644 schemas/com.suwiki.core.database.OpenMajorDatabase/2.json delete mode 100644 schemas/com.suwiki.core.database.TimetableDatabase/1.json delete mode 100644 schemas/com.suwiki.core.database.database.OpenLectureDatabase/1.json delete mode 100644 schemas/com.suwiki.core.database.database.OpenLectureDatabase/2.json delete mode 100644 schemas/com.suwiki.core.database.database.OpenMajorDatabase/1.json delete mode 100644 schemas/com.suwiki.core.database.database.OpenMajorDatabase/2.json delete mode 100644 schemas/com.suwiki.core.database.database.TimetableDatabase/2.json rename schemas/{com.suwiki.core.database.OpenMajorDatabase => com.suwiki.local.common.database.OpenMajorDatabase}/1.json (100%) rename schemas/{com.suwiki.core.database.database.TimetableDatabase => com.suwiki.local.common.database.TimetableDatabase}/1.json (100%) diff --git a/core/database/src/test/java/com/suwiki/database/ExampleUnitTest.kt b/core/database/src/test/java/com/suwiki/database/ExampleUnitTest.kt deleted file mode 100644 index 5684ee44e..000000000 --- a/core/database/src/test/java/com/suwiki/database/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.suwiki.database - -import junit.framework.TestCase.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/gradle.properties b/gradle.properties index 35ed98316..aa78f7545 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 42defcc94..20db9ad5c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/core/database/.gitignore b/local/common/.gitignore similarity index 100% rename from core/database/.gitignore rename to local/common/.gitignore diff --git a/core/database/build.gradle.kts b/local/common/build.gradle.kts similarity index 96% rename from core/database/build.gradle.kts rename to local/common/build.gradle.kts index 4af014bca..012c0f7ee 100644 --- a/core/database/build.gradle.kts +++ b/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. diff --git a/core/database/consumer-rules.pro b/local/common/consumer-rules.pro similarity index 100% rename from core/database/consumer-rules.pro rename to local/common/consumer-rules.pro diff --git a/core/database/proguard-rules.pro b/local/common/proguard-rules.pro similarity index 100% rename from core/database/proguard-rules.pro rename to local/common/proguard-rules.pro diff --git a/core/database/src/androidTest/java/com/suwiki/database/TimetableDatabaseMigrate1To2Test.kt b/local/common/src/androidTest/java/com/suwiki/local/common/TimetableDatabaseMigrate1To2Test.kt similarity index 86% rename from core/database/src/androidTest/java/com/suwiki/database/TimetableDatabaseMigrate1To2Test.kt rename to local/common/src/androidTest/java/com/suwiki/local/common/TimetableDatabaseMigrate1To2Test.kt index 112e15f65..4f64d9866 100644 --- a/core/database/src/androidTest/java/com/suwiki/database/TimetableDatabaseMigrate1To2Test.kt +++ b/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, diff --git a/core/database/src/main/AndroidManifest.xml b/local/common/src/main/AndroidManifest.xml similarity index 90% rename from core/database/src/main/AndroidManifest.xml rename to local/common/src/main/AndroidManifest.xml index a5918e68a..8bdb7e14b 100644 --- a/core/database/src/main/AndroidManifest.xml +++ b/local/common/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/core/database/src/main/java/com/suwiki/core/database/database/OpenMajorDatabase.kt b/local/common/src/main/java/com/suwiki/local/common/database/OpenMajorDatabase.kt similarity index 79% rename from core/database/src/main/java/com/suwiki/core/database/database/OpenMajorDatabase.kt rename to local/common/src/main/java/com/suwiki/local/common/database/OpenMajorDatabase.kt index 20bd7800e..005fc3fd5 100644 --- a/core/database/src/main/java/com/suwiki/core/database/database/OpenMajorDatabase.kt +++ b/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], diff --git a/core/database/src/main/java/com/suwiki/core/database/database/TimetableDatabase.kt b/local/common/src/main/java/com/suwiki/local/common/database/TimetableDatabase.kt similarity index 58% rename from core/database/src/main/java/com/suwiki/core/database/database/TimetableDatabase.kt rename to local/common/src/main/java/com/suwiki/local/common/database/TimetableDatabase.kt index 79e0bd67b..0ee1eed0e 100644 --- a/core/database/src/main/java/com/suwiki/core/database/database/TimetableDatabase.kt +++ b/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], diff --git a/core/database/src/main/java/com/suwiki/core/database/database/converter/TimetableCellListConverter.kt b/local/common/src/main/java/com/suwiki/local/common/database/converter/TimetableCellListConverter.kt similarity index 90% rename from core/database/src/main/java/com/suwiki/core/database/database/converter/TimetableCellListConverter.kt rename to local/common/src/main/java/com/suwiki/local/common/database/converter/TimetableCellListConverter.kt index 09a30681b..c3d2c0d69 100644 --- a/core/database/src/main/java/com/suwiki/core/database/database/converter/TimetableCellListConverter.kt +++ b/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 diff --git a/core/database/src/main/java/com/suwiki/core/database/dao/OpenMajorDao.kt b/local/common/src/main/java/com/suwiki/local/common/database/dao/OpenMajorDao.kt similarity index 74% rename from core/database/src/main/java/com/suwiki/core/database/dao/OpenMajorDao.kt rename to local/common/src/main/java/com/suwiki/local/common/database/dao/OpenMajorDao.kt index 9df61d403..0f43d2143 100644 --- a/core/database/src/main/java/com/suwiki/core/database/dao/OpenMajorDao.kt +++ b/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 { diff --git a/core/database/src/main/java/com/suwiki/core/database/dao/TimeTableDao.kt b/local/common/src/main/java/com/suwiki/local/common/database/dao/TimeTableDao.kt similarity index 84% rename from core/database/src/main/java/com/suwiki/core/database/dao/TimeTableDao.kt rename to local/common/src/main/java/com/suwiki/local/common/database/dao/TimeTableDao.kt index 764fb7455..611ab6949 100644 --- a/core/database/src/main/java/com/suwiki/core/database/dao/TimeTableDao.kt +++ b/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 { diff --git a/core/database/src/main/java/com/suwiki/core/database/di/DaoModule.kt b/local/common/src/main/java/com/suwiki/local/common/database/di/DaoModule.kt similarity index 58% rename from core/database/src/main/java/com/suwiki/core/database/di/DaoModule.kt rename to local/common/src/main/java/com/suwiki/local/common/database/di/DaoModule.kt index 16f873938..fe34c77c1 100644 --- a/core/database/src/main/java/com/suwiki/core/database/di/DaoModule.kt +++ b/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 diff --git a/core/database/src/main/java/com/suwiki/core/database/di/DatabaseModule.kt b/local/common/src/main/java/com/suwiki/local/common/database/di/DatabaseModule.kt similarity index 83% rename from core/database/src/main/java/com/suwiki/core/database/di/DatabaseModule.kt rename to local/common/src/main/java/com/suwiki/local/common/database/di/DatabaseModule.kt index 156a7e936..279e36ad1 100644 --- a/core/database/src/main/java/com/suwiki/core/database/di/DatabaseModule.kt +++ b/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 diff --git a/core/database/src/main/java/com/suwiki/core/database/model/OpenMajorEntity.kt b/local/common/src/main/java/com/suwiki/local/common/database/entity/OpenMajorEntity.kt similarity index 78% rename from core/database/src/main/java/com/suwiki/core/database/model/OpenMajorEntity.kt rename to local/common/src/main/java/com/suwiki/local/common/database/entity/OpenMajorEntity.kt index 36c4c28a5..407e8beec 100644 --- a/core/database/src/main/java/com/suwiki/core/database/model/OpenMajorEntity.kt +++ b/local/common/src/main/java/com/suwiki/local/common/database/entity/OpenMajorEntity.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.database.model +package com.suwiki.local.common.database.entity import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/core/database/src/main/java/com/suwiki/core/database/model/TimetableEntity.kt b/local/common/src/main/java/com/suwiki/local/common/database/entity/TimetableEntity.kt similarity index 85% rename from core/database/src/main/java/com/suwiki/core/database/model/TimetableEntity.kt rename to local/common/src/main/java/com/suwiki/local/common/database/entity/TimetableEntity.kt index 94dfb699c..dce6bd8aa 100644 --- a/core/database/src/main/java/com/suwiki/core/database/model/TimetableEntity.kt +++ b/local/common/src/main/java/com/suwiki/local/common/database/entity/TimetableEntity.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.database.model +package com.suwiki.local.common.database.entity import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/core/database/src/main/java/com/suwiki/core/database/database/migration/TimetableMigration.kt b/local/common/src/main/java/com/suwiki/local/common/database/migration/TimetableMigration.kt similarity index 98% rename from core/database/src/main/java/com/suwiki/core/database/database/migration/TimetableMigration.kt rename to local/common/src/main/java/com/suwiki/local/common/database/migration/TimetableMigration.kt index 394c1bcb5..66a0c07be 100644 --- a/core/database/src/main/java/com/suwiki/core/database/database/migration/TimetableMigration.kt +++ b/local/common/src/main/java/com/suwiki/local/common/database/migration/TimetableMigration.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.database.database.migration +package com.suwiki.local.common.database.migration import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase diff --git a/core/database/src/main/java/com/suwiki/core/database/di/DataStoreModule.kt b/local/common/src/main/java/com/suwiki/local/common/datastore/di/DataStoreModule.kt similarity index 90% rename from core/database/src/main/java/com/suwiki/core/database/di/DataStoreModule.kt rename to local/common/src/main/java/com/suwiki/local/common/datastore/di/DataStoreModule.kt index fdd7058f6..23d8af76f 100644 --- a/core/database/src/main/java/com/suwiki/core/database/di/DataStoreModule.kt +++ b/local/common/src/main/java/com/suwiki/local/common/datastore/di/DataStoreModule.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.database.di +package com.suwiki.local.common.datastore.di import android.content.Context import androidx.datastore.core.DataStore @@ -9,8 +9,8 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.emptyPreferences import androidx.datastore.preferences.preferencesDataStoreFile -import com.suwiki.core.database.UserPreference -import com.suwiki.core.database.proto.UserPreferenceSerializer +import com.suwiki.local.common.UserPreference +import com.suwiki.local.common.datastore.proto.UserPreferenceSerializer import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/core/database/src/main/java/com/suwiki/core/database/di/NormalDataStore.kt b/local/common/src/main/java/com/suwiki/local/common/datastore/di/NormalDataStore.kt similarity index 71% rename from core/database/src/main/java/com/suwiki/core/database/di/NormalDataStore.kt rename to local/common/src/main/java/com/suwiki/local/common/datastore/di/NormalDataStore.kt index 5d145b7d2..6074cc0ae 100644 --- a/core/database/src/main/java/com/suwiki/core/database/di/NormalDataStore.kt +++ b/local/common/src/main/java/com/suwiki/local/common/datastore/di/NormalDataStore.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.database.di +package com.suwiki.local.common.datastore.di import javax.inject.Qualifier diff --git a/core/database/src/main/java/com/suwiki/core/database/proto/UserPreferenceSerializer.kt b/local/common/src/main/java/com/suwiki/local/common/datastore/proto/UserPreferenceSerializer.kt similarity index 89% rename from core/database/src/main/java/com/suwiki/core/database/proto/UserPreferenceSerializer.kt rename to local/common/src/main/java/com/suwiki/local/common/datastore/proto/UserPreferenceSerializer.kt index 3ffadbd8b..7ff7c5331 100644 --- a/core/database/src/main/java/com/suwiki/core/database/proto/UserPreferenceSerializer.kt +++ b/local/common/src/main/java/com/suwiki/local/common/datastore/proto/UserPreferenceSerializer.kt @@ -1,9 +1,9 @@ -package com.suwiki.core.database.proto +package com.suwiki.local.common.datastore.proto import androidx.datastore.core.CorruptionException import androidx.datastore.core.Serializer import androidx.datastore.preferences.protobuf.InvalidProtocolBufferException -import com.suwiki.core.database.UserPreference +import com.suwiki.local.common.UserPreference import java.io.InputStream import java.io.OutputStream import javax.inject.Inject diff --git a/core/database/src/main/proto/user_preference.proto b/local/common/src/main/proto/user_preference.proto similarity index 81% rename from core/database/src/main/proto/user_preference.proto rename to local/common/src/main/proto/user_preference.proto index c1cb8580a..a6689261b 100644 --- a/core/database/src/main/proto/user_preference.proto +++ b/local/common/src/main/proto/user_preference.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option java_package = "com.suwiki.core.database"; +option java_package = "com.suwiki.local.common"; option java_multiple_files = true; message UserPreference { diff --git a/local/openmajor/build.gradle.kts b/local/openmajor/build.gradle.kts index 47c8681eb..feb0611e1 100644 --- a/local/openmajor/build.gradle.kts +++ b/local/openmajor/build.gradle.kts @@ -12,7 +12,7 @@ android { dependencies { implementation(projects.core.model) implementation(projects.core.android) - implementation(projects.core.database) + implementation(projects.local.common) implementation(projects.data.openmajor) diff --git a/local/openmajor/src/main/java/com/suwiki/local/openmajor/converter/OpenMajor.kt b/local/openmajor/src/main/java/com/suwiki/local/openmajor/converter/OpenMajor.kt index cfcec82f8..1f6642740 100644 --- a/local/openmajor/src/main/java/com/suwiki/local/openmajor/converter/OpenMajor.kt +++ b/local/openmajor/src/main/java/com/suwiki/local/openmajor/converter/OpenMajor.kt @@ -1,7 +1,7 @@ package com.suwiki.local.openmajor.converter -import com.suwiki.core.database.model.OpenMajorEntity import com.suwiki.core.model.openmajor.OpenMajor +import com.suwiki.local.common.database.entity.OpenMajorEntity fun OpenMajorEntity.toModel() = OpenMajor( id = id, diff --git a/local/openmajor/src/main/java/com/suwiki/local/openmajor/datasource/LocalOpenMajorDataSourceImpl.kt b/local/openmajor/src/main/java/com/suwiki/local/openmajor/datasource/LocalOpenMajorDataSourceImpl.kt index a1dc612d0..6f9656408 100644 --- a/local/openmajor/src/main/java/com/suwiki/local/openmajor/datasource/LocalOpenMajorDataSourceImpl.kt +++ b/local/openmajor/src/main/java/com/suwiki/local/openmajor/datasource/LocalOpenMajorDataSourceImpl.kt @@ -6,10 +6,10 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.floatPreferencesKey import com.suwiki.core.android.Dispatcher import com.suwiki.core.android.SuwikiDispatchers -import com.suwiki.core.database.database.OpenMajorDatabase -import com.suwiki.core.database.di.NormalDataStore import com.suwiki.core.model.openmajor.OpenMajor import com.suwiki.data.openmajor.datasource.LocalOpenMajorDataSource +import com.suwiki.local.common.database.OpenMajorDatabase +import com.suwiki.local.common.datastore.di.NormalDataStore import com.suwiki.local.openmajor.converter.toEntity import com.suwiki.local.openmajor.converter.toModel import kotlinx.coroutines.CoroutineDispatcher diff --git a/local/timetable/build.gradle.kts b/local/timetable/build.gradle.kts index f93db7721..1f8aea526 100644 --- a/local/timetable/build.gradle.kts +++ b/local/timetable/build.gradle.kts @@ -13,7 +13,7 @@ android { dependencies { implementation(projects.core.model) implementation(projects.core.android) - implementation(projects.core.database) + implementation(projects.local.common) implementation(projects.data.timetable) diff --git a/local/timetable/src/main/java/com.suwiki.local.timetable/converter/Timetable.kt b/local/timetable/src/main/java/com.suwiki.local.timetable/converter/Timetable.kt index 25e4c7ed2..f5094a367 100644 --- a/local/timetable/src/main/java/com.suwiki.local.timetable/converter/Timetable.kt +++ b/local/timetable/src/main/java/com.suwiki.local.timetable/converter/Timetable.kt @@ -1,7 +1,7 @@ package com.suwiki.local.timetable.converter -import com.suwiki.core.database.model.TimetableEntity import com.suwiki.core.model.timetable.Timetable +import com.suwiki.local.common.database.entity.TimetableEntity fun Timetable.toEntity() = TimetableEntity( createTime = createTime, diff --git a/local/timetable/src/main/java/com.suwiki.local.timetable/converter/TimetableEntity.kt b/local/timetable/src/main/java/com.suwiki.local.timetable/converter/TimetableEntity.kt index cf85ef042..63d3a5d38 100644 --- a/local/timetable/src/main/java/com.suwiki.local.timetable/converter/TimetableEntity.kt +++ b/local/timetable/src/main/java/com.suwiki.local.timetable/converter/TimetableEntity.kt @@ -1,7 +1,7 @@ package com.suwiki.local.timetable.converter -import com.suwiki.core.database.model.TimetableEntity import com.suwiki.core.model.timetable.Timetable +import com.suwiki.local.common.database.entity.TimetableEntity fun TimetableEntity.toModel() = Timetable( createTime = createTime, diff --git a/local/timetable/src/main/java/com.suwiki.local.timetable/datasource/LocalTimetableDatasourceImpl.kt b/local/timetable/src/main/java/com.suwiki.local.timetable/datasource/LocalTimetableDatasourceImpl.kt index dfd4391c5..6a8fafa6a 100644 --- a/local/timetable/src/main/java/com.suwiki.local.timetable/datasource/LocalTimetableDatasourceImpl.kt +++ b/local/timetable/src/main/java/com.suwiki.local.timetable/datasource/LocalTimetableDatasourceImpl.kt @@ -7,10 +7,10 @@ import androidx.datastore.preferences.core.longPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey import com.suwiki.core.android.Dispatcher import com.suwiki.core.android.SuwikiDispatchers -import com.suwiki.core.database.database.TimetableDatabase -import com.suwiki.core.database.di.NormalDataStore import com.suwiki.core.model.timetable.Timetable import com.suwiki.data.timetable.datasource.LocalTimetableDataSource +import com.suwiki.local.common.database.TimetableDatabase +import com.suwiki.local.common.datastore.di.NormalDataStore import com.suwiki.local.timetable.converter.toEntity import com.suwiki.local.timetable.converter.toModel import kotlinx.coroutines.CoroutineDispatcher diff --git a/local/user/build.gradle.kts b/local/user/build.gradle.kts index c3e7f5e52..d498eaf69 100644 --- a/local/user/build.gradle.kts +++ b/local/user/build.gradle.kts @@ -11,7 +11,7 @@ android { dependencies { implementation(projects.core.model) implementation(projects.data.user) - implementation(projects.core.database) + implementation(projects.local.common) implementation(libs.bundles.coroutine) implementation(libs.androidx.datastore.core) diff --git a/local/user/src/main/java/com/suwiki/local/user/datasource/LocalUserDataSourceImpl.kt b/local/user/src/main/java/com/suwiki/local/user/datasource/LocalUserDataSourceImpl.kt index abed5497b..04dd24482 100644 --- a/local/user/src/main/java/com/suwiki/local/user/datasource/LocalUserDataSourceImpl.kt +++ b/local/user/src/main/java/com/suwiki/local/user/datasource/LocalUserDataSourceImpl.kt @@ -1,7 +1,6 @@ package com.suwiki.local.user.datasource import androidx.datastore.core.DataStore -import com.suwiki.core.database.UserPreference import com.suwiki.core.model.user.DEFAULT_USER_EMAIL import com.suwiki.core.model.user.DEFAULT_USER_ID import com.suwiki.core.model.user.DEFAULT_USER_POINT @@ -10,6 +9,7 @@ import com.suwiki.core.model.user.DEFAULT_USER_WRITTEN_EVALUATION import com.suwiki.core.model.user.DEFAULT_USER_WRITTEN_EXAM import com.suwiki.core.model.user.User import com.suwiki.data.user.datasource.LocalUserDataSource +import com.suwiki.local.common.UserPreference import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import javax.inject.Inject diff --git a/schemas/com.suwiki.core.database.OpenLectureDatabase/1.json b/schemas/com.suwiki.core.database.OpenLectureDatabase/1.json deleted file mode 100644 index 5ec6836ad..000000000 --- a/schemas/com.suwiki.core.database.OpenLectureDatabase/1.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "d388602654d094c34e2c718a802d0243", - "entities": [ - { - "tableName": "OpenLectureEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))", - "fields": [ - { - "fieldPath": "number", - "columnName": "number", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "major", - "columnName": "major", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "grade", - "columnName": "grade", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classNumber", - "columnName": "classNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classDivideNumber", - "columnName": "classDivideNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "className", - "columnName": "className", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classification", - "columnName": "classification", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "professor", - "columnName": "professor", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "time", - "columnName": "time", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "credit", - "columnName": "credit", - "affinity": "TEXT", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "number" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd388602654d094c34e2c718a802d0243')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.OpenLectureDatabase/2.json b/schemas/com.suwiki.core.database.OpenLectureDatabase/2.json deleted file mode 100644 index da73101e3..000000000 --- a/schemas/com.suwiki.core.database.OpenLectureDatabase/2.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "d388602654d094c34e2c718a802d0243", - "entities": [ - { - "tableName": "OpenLectureEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))", - "fields": [ - { - "fieldPath": "number", - "columnName": "number", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "major", - "columnName": "major", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "grade", - "columnName": "grade", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classNumber", - "columnName": "classNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classDivideNumber", - "columnName": "classDivideNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "className", - "columnName": "className", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classification", - "columnName": "classification", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "professor", - "columnName": "professor", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "time", - "columnName": "time", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "credit", - "columnName": "credit", - "affinity": "TEXT", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "number" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd388602654d094c34e2c718a802d0243')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.OpenMajorDatabase/2.json b/schemas/com.suwiki.core.database.OpenMajorDatabase/2.json deleted file mode 100644 index e1a8cce2c..000000000 --- a/schemas/com.suwiki.core.database.OpenMajorDatabase/2.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "a7aa694667974b6b111d2d7755530138", - "entities": [ - { - "tableName": "OpenMajorEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)", - "fields": [ - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a7aa694667974b6b111d2d7755530138')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.TimetableDatabase/1.json b/schemas/com.suwiki.core.database.TimetableDatabase/1.json deleted file mode 100644 index 1e7891d05..000000000 --- a/schemas/com.suwiki.core.database.TimetableDatabase/1.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "fdfd5ad0cd87be70a7007f51d26b3ff7", - "entities": [ - { - "tableName": "TimetableEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))", - "fields": [ - { - "fieldPath": "number", - "columnName": "number", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "major", - "columnName": "major", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "grade", - "columnName": "grade", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classNumber", - "columnName": "classNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classDivideNumber", - "columnName": "classDivideNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "className", - "columnName": "className", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classification", - "columnName": "classification", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "professor", - "columnName": "professor", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "time", - "columnName": "time", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "credit", - "columnName": "credit", - "affinity": "TEXT", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "number" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fdfd5ad0cd87be70a7007f51d26b3ff7')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.database.OpenLectureDatabase/1.json b/schemas/com.suwiki.core.database.database.OpenLectureDatabase/1.json deleted file mode 100644 index 5ec6836ad..000000000 --- a/schemas/com.suwiki.core.database.database.OpenLectureDatabase/1.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "d388602654d094c34e2c718a802d0243", - "entities": [ - { - "tableName": "OpenLectureEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))", - "fields": [ - { - "fieldPath": "number", - "columnName": "number", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "major", - "columnName": "major", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "grade", - "columnName": "grade", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classNumber", - "columnName": "classNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classDivideNumber", - "columnName": "classDivideNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "className", - "columnName": "className", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classification", - "columnName": "classification", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "professor", - "columnName": "professor", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "time", - "columnName": "time", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "credit", - "columnName": "credit", - "affinity": "TEXT", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "number" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd388602654d094c34e2c718a802d0243')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.database.OpenLectureDatabase/2.json b/schemas/com.suwiki.core.database.database.OpenLectureDatabase/2.json deleted file mode 100644 index da73101e3..000000000 --- a/schemas/com.suwiki.core.database.database.OpenLectureDatabase/2.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "d388602654d094c34e2c718a802d0243", - "entities": [ - { - "tableName": "OpenLectureEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))", - "fields": [ - { - "fieldPath": "number", - "columnName": "number", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "major", - "columnName": "major", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "grade", - "columnName": "grade", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classNumber", - "columnName": "classNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classDivideNumber", - "columnName": "classDivideNumber", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "className", - "columnName": "className", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "classification", - "columnName": "classification", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "professor", - "columnName": "professor", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "time", - "columnName": "time", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "credit", - "columnName": "credit", - "affinity": "TEXT", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "number" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd388602654d094c34e2c718a802d0243')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.database.OpenMajorDatabase/1.json b/schemas/com.suwiki.core.database.database.OpenMajorDatabase/1.json deleted file mode 100644 index 5871d97f7..000000000 --- a/schemas/com.suwiki.core.database.database.OpenMajorDatabase/1.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "a7aa694667974b6b111d2d7755530138", - "entities": [ - { - "tableName": "OpenMajorEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)", - "fields": [ - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a7aa694667974b6b111d2d7755530138')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.database.OpenMajorDatabase/2.json b/schemas/com.suwiki.core.database.database.OpenMajorDatabase/2.json deleted file mode 100644 index e1a8cce2c..000000000 --- a/schemas/com.suwiki.core.database.database.OpenMajorDatabase/2.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "a7aa694667974b6b111d2d7755530138", - "entities": [ - { - "tableName": "OpenMajorEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)", - "fields": [ - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a7aa694667974b6b111d2d7755530138')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.database.TimetableDatabase/2.json b/schemas/com.suwiki.core.database.database.TimetableDatabase/2.json deleted file mode 100644 index ef8b7650d..000000000 --- a/schemas/com.suwiki.core.database.database.TimetableDatabase/2.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "d3ae462e5e5245e675c522c8e1ff9800", - "entities": [ - { - "tableName": "TimetableEntity", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`createTime` INTEGER NOT NULL, `year` TEXT NOT NULL, `semester` TEXT NOT NULL, `name` TEXT NOT NULL, `cellList` TEXT NOT NULL, PRIMARY KEY(`createTime`))", - "fields": [ - { - "fieldPath": "createTime", - "columnName": "createTime", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "year", - "columnName": "year", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "semester", - "columnName": "semester", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "cellList", - "columnName": "cellList", - "affinity": "TEXT", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "createTime" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd3ae462e5e5245e675c522c8e1ff9800')" - ] - } -} \ No newline at end of file diff --git a/schemas/com.suwiki.core.database.OpenMajorDatabase/1.json b/schemas/com.suwiki.local.common.database.OpenMajorDatabase/1.json similarity index 100% rename from schemas/com.suwiki.core.database.OpenMajorDatabase/1.json rename to schemas/com.suwiki.local.common.database.OpenMajorDatabase/1.json diff --git a/schemas/com.suwiki.core.database.database.TimetableDatabase/1.json b/schemas/com.suwiki.local.common.database.TimetableDatabase/1.json similarity index 100% rename from schemas/com.suwiki.core.database.database.TimetableDatabase/1.json rename to schemas/com.suwiki.local.common.database.TimetableDatabase/1.json diff --git a/settings.gradle.kts b/settings.gradle.kts index ee74764f9..de91af63b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,7 +26,6 @@ include(":core:model") include(":core:common") include(":core:network") include(":core:security") -include(":core:database") include(":core:designsystem") include(":core:ui") @@ -75,3 +74,4 @@ include(":feature:myinfo") include(":feature:notice") include(":feature:signup") include(":feature:login") +include(":local:common")