Merge pull request #16 from team-haribo/feature/15-data-module-separa…

…tion

🔀 :: (#15) - architectural restructuring

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -14,9 +14,11 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
 
             dependencies {
                 add("implementation", project(":core:model"))
+                add("implementation", project(":core:ui"))
                 add("implementation", project(":core:design-system"))
-                add("implementation", project(":core:data:repository"))
+                add("implementation", project(":core:data"))
                 add("implementation", project(":core:domain"))
+                add("implementation", project(":core:datastore"))
 
                 add("implementation", libs.findLibrary("coil.kt").get())
 

core/data/build.gradle.kts

@@ -10,6 +10,7 @@ android {
 
 dependencies {
     implementation(project(":core:model"))
+    implementation(project(":core:network"))
 
     implementation(libs.kotlinx.datetime)
     implementation(libs.kotlinx.serialization.json)

core/datastore-proto/build.gradle.kts

@@ -0,0 +1,33 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    id("goms.android.core")
+    id("goms.android.hilt")
+    alias(libs.plugins.protobuf)
+}
+
+android {
+    namespace = "com.goms.datastore_proto"
+}
+
+protobuf {
+    protoc {
+        artifact = libs.protobuf.protoc.get().toString()
+    }
+    generateProtoTasks {
+        all().forEach { task ->
+            task.builtins {
+                register("java") {
+                    option("lite")
+                }
+                register("kotlin") {
+                    option("lite")
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.dataStore.core)
+    implementation(libs.protobuf.kotlin.lite)
+}

core/datastore-proto/src/androidTest/java/com/goms/datastore_proto/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.goms.datastore_proto
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * 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.goms.datastore_proto.test", appContext.packageName)
+    }
+}

core/datastore-proto/src/test/java/com/goms/datastore_proto/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.goms.datastore_proto
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * 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)
+    }
+}

core/datastore/.gitignore

@@ -0,0 +1 @@
+/build

core/datastore/build.gradle.kts

@@ -0,0 +1,17 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    id("goms.android.core")
+    id("goms.android.hilt")
+}
+
+android {
+    namespace = "com.goms.datastore"
+}
+
+dependencies {
+    implementation(project(":core:model"))
+    implementation(project(":core:datastore-proto"))
+
+    implementation(libs.androidx.dataStore.core)
+    implementation(libs.protobuf.kotlin.lite)
+}

core/datastore/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/data/repository/src/androidTest/java/com/goms/repository/ExampleInstrumentedTest.kt → core/datastore/src/androidTest/java/com/goms/datastore/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.goms.repository
+package com.goms.datastore
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.goms.repository.test", appContext.packageName)
+        assertEquals("com.goms.datastore.test", appContext.packageName)
     }
 }

core/datastore/src/main/AndroidManifest.xml

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

core/data/repository/src/test/java/com/goms/repository/ExampleUnitTest.kt → core/datastore/src/test/java/com/goms/datastore/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.goms.repository
+package com.goms.datastore
 
 import org.junit.Test
 

core/domain/build.gradle.kts

@@ -9,7 +9,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:data:repository"))
+    implementation(project(":core:data"))
     implementation(project(":core:model"))
 
     implementation(libs.kotlinx.datetime)

core/network/.gitignore

@@ -0,0 +1 @@
+/build

core/network/build.gradle.kts

@@ -0,0 +1,22 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    id("goms.android.core")
+    id("goms.android.hilt")
+}
+
+android {
+    namespace = "com.goms.network"
+}
+
+dependencies {
+    implementation(project(":core:model"))
+
+    implementation(libs.kotlinx.datetime)
+    implementation(libs.kotlinx.serialization.json)
+    //okhttp
+    implementation(libs.okhttp.logging)
+    //retrofit
+    implementation(libs.retrofit.core)
+    implementation(libs.retrofit.kotlin.serialization)
+    implementation(libs.retrofit.moshi.converter)
+}

core/network/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/network/src/androidTest/java/com/goms/network/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.goms.network
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * 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.goms.network.test", appContext.packageName)
+    }
+}

core/network/src/main/AndroidManifest.xml

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

core/network/src/test/java/com/goms/network/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.goms.network
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * 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)
+    }
+}

core/notifications/.gitignore

@@ -0,0 +1 @@
+/build

core/notifications/build.gradle.kts

@@ -0,0 +1,8 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    id("goms.jvm.library")
+}
+
+dependencies {
+    implementation(libs.kotlinx.datetime)
+}

core/notifications/src/main/java/com/goms/notifications/Ci.kt

@@ -0,0 +1,4 @@
+package com.goms.notifications
+
+class Ci {
+}

core/ui/.gitignore

@@ -0,0 +1 @@
+/build

core/ui/build.gradle.kts

@@ -0,0 +1,19 @@
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("goms.android.core")
+    id("goms.android.compose")
+}
+
+android {
+    namespace = "com.goms.ui"
+}
+
+dependencies {
+    implementation(project(":core:design-system"))
+    implementation(project(":core:model"))
+
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.coil.kt)
+    implementation(libs.coil.kt.compose)
+    implementation(libs.kotlinx.datetime)
+}

core/ui/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile