Merge pull request #32 from uswLectureEvaluation/refactor/modularize-domain

Refactor/modularize domain

Author: jinukeu

app-compose/build.gradle.kts

@@ -1,53 +1,59 @@
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-  id("suwiki.android.application")
-  id("suwiki.android.application.compose")
-  id("suwiki.android.hilt")
+  alias(libs.plugins.suwiki.android.application)
+  alias(libs.plugins.suwiki.android.application.compose)
+  alias(libs.plugins.suwiki.android.hilt)
 }
 
 android {
   namespace = "com.kunize.uswtimetable"
 
   defaultConfig {
     applicationId = "com.kunize.uswtimetable"
-    versionCode = 1
-    versionName = "1.0"
+    versionCode = 31
+    versionName = "2.2.4"
   }
 }
 
 dependencies {
-  implementation(projects.core.database)
+  implementation(projects.presentation)
+
   implementation(projects.core.model)
+  implementation(projects.core.common)
   implementation(projects.core.network)
   implementation(projects.core.security)
+  implementation(projects.core.database)
+
+  implementation(projects.remote.openmajor)
+  implementation(projects.remote.timetable)
+  implementation(projects.remote.lectureevaluation.viewerreporter)
+  implementation(projects.remote.lectureevaluation.my)
+  implementation(projects.remote.lectureevaluation.editor)
+  implementation(projects.remote.signup)
+  implementation(projects.remote.notice)
+  implementation(projects.remote.user)
+
+  implementation(projects.local.openmajor)
+  implementation(projects.local.timetable)
+  implementation(projects.local.user)
 
-  implementation(projects.data)
   implementation(projects.data.openmajor)
   implementation(projects.data.timetable)
-  implementation(projects.data.lectureevaluation.editor)
   implementation(projects.data.lectureevaluation.viewerreporter)
+  implementation(projects.data.lectureevaluation.editor)
   implementation(projects.data.lectureevaluation.my)
   implementation(projects.data.user)
   implementation(projects.data.notice)
   implementation(projects.data.signup)
 
-  implementation(projects.domain)
-  implementation(projects.di)
   implementation(projects.domain.openmajor)
-
-  implementation(projects.local.openmajor)
-  implementation(projects.local.timetable)
-  implementation(projects.local.user)
-
-  implementation(projects.remote.lectureevaluation.editor)
-  implementation(projects.remote.lectureevaluation.my)
-  implementation(projects.remote.lectureevaluation.viewerreporter)
-  implementation(projects.remote.notice)
-  implementation(projects.remote.openmajor)
-  implementation(projects.remote.signup)
-  implementation(projects.remote.timetable)
-  implementation(projects.remote.user)
-
-  implementation(projects.presentation)
+  implementation(projects.domain.user)
+  implementation(projects.domain.signup)
+  implementation(projects.domain.lectureevaluation.viewerreporter)
+  implementation(projects.domain.lectureevaluation.my)
+  implementation(projects.domain.lectureevaluation.editor)
+  implementation(projects.domain.timetable)
+  implementation(projects.domain.notice)
 
   implementation(libs.timber)
 }

build-logic/convention/build.gradle.kts

@@ -1,57 +1,57 @@
 plugins {
-    `kotlin-dsl`
+  `kotlin-dsl`
 }
 
 group = "com.kunize.convention"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
-    compileOnly(libs.android.gradle.plugin)
-    compileOnly(libs.kotlin.gradle.plugin)
-    compileOnly(libs.ksp.gradle.plugin)
+  compileOnly(libs.android.gradle.plugin)
+  compileOnly(libs.kotlin.gradle.plugin)
+  compileOnly(libs.ksp.gradle.plugin)
 }
 
 gradlePlugin {
-    plugins {
-        register("androidApplication") {
-            id = "suwiki.android.application"
-            implementationClass = "AndroidApplicationConventionPlugin"
-        }
-        register("androidApplicationCompose") {
-            id = "suwiki.android.application.compose"
-            implementationClass = "AndroidApplicationComposeConventionPlugin"
-        }
-        register("androidLibrary") {
-            id = "suwiki.android.library"
-            implementationClass = "AndroidLibraryConventionPlugin"
-        }
-        register("androidLibraryCompose") {
-            id = "suwiki.android.library.compose"
-            implementationClass = "AndroidLibraryComposeConventionPlugin"
-        }
-        register("androidHilt") {
-            id = "suwiki.android.hilt"
-            implementationClass = "AndroidHiltConventionPlugin"
-        }
-        register("javaLibrary") {
-            id = "suwiki.java.library"
-            implementationClass = "JavaLibraryConventionPlugin"
-        }
-        register("featureCompose") {
-            id = "suwiki.android.feature.compose"
-            implementationClass = "FeatureComposeConventionPlugin"
-        }
-        register("remote") {
-            id = "suwiki.android.remote"
-            implementationClass = "RemoteConventionPlugin"
-        }
-        register("data") {
-            id = "suwiki.android.data"
-            implementationClass = "DataConventionPlugin"
-        }
+  plugins {
+    register("androidApplication") {
+      id = "suwiki.android.application"
+      implementationClass = "AndroidApplicationConventionPlugin"
     }
+    register("androidApplicationCompose") {
+      id = "suwiki.android.application.compose"
+      implementationClass = "AndroidApplicationComposeConventionPlugin"
+    }
+    register("androidLibrary") {
+      id = "suwiki.android.library"
+      implementationClass = "AndroidLibraryConventionPlugin"
+    }
+    register("androidLibraryCompose") {
+      id = "suwiki.android.library.compose"
+      implementationClass = "AndroidLibraryComposeConventionPlugin"
+    }
+    register("androidHilt") {
+      id = "suwiki.android.hilt"
+      implementationClass = "AndroidHiltConventionPlugin"
+    }
+    register("javaLibrary") {
+      id = "suwiki.java.library"
+      implementationClass = "JavaLibraryConventionPlugin"
+    }
+    register("featureCompose") {
+      id = "suwiki.android.feature.compose"
+      implementationClass = "FeatureComposeConventionPlugin"
+    }
+    register("remote") {
+      id = "suwiki.android.remote"
+      implementationClass = "RemoteConventionPlugin"
+    }
+    register("data") {
+      id = "suwiki.android.data"
+      implementationClass = "DataConventionPlugin"
+    }
+  }
 }

build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt

@@ -5,11 +5,11 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 
 class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            pluginManager.apply("com.android.application")
-            val extension = extensions.getByType<BaseAppModuleExtension>()
-            configureAndroidCompose(extension)
-        }
+  override fun apply(target: Project) {
+    with(target) {
+      pluginManager.apply("com.android.application")
+      val extension = extensions.getByType<BaseAppModuleExtension>()
+      configureAndroidCompose(extension)
     }
+  }
 }

build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt

@@ -7,17 +7,17 @@ import org.gradle.kotlin.dsl.configure
 
 internal class AndroidApplicationConventionPlugin : Plugin<Project> {
 
-    override fun apply(target: Project) {
-        with(target) {
-            with(pluginManager) {
-                apply("com.android.application")
-                apply("org.jetbrains.kotlin.android")
-            }
+  override fun apply(target: Project) {
+    with(target) {
+      with(pluginManager) {
+        apply("com.android.application")
+        apply("org.jetbrains.kotlin.android")
+      }
 
-            extensions.configure<ApplicationExtension> {
-                configureKotlinAndroid(this)
-                defaultConfig.targetSdk = Const.targetSdk
-            }
-        }
+      extensions.configure<ApplicationExtension> {
+        configureKotlinAndroid(this)
+        defaultConfig.targetSdk = Const.targetSdk
+      }
     }
+  }
 }

build-logic/convention/src/main/java/AndroidHiltConventionPlugin.kt

@@ -4,19 +4,19 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 class AndroidHiltConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            with(pluginManager) {
-                apply("com.google.devtools.ksp")
-                apply("dagger.hilt.android.plugin")
-            }
+  override fun apply(target: Project) {
+    with(target) {
+      with(pluginManager) {
+        apply("com.google.devtools.ksp")
+        apply("dagger.hilt.android.plugin")
+      }
 
-            dependencies {
-                "implementation"(libs.findLibrary("hilt.android").get())
-                "ksp"(libs.findLibrary("hilt.compiler").get())
-                "testImplementation"(libs.findLibrary("hilt.testing").get())
-                "kspTest"(libs.findLibrary("hilt.testing.compiler").get())
-            }
-        }
+      dependencies {
+        "implementation"(libs.findLibrary("hilt.android").get())
+        "ksp"(libs.findLibrary("hilt.compiler").get())
+        "testImplementation"(libs.findLibrary("hilt.testing").get())
+        "kspTest"(libs.findLibrary("hilt.testing.compiler").get())
+      }
     }
+  }
 }

build-logic/convention/src/main/java/AndroidLibraryComposeConventionPlugin.kt

@@ -5,15 +5,15 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 
 class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            with(pluginManager) {
-                apply("com.android.library")
-            }
+  override fun apply(target: Project) {
+    with(target) {
+      with(pluginManager) {
+        apply("com.android.library")
+      }
 
-            extensions.configure<LibraryExtension> {
-                configureAndroidCompose(this)
-            }
-        }
+      extensions.configure<LibraryExtension> {
+        configureAndroidCompose(this)
+      }
     }
+  }
 }

build-logic/convention/src/main/java/DataConventionPlugin.kt

@@ -6,21 +6,21 @@ import org.gradle.kotlin.dsl.project
 
 internal class DataConventionPlugin : Plugin<Project> {
 
-    override fun apply(target: Project) {
-        with(target) {
-            with(pluginManager) {
-                apply("suwiki.android.library")
-                apply("suwiki.android.hilt")
-            }
+  override fun apply(target: Project) {
+    with(target) {
+      with(pluginManager) {
+        apply("suwiki.android.library")
+        apply("suwiki.android.hilt")
+      }
 
-            dependencies {
-                "implementation"(project(":core:model"))
+      dependencies {
+        "implementation"(project(":core:model"))
 
-                "implementation"(libs.findBundle("coroutine").get())
+        "implementation"(libs.findBundle("coroutine").get())
 
-                "androidTestImplementation"(libs.findLibrary("junit").get())
-                "implementation"(libs.findLibrary("timber").get())
-            }
-        }
+        "androidTestImplementation"(libs.findLibrary("junit").get())
+        "implementation"(libs.findLibrary("timber").get())
+      }
     }
+  }
 }

build-logic/convention/src/main/java/FeatureComposeConventionPlugin.kt

@@ -5,24 +5,21 @@ import org.gradle.kotlin.dsl.dependencies
 
 internal class FeatureComposeConventionPlugin : Plugin<Project> {
 
-    override fun apply(target: Project) {
-        with(target) {
-            with(pluginManager) {
-                apply("suwiki.android.library")
-                apply("suwiki.android.library.compose")
-                apply("suwiki.android.hilt")
-            }
+  override fun apply(target: Project) {
+    with(target) {
+      with(pluginManager) {
+        apply("suwiki.android.library")
+        apply("suwiki.android.library.compose")
+        apply("suwiki.android.hilt")
+      }
 
-            dependencies {
-                "implementation"(project(":domain"))
-                "implementation"(project(":core:designsystem"))
+      dependencies {
+        "implementation"(libs.findLibrary("kotlinx.coroutines.android").get())
+        "implementation"(libs.findLibrary("kotlinx.coroutines.core").get())
 
-                "implementation"(libs.findLibrary("kotlinx.coroutines.android").get())
-                "implementation"(libs.findLibrary("kotlinx.coroutines.core").get())
-
-                "androidTestImplementation"(libs.findLibrary("junit").get())
-                "implementation"(libs.findLibrary("timber").get())
-            }
-        }
+        "androidTestImplementation"(libs.findLibrary("junit").get())
+        "implementation"(libs.findLibrary("timber").get())
+      }
     }
+  }
 }