From 999ba3cac3738c3fd37cb926da0227506c5af178 Mon Sep 17 00:00:00 2001 From: yeon-kyu Date: Sun, 28 Jan 2024 16:44:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?kuring-122=20compileSdk,=20targetSdk,=20min?= =?UTF-8?q?Sdk=20=EB=AA=A8=EB=93=88=20=EC=9D=98=EC=A1=B4=EC=84=B1=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +++--- common/preferences/build.gradle | 6 +++--- common/thirdparty/build.gradle | 6 +++--- common/ui_util/build.gradle | 6 +++--- common/util/build.gradle | 6 +++--- common/work/build.gradle | 6 +++--- data/department/build.gradle | 6 +++--- data/domain/build.gradle | 6 +++--- data/local/build.gradle | 6 +++--- data/notice/build.gradle | 6 +++--- data/push/build.gradle | 6 +++--- data/remote/build.gradle | 6 +++--- data/staff/build.gradle | 6 +++--- data/user/build.gradle | 6 +++--- feature/edit_subscription/build.gradle | 6 +++--- feature/feedback/build.gradle | 4 ++-- feature/my_notification/build.gradle | 6 +++--- feature/notice_storage/build.gradle | 6 +++--- gradle/libs.versions.toml | 5 ++++- 19 files changed, 57 insertions(+), 54 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 493f391f7..5cdf3f88f 100644 --- 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 index 16686c383..0bea0e785 100644 --- 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 -} \ No newline at end of file +} diff --git a/common/thirdparty/build.gradle b/common/thirdparty/build.gradle index 46e145dd0..fc146dad2 100644 --- 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 -} \ No newline at end of file +} diff --git a/common/ui_util/build.gradle b/common/ui_util/build.gradle index b660e63c5..7c3d8be05 100644 --- 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 -} \ No newline at end of file +} diff --git a/common/util/build.gradle b/common/util/build.gradle index 71522747f..d2081a977 100644 --- 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 -} \ No newline at end of file +} diff --git a/common/work/build.gradle b/common/work/build.gradle index 553095e47..20b12dd46 100644 --- 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 -} \ No newline at end of file +} diff --git a/data/department/build.gradle b/data/department/build.gradle index bec6a00ae..c22658be2 100644 --- 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 -} \ No newline at end of file +} diff --git a/data/domain/build.gradle b/data/domain/build.gradle index 489df26d9..9f76635c0 100644 --- 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 { -} \ No newline at end of file +} diff --git a/data/local/build.gradle b/data/local/build.gradle index faf399cbc..2df2aebeb 100644 --- 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 -} \ No newline at end of file +} diff --git a/data/notice/build.gradle b/data/notice/build.gradle index 283d123a9..ff397baee 100644 --- 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 -} \ No newline at end of file +} diff --git a/data/push/build.gradle b/data/push/build.gradle index 5c60cc2bc..29edd541d 100644 --- 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 -} \ No newline at end of file +} diff --git a/data/remote/build.gradle b/data/remote/build.gradle index 3f979b7b2..f1d7dc601 100644 --- 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 -} \ No newline at end of file +} diff --git a/data/staff/build.gradle b/data/staff/build.gradle index 737d8f7e0..f02852612 100644 --- 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 -} \ No newline at end of file +} diff --git a/data/user/build.gradle b/data/user/build.gradle index 36469affc..12e1baba9 100644 --- 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 -} \ No newline at end of file +} diff --git a/feature/edit_subscription/build.gradle b/feature/edit_subscription/build.gradle index 5285b3a2b..b49b76020 100644 --- 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 -} \ No newline at end of file +} diff --git a/feature/feedback/build.gradle b/feature/feedback/build.gradle index 16089b549..0fdf30511 100644 --- 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 index 16f811b2e..138af003f 100644 --- 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 -} \ No newline at end of file +} diff --git a/feature/notice_storage/build.gradle b/feature/notice_storage/build.gradle index 1334c4d94..9605b7740 100644 --- 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 -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 39fd9f8eb..dfab8dc4f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,9 @@ hilt = '2.45' google-services = '4.3.10' firebase-gradle = '2.7.1' oss-licenses-version = '0.10.4' +compileSdk = "33" +targetSdk = "33" +minSdk = "24" # app-level dependency compose-compiler = '1.4.7' @@ -217,4 +220,4 @@ android-test = [ 'androidx-espresso-core', ] -[plugins] \ No newline at end of file +[plugins] From cca7993c15bbf8a8074291c488ac3b898052b439 Mon Sep 17 00:00:00 2001 From: yeon-kyu Date: Sun, 28 Jan 2024 16:51:44 +0900 Subject: [PATCH 2/3] =?UTF-8?q?kuring-122=20targetSdk=2034=EB=A1=9C=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8,=20compose-bom=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dfab8dc4f..a73ca4b36 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,13 +6,13 @@ hilt = '2.45' google-services = '4.3.10' firebase-gradle = '2.7.1' oss-licenses-version = '0.10.4' -compileSdk = "33" +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' From 84cd3119ae68219a408e285d275b9917af14f069 Mon Sep 17 00:00:00 2001 From: yeon-kyu Date: Sun, 28 Jan 2024 16:54:22 +0900 Subject: [PATCH 3/3] =?UTF-8?q?kuring-122=20compose-bom=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=EC=97=90=20=EB=8C=80=ED=95=9C=20Hor?= =?UTF-8?q?izontalPager=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ku_ring/edit_subscription/compose/Subscriptions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/feature/edit_subscription/src/main/java/com/ku_stacks/ku_ring/edit_subscription/compose/Subscriptions.kt b/feature/edit_subscription/src/main/java/com/ku_stacks/ku_ring/edit_subscription/compose/Subscriptions.kt index d06cefc74..bc56fa451 100644 --- a/feature/edit_subscription/src/main/java/com/ku_stacks/ku_ring/edit_subscription/compose/Subscriptions.kt +++ b/feature/edit_subscription/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(), ) } -} \ No newline at end of file +}