Merge pull request #89 from ku-ring/2.0/kuring-122_yk

�kuring-122 compose 키보드 이슈 업데이트 및 모듈간 sdk 의존성 통합
ku-ring · Jan 30, 2024 · b72c4dc · b72c4dc
2 parents 8649816 + 84cd311
commit b72c4dc
Show file tree

Hide file tree

Showing 20 changed files with 61 additions and 58 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,12 +30,12 @@ android {
             }
         }
     }
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
         applicationId "com.ku_stacks.ku_ring"
-        minSdk 24
-        targetSdk 33
+        minSdk libs.versions.minSdk.get().toInteger()
+        targetSdk libs.versions.targetSdk.get().toInteger()
         versionCode 22
         versionName "1.2.10"
 

diff --git a/common/preferences/build.gradle b/common/preferences/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.preferences'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -42,4 +42,4 @@ dependencies {
     kaptAndroidTest libs.hilt.compiler
     testImplementation libs.hilt.android.testing
     kaptTest libs.hilt.compiler
-}
+}
diff --git a/common/thirdparty/build.gradle b/common/thirdparty/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.thirdparty'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -52,4 +52,4 @@ dependencies {
 
     // Timber
     implementation libs.timber
-}
+}
diff --git a/common/ui_util/build.gradle b/common/ui_util/build.gradle
@@ -6,10 +6,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.ui_util'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -57,4 +57,4 @@ dependencies {
 
     // Timber
     implementation libs.timber
-}
+}
diff --git a/common/util/build.gradle b/common/util/build.gradle
@@ -8,10 +8,10 @@ def localPropertiesFile = rootProject.file("local.properties")
 
 android {
     namespace 'com.ku_stacks.ku_ring.util'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -88,4 +88,4 @@ dependencies {
     // tests
     testImplementation libs.bundles.unit.test
     testFixturesImplementation libs.bundles.unit.test
-}
+}
diff --git a/common/work/build.gradle b/common/work/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.work'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -47,4 +47,4 @@ dependencies {
     // WorkManager
     implementation libs.bundles.androidx.work
     androidTestImplementation libs.androidx.work.testing
-}
+}
diff --git a/data/department/build.gradle b/data/department/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.department'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -72,4 +72,4 @@ dependencies {
 
     // tests
     testImplementation libs.bundles.unit.test
-}
+}
diff --git a/data/domain/build.gradle b/data/domain/build.gradle
@@ -6,10 +6,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.domain'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -35,4 +35,4 @@ android {
 
 dependencies {
 
-}
+}
diff --git a/data/local/build.gradle b/data/local/build.gradle
@@ -8,10 +8,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.local'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -66,4 +66,4 @@ dependencies {
 
     // tests
     testImplementation libs.bundles.unit.test
-}
+}
diff --git a/data/notice/build.gradle b/data/notice/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.notice'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -81,4 +81,4 @@ dependencies {
     implementation libs.okhttp
     implementation libs.okhttp.logging.interceptor
     testImplementation libs.okhttp.mockwebserver
-}
+}
diff --git a/data/push/build.gradle b/data/push/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.push'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -71,4 +71,4 @@ dependencies {
 
     // tests
     testImplementation libs.bundles.unit.test
-}
+}
diff --git a/data/remote/build.gradle b/data/remote/build.gradle
@@ -8,10 +8,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.remote'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -69,4 +69,4 @@ dependencies {
 
     // tests
     testImplementation libs.bundles.unit.test
-}
+}
diff --git a/data/staff/build.gradle b/data/staff/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.staff'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -50,4 +50,4 @@ dependencies {
 
     // tests
     testImplementation libs.bundles.unit.test
-}
+}
diff --git a/data/user/build.gradle b/data/user/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.user'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -59,4 +59,4 @@ dependencies {
     implementation libs.androidx.room.ktx
     implementation libs.androidx.room.rxjava3
     testImplementation libs.androidx.room.testing
-}
+}
diff --git a/feature/edit_subscription/build.gradle b/feature/edit_subscription/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.edit_subscription'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -85,4 +85,4 @@ dependencies {
 
     // Timber
     implementation libs.timber
-}
+}
diff --git a/...bscription/src/main/java/com/ku_stacks/ku_ring/edit_subscription/compose/Subscriptions.kt b/...bscription/src/main/java/com/ku_stacks/ku_ring/edit_subscription/compose/Subscriptions.kt
@@ -149,6 +149,7 @@ private fun SubscriptionTabs(
     val coroutineScope = rememberCoroutineScope()
     val pagerState = rememberPagerState(
         initialPage = selectedTab.ordinal,
+        pageCount = { EditSubscriptionTab.values().size }
     )
 
     val currentPage = pagerState.currentPage
@@ -228,10 +229,9 @@ private fun SubscriptionPager(
     onAddDepartmentButtonClick: () -> Unit,
     onSubscriptionComplete: () -> Unit,
     modifier: Modifier = Modifier,
-    pagerState: PagerState = rememberPagerState(),
+    pagerState: PagerState,
 ) {
     HorizontalPager(
-        pageCount = EditSubscriptionTab.values().size,
         verticalAlignment = Alignment.Top,
         state = pagerState,
         modifier = modifier,
@@ -424,4 +424,4 @@ private fun DepartmentPagePreview_Empty() {
             modifier = Modifier.fillMaxSize(),
         )
     }
-}
+}
diff --git a/feature/feedback/build.gradle b/feature/feedback/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.feedback'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/feature/my_notification/build.gradle b/feature/my_notification/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.my_notification'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -78,4 +78,4 @@ dependencies {
 
     // tests
     testImplementation libs.bundles.unit.test
-}
+}
diff --git a/feature/notice_storage/build.gradle b/feature/notice_storage/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.ku_stacks.ku_ring.notice_storage'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 24
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -67,4 +67,4 @@ dependencies {
 
     // viewModel
     implementation libs.bundles.viewmodel.ktx
-}
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,10 +6,13 @@ hilt = '2.45'
 google-services = '4.3.10'
 firebase-gradle = '2.7.1'
 oss-licenses-version = '0.10.4'
+compileSdk = "34"
+targetSdk = "33"
+minSdk = "24"
 
 # app-level dependency
 compose-compiler = '1.4.7'
-compose-bom = '2023.05.00'
+compose-bom = '2024.01.00'
 fragment = '1.5.0'
 kotlinx-coroutines = '1.6.4'
 okhttp = '4.9.0'
@@ -217,4 +220,4 @@ android-test = [
     'androidx-espresso-core',
 ]
 
-[plugins]
+[plugins]