Merge pull request #26 from prography/feature/consolidate-modules-to-core

Feature/consolidate modules to core

Author: hyunjung-choi

.gitignore

@@ -21,6 +21,7 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
+secrets.properties
 
 # Proguard folder generated by Eclipse
 proguard/

app/build.gradle.kts

@@ -63,11 +63,8 @@ dependencies {
     implementation(projects.core.data)
     implementation(projects.core.database)
 
-    implementation(projects.auth.presentation)
-    implementation(projects.auth.domain)
-    implementation(projects.auth.data)
-
-    implementation(projects.home.presentation)
-    implementation(projects.home.domain)
-    implementation(projects.home.data)
+    implementation(projects.feature.auth)
+    implementation(projects.feature.home)
+    implementation(projects.feature.notification)
+    implementation(projects.feature.search)
 }

app/src/main/java/com/hyunjung/cherrydan/MainActivity.kt

@@ -7,7 +7,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import com.hyunjung.core.presentation.designsystem.CherrydanTheme
-import com.hyunjung.home.presentation.navigation.HomeNavigation
+import com.hyunjung.feature.home.navigation.HomeNavigation
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

auth/data/build.gradle.kts

@@ -7,6 +7,7 @@ import com.android.build.api.dsl.LibraryExtension
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import java.util.Properties
 
 internal fun Project.configureBuildTypes(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
@@ -18,29 +19,43 @@ internal fun Project.configureBuildTypes(
         }
 
         val apiKey = gradleLocalProperties(rootDir, providers).getProperty("API_KEY")
+
         when (extensionType) {
             ExtensionType.APPLICATION -> {
                 extensions.configure<ApplicationExtension> {
                     buildTypes {
                         debug {
-                            configureDebugBuildType(apiKey)
+                            configureDebugBuildType(
+                                this@configureBuildTypes,
+                                apiKey
+                            )
                         }
                         release {
-                            configureReleaseBuildType(commonExtension, apiKey)
+                            configureReleaseBuildType(
+                                this@configureBuildTypes,
+                                commonExtension,
+                                apiKey
+                            )
                         }
                     }
                 }
-
             }
 
             ExtensionType.LIBRARY -> {
                 extensions.configure<LibraryExtension> {
                     buildTypes {
                         debug {
-                            configureDebugBuildType(apiKey)
+                            configureDebugBuildType(
+                                this@configureBuildTypes,
+                                apiKey
+                            )
                         }
                         release {
-                            configureReleaseBuildType(commonExtension, apiKey)
+                            configureReleaseBuildType(
+                                this@configureBuildTypes,
+                                commonExtension,
+                                apiKey
+                            )
                         }
                     }
                 }
@@ -49,17 +64,40 @@ internal fun Project.configureBuildTypes(
     }
 }
 
-private fun BuildType.configureDebugBuildType(apiKey: String) {
+private fun Project.getBaseUrl(): String {
+    val localProperties = gradleLocalProperties(rootDir, providers)
+    val localBaseUrl = localProperties.getProperty("BASE_URL")
+    if (!localBaseUrl.isNullOrEmpty()) {
+        return localBaseUrl
+    }
+
+    val secretsPropertiesFile = rootProject.file("secrets.properties")
+    if (secretsPropertiesFile.exists()) {
+        val secretsProperties = Properties()
+        secretsProperties.load(secretsPropertiesFile.inputStream())
+        val secretsBaseUrl = secretsProperties.getProperty("BASE_URL")
+        if (!secretsBaseUrl.isNullOrEmpty()) {
+            return secretsBaseUrl
+        }
+    }
+
+    return "https://cherrydan.com"
+}
+
+private fun BuildType.configureDebugBuildType(project: Project, apiKey: String) {
     buildConfigField("String", "API_KEY", "\"$apiKey\"")
-    buildConfigField("String", "BASE_URL", "\"https://runique.pl-coding.com:8080\"")
+    val baseUrl = project.getBaseUrl()
+    buildConfigField("String", "BASE_URL", "\"$baseUrl\"")
 }
 
 private fun BuildType.configureReleaseBuildType(
+    project: Project,
     commonExtension: CommonExtension<*, *, *, *, *, *>,
     apiKey: String
 ) {
     buildConfigField("String", "API_KEY", "\"$apiKey\"")
-    buildConfigField("String", "BASE_URL", "\"https://runique.pl-coding.com:8080\"")
+    val baseUrl = project.getBaseUrl()
+    buildConfigField("String", "BASE_URL", "\"$baseUrl\"")
 
     isMinifyEnabled = false
     proguardFiles(

auth/domain/build.gradle.kts

@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.hyunjung.core.data.test", appContext.packageName)
+        assertEquals("com.hyunjung.core.data", appContext.packageName)
     }
 }