Merge 9163fda into 5bbf859

.github/workflows/cd.yml

@@ -11,11 +11,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: "zulu"
-          java-version: 11
+          java-version: 17
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2

.github/workflows/ci.yml

@@ -11,11 +11,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: "zulu"
-          java-version: 11
+          java-version: 17
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2

app/mobile/proguard-rules.pro

@@ -20,8 +20,8 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class com.danbam.data.** {*;}
--keep interface com.danbam.data.** {*;}
-
--keep class com.danbam.domain.** {*;}
--keep interface com.danbam.domain.** {*;}
+-keep class com.danbam.indistraw.core.remote.request.** {*;}
+-keep class com.danbam.indistraw.core.remote.response.** {*;}
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**

app/mobile/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.danbam.mobile">
+    package="com.danbam.indistraw.app.mobile">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />

app/tv/proguard-rules.pro

@@ -18,4 +18,10 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class com.danbam.indistraw.core.remote.request.** {*;}
+-keep class com.danbam.indistraw.core.remote.response.** {*;}
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**

app/tv/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.danbam.indistraw.app.tv">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

app/tv/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/tv/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/tv/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#020202</color>
+</resources>

buildSrc/build.gradle.kts

@@ -3,14 +3,9 @@ plugins {
     `kotlin-dsl-precompiled-script-plugins`
 }
 
-val compileKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8.toString()
-    languageVersion = libs.versions.gradleKotlin.get()
-}
-
 dependencies {
     implementation(libs.plugin.android)
     implementation(libs.plugin.hilt)
     implementation(libs.plugin.kotlin)
+    implementation(libs.plugin.ksp)
 }

buildSrc/src/main/kotlin/indistraw-app.gradle.kts

@@ -6,8 +6,8 @@ val libs = versionCatalog.named("libs")
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("kotlin-kapt")
     id("dagger.hilt.android.plugin")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -19,13 +19,14 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     composeOptions {
@@ -59,18 +60,14 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:di"))
-    implementation(project(":core:domain"))
+    implementation(project(":core:data"))
+    implementation(project(":core:remote"))
     implementation(project(":core:design-system"))
     implementation(libs.findLibrary("androidx.core").get())
-    implementation(libs.findLibrary("androidx.lifecycle").get())
-    implementation(libs.findBundle("coroutine").get())
     implementation(libs.findBundle("compose").get())
     implementation(libs.findLibrary("accompanist.nav").get())
     implementation(libs.findLibrary("hilt").get())
-    kapt(libs.findLibrary("hilt.compiler").get())
-    implementation(libs.findBundle("orbit").get())
-    implementation(libs.findLibrary("coil").get())
+    ksp(libs.findLibrary("hilt.compiler").get())
     debugImplementation(libs.findBundle("compose.debug").get())
     androidTestImplementation(libs.findLibrary("compose.test").get())
 }

buildSrc/src/main/kotlin/indistraw-core.gradle.kts

@@ -4,7 +4,8 @@ val libs = versionCatalog.named("libs")
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("kotlin-kapt")
+    id("dagger.hilt.android.plugin")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -14,11 +15,23 @@ android {
         minSdk = libs.findVersion("minSdk").get().requiredVersion.toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+    buildFeatures {
+        buildConfig = true
+    }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
+}
+
+dependencies {
+    implementation(libs.findLibrary("inject").get())
+    implementation(libs.findLibrary("hilt").get())
+    ksp(libs.findLibrary("hilt.compiler").get())
+    testImplementation(libs.findLibrary("test.junit").get())
+    testImplementation(libs.findLibrary("test.mockito.kotlin").get())
+    testImplementation(libs.findLibrary("test.mockito.inline").get())
 }

buildSrc/src/main/kotlin/indistraw-feature.gradle.kts

@@ -3,9 +3,9 @@ val libs = versionCatalog.named("libs")
 
 plugins {
     id("com.android.library")
-    id("kotlin-kapt")
     id("kotlin-android")
     id("dagger.hilt.android.plugin")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -16,13 +16,14 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     composeOptions {
@@ -36,13 +37,14 @@ android {
 dependencies {
     implementation(project(":core:domain"))
     implementation(project(":core:design-system"))
+    implementation(project(":core:ui"))
     implementation(libs.findLibrary("androidx.core").get())
     implementation(libs.findLibrary("androidx.lifecycle").get())
     implementation(libs.findBundle("coroutine").get())
     implementation(libs.findBundle("compose").get())
     implementation(libs.findLibrary("accompanist.nav").get())
     implementation(libs.findLibrary("hilt").get())
-    kapt(libs.findLibrary("hilt.compiler").get())
+    ksp(libs.findLibrary("hilt.compiler").get())
     implementation(libs.findBundle("orbit").get())
     implementation(libs.findLibrary("coil").get())
     debugImplementation(libs.findBundle("compose.debug").get())

core/data/build.gradle.kts

@@ -32,24 +32,14 @@ android {
             "PATCH_IGNORE_PATH",
             gradleLocalProperties(rootDir).getProperty("PATCH_IGNORE_PATH")
         )
-        buildConfigField(
-            "String",
-            "JUSO_KEY",
-            gradleLocalProperties(rootDir).getProperty("JUSO_KEY")
-        )
     }
 }
 
 dependencies {
+    implementation(project(":core:remote"))
+    implementation(project(":core:local"))
     implementation(project(":core:domain"))
-    implementation(libs.inject)
-    implementation(libs.room)
-    kapt(libs.room.compiler)
+    implementation(libs.paging)
     implementation(libs.bundles.retrofit)
     implementation(libs.bundles.okhttp)
-    testImplementation(libs.okhttp.sse)
-    implementation(libs.paging)
-    testImplementation(libs.test.junit)
-    testImplementation(libs.test.mockito.kotlin)
-    testImplementation(libs.test.mockito.inline)
 }

core/di/src/main/kotlin/com/danbam/indistraw/core/di/NetworkModule.kt → core/data/src/main/kotlin/com/danbam/indistraw/core/data/di/NetworkModule.kt

@@ -1,17 +1,18 @@
-package com.danbam.indistraw.core.di
+package com.danbam.indistraw.core.data.di
 
 import android.content.Context
-import com.danbam.indistraw.core.data.remote.api.AccountAPI
-import com.danbam.indistraw.core.data.remote.api.AddressAPI
-import com.danbam.indistraw.core.data.remote.api.AuthAPI
-import com.danbam.indistraw.core.data.remote.api.BannerAPI
-import com.danbam.indistraw.core.data.remote.api.CrowdFundingAPI
-import com.danbam.indistraw.core.data.remote.api.FileAPI
-import com.danbam.indistraw.core.data.remote.api.FundingAPI
-import com.danbam.indistraw.core.data.remote.api.MovieAPI
-import com.danbam.indistraw.core.data.remote.api.QRCodeAPI
-import com.danbam.indistraw.core.data.remote.api.SearchAPI
-import com.danbam.indistraw.core.data.remote.interceptor.IndiStrawInterceptor
+import com.danbam.indistraw.core.data.BuildConfig
+import com.danbam.indistraw.core.remote.api.AccountAPI
+import com.danbam.indistraw.core.remote.api.AddressAPI
+import com.danbam.indistraw.core.remote.api.AuthAPI
+import com.danbam.indistraw.core.remote.api.BannerAPI
+import com.danbam.indistraw.core.remote.api.CrowdFundingAPI
+import com.danbam.indistraw.core.remote.api.FileAPI
+import com.danbam.indistraw.core.remote.api.FundingAPI
+import com.danbam.indistraw.core.remote.api.MovieAPI
+import com.danbam.indistraw.core.remote.api.QRCodeAPI
+import com.danbam.indistraw.core.remote.api.SearchAPI
+import com.danbam.indistraw.core.data.interceptor.IndiStrawInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

core/di/src/main/kotlin/com/danbam/indistraw/core/di/RepositoryModule.kt → core/data/src/main/kotlin/com/danbam/indistraw/core/data/di/RepositoryModule.kt

@@ -1,4 +1,4 @@
-package com.danbam.indistraw.core.di
+package com.danbam.indistraw.core.data.di
 
 import com.danbam.indistraw.core.data.repository.AccountRepositoryImpl
 import com.danbam.indistraw.core.data.repository.AddressRepositoryImpl

core/data/src/main/kotlin/com/danbam/indistraw/core/data/remote/interceptor/IndiStrawInterceptor.kt → core/data/src/main/kotlin/com/danbam/indistraw/core/data/interceptor/IndiStrawInterceptor.kt

@@ -1,13 +1,13 @@
-package com.danbam.indistraw.core.data.remote.interceptor
+package com.danbam.indistraw.core.data.interceptor
 
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkInfo
 import com.danbam.indistraw.core.data.BuildConfig
-import com.danbam.indistraw.core.data.local.datasource.AuthLocalDataSource
-import com.danbam.indistraw.core.data.remote.response.auth.LoginResponse
-import com.danbam.indistraw.core.data.util.default
+import com.danbam.indistraw.core.local.datasource.AuthLocalDataSource
 import com.danbam.indistraw.core.domain.exception.ExpiredTokenException
+import com.danbam.indistraw.core.remote.response.auth.LoginResponse
+import com.danbam.indistraw.core.remote.util.default
 import com.google.gson.Gson
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull