Skip to content

Commit 90a40f4

Browse files
simeunseoksimeunseok
committed
targetSDK 35 대응
1 parent 8252375 commit 90a40f4

12 files changed

Lines changed: 31 additions & 63 deletions

File tree

‎app/build.gradle‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ localProperties.load(new FileInputStream(rootProject.file("local.properties")))
1717

1818
android {
1919
namespace 'ddd.buyornot'
20-
compileSdk 33
20+
compileSdk 35
2121

2222
defaultConfig {
2323
manifestPlaceholders = [KAKAO_OAUTH_HOST_SCHEME: localProperties['KAKAO_OAUTH_HOST_SCHEME']]
@@ -26,9 +26,9 @@ android {
2626
defaultConfig {
2727
applicationId "ddd.buyornot"
2828
minSdk 26
29-
targetSdk 33
30-
versionCode 5
31-
versionName "1.0.4"
29+
targetSdk 35
30+
versionCode 6
31+
versionName "1.0.5"
3232

3333
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3434
vectorDrawables {
@@ -57,7 +57,7 @@ android {
5757
compose true
5858
}
5959
composeOptions {
60-
kotlinCompilerExtensionVersion '1.3.2'
60+
kotlinCompilerExtensionVersion '1.5.14'
6161
}
6262
packagingOptions {
6363
resources {
@@ -74,14 +74,14 @@ dependencies {
7474
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
7575

7676
implementation rootProject.ext.compose
77-
implementation platform('androidx.compose:compose-bom:2022.10.00')
77+
implementation platform('androidx.compose:compose-bom:2024.10.00')
7878
implementation rootProject.ext.composeUi
7979
implementation rootProject.ext.composeUiGraphics
8080
implementation rootProject.ext.composeUiPreview
8181
implementation rootProject.ext.composeRuntime
8282
implementation rootProject.ext.composeMaterial
8383
implementation rootProject.ext.composeMaterial3
84-
androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
84+
androidTestImplementation platform('androidx.compose:compose-bom:2024.10.00')
8585
androidTestImplementation rootProject.ext.composeUiTest
8686
debugImplementation rootProject.ext.composeUiTooling
8787
debugImplementation rootProject.ext.composeUiTestManifest
@@ -102,7 +102,6 @@ dependencies {
102102
implementation rootProject.ext.firebaseMessaging
103103
// crashlytics
104104
implementation rootProject.ext.firebaseCrashlyticsKtx
105-
implementation rootProject.ext.firebaseCrashlyticsNdk
106105
// dynamic link
107106
implementation rootProject.ext.firebaseDynamicLinks
108107
// inapp message
@@ -148,9 +147,6 @@ dependencies {
148147
implementation rootProject.ext.daggerHilt
149148
kapt rootProject.ext.daggerHiltCompiler
150149

151-
implementation rootProject.ext.hiltViewModel
152-
kapt rootProject.ext.hiltCompiler
153-
154150
kapt rootProject.ext.kotlinMetadataJvm
155151

156152
// Lottie

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:roundIcon="@mipmap/ic_launcher_round"
1515
android:supportsRtl="true"
1616
android:theme="@style/Theme.BuyOrNot"
17-
tools:targetApi="33">
17+
tools:targetApi="35">
1818
<activity
1919
android:name=".MainActivity"
2020
android:exported="true"

‎build.gradle‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ buildscript {
1313
classpath 'com.google.gms:google-services:4.3.15'
1414

1515
// Add the Crashlytics Gradle plugin
16-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
16+
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
1717

1818
// Add the Secret Gradle plugin
1919
classpath 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1'
2020

2121
// Add the Hilt Gradle plugin
22-
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1'
22+
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.47'
2323

2424
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
2525
}
2626
}
2727

2828
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2929
plugins {
30-
id 'com.android.application' version '7.4.2' apply false
31-
id 'com.android.library' version '7.4.2' apply false
32-
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
33-
id "org.jetbrains.kotlin.kapt" version "1.7.20" apply false
30+
id 'com.android.application' version '8.6.1' apply false
31+
id 'com.android.library' version '8.6.1' apply false
32+
id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
33+
id "org.jetbrains.kotlin.kapt" version "1.9.24" apply false
3434
}
3535

3636
ext {
3737
coreKtx = "androidx.core:core-ktx:1.8.0"
3838
kotlinBom = "platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')"
3939

4040
compose = "androidx.activity:activity-compose:1.5.1"
41-
composeBom = "platform('androidx.compose:compose-bom:2022.10.00')"
41+
composeBom = "platform('androidx.compose:compose-bom:2024.01.00')"
4242
composeUi = "androidx.compose.ui:ui"
4343
composeUiGraphics = "androidx.compose.ui:ui-graphics"
4444
composeUiPreview = "androidx.compose.ui:ui-tooling-preview"
@@ -58,11 +58,10 @@ ext {
5858

5959
splashscreen = "androidx.core:core-splashscreen:1.0.1"
6060

61-
firebaseBom = "platform('com.google.firebase:firebase-bom:32.1.0')"
61+
firebaseBom = "platform('com.google.firebase:firebase-bom:33.5.1')"
6262
firebaseAnalytics = "com.google.firebase:firebase-analytics-ktx"
6363
firebaseMessaging = "com.google.firebase:firebase-messaging-ktx"
6464
firebaseCrashlyticsKtx = "com.google.firebase:firebase-crashlytics-ktx"
65-
firebaseCrashlyticsNdk = "com.google.firebase:firebase-crashlytics-ndk"
6665
firebaseDynamicLinks = "com.google.firebase:firebase-dynamic-links-ktx"
6766
firebaseInAppMessaging = "com.google.firebase:firebase-inappmessaging-ktx"
6867
firebaseInAppMessagingDisplay = "com.google.firebase:firebase-inappmessaging-display-ktx"
@@ -93,12 +92,10 @@ ext {
9392

9493
gson = "com.google.code.gson:gson:2.9.0"
9594

96-
hiltVersion = "2.38.1"
95+
hiltVersion = "2.47"
9796
daggerHilt = "com.google.dagger:hilt-android:$hiltVersion"
9897
daggerHiltCompiler = "com.google.dagger:hilt-compiler:$hiltVersion"
9998

100-
hiltViewModel = "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
101-
hiltCompiler = "androidx.hilt:hilt-compiler:1.0.0"
10299
kotlinMetadataJvm = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0"
103100

104101
lottie = "com.airbnb.android:lottie:5.2.0"

‎component-demo/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
compose true
3838
}
3939
composeOptions {
40-
kotlinCompilerExtensionVersion '1.3.2'
40+
kotlinCompilerExtensionVersion '1.5.14'
4141
}
4242
packagingOptions {
4343
resources {
@@ -53,13 +53,13 @@ dependencies {
5353
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
5454

5555
implementation rootProject.ext.compose
56-
implementation platform('androidx.compose:compose-bom:2022.10.00')
56+
implementation platform('androidx.compose:compose-bom:2024.10.00')
5757
implementation rootProject.ext.composeUi
5858
implementation rootProject.ext.composeUiGraphics
5959
implementation rootProject.ext.composeUiPreview
6060
implementation rootProject.ext.composeMaterial
6161
implementation rootProject.ext.composeMaterial3
62-
androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
62+
androidTestImplementation platform('androidx.compose:compose-bom:2024.10.00')
6363
androidTestImplementation rootProject.ext.composeUiTest
6464
debugImplementation rootProject.ext.composeUiTooling
6565
debugImplementation rootProject.ext.composeUiTestManifest

‎component/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
compose true
3333
}
3434
composeOptions {
35-
kotlinCompilerExtensionVersion '1.3.2'
35+
kotlinCompilerExtensionVersion '1.5.14'
3636
}
3737
}
3838

@@ -42,13 +42,13 @@ dependencies {
4242
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
4343

4444
implementation rootProject.ext.compose
45-
implementation platform('androidx.compose:compose-bom:2022.10.00')
45+
implementation platform('androidx.compose:compose-bom:2024.10.00')
4646
implementation rootProject.ext.composeUi
4747
implementation rootProject.ext.composeUiGraphics
4848
implementation rootProject.ext.composeUiPreview
4949
implementation rootProject.ext.composeMaterial
5050
implementation rootProject.ext.composeMaterial3
51-
androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
51+
androidTestImplementation platform('androidx.compose:compose-bom:2024.10.00')
5252
androidTestImplementation rootProject.ext.composeUiTest
5353
debugImplementation rootProject.ext.composeUiTooling
5454
debugImplementation rootProject.ext.composeUiTestManifest

‎component/src/main/kotlin/com/ddd/component/BDSPostCard.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import androidx.compose.ui.unit.sp
2222
import com.ddd.component.theme.BDSColor.Primary50
2323
import com.ddd.component.theme.BDSColor.SlateGray500
2424
import com.ddd.component.theme.BDSColor.SlateGray900
25-
import com.ddd.component.theme.ColorRipple
2625

2726
// TODO: data class 위치 변경
2827
data class PostItem(

‎component/src/main/kotlin/com/ddd/component/Modifier.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.ddd.component
22

33
import androidx.compose.foundation.clickable
44
import androidx.compose.foundation.interaction.MutableInteractionSource
5-
import androidx.compose.material.ripple.rememberRipple
5+
import androidx.compose.material.ripple
66
import androidx.compose.runtime.Composable
77
import androidx.compose.runtime.remember
88
import androidx.compose.ui.Modifier
@@ -19,7 +19,7 @@ fun Modifier.clickableWithRoundedRipple(
1919
): Modifier = clickable(
2020
enabled = enabled,
2121
interactionSource = remember { MutableInteractionSource() },
22-
indication = rememberRipple(
22+
indication = ripple(
2323
bounded = false,
2424
radius = radius,
2525
color = Gray400

‎component/src/main/kotlin/com/ddd/component/theme/Theme.kt‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package com.ddd.component.theme
33
import android.app.Activity
44
import android.os.Build
55
import androidx.compose.foundation.isSystemInDarkTheme
6-
import androidx.compose.material.ripple.LocalRippleTheme
7-
import androidx.compose.material.ripple.RippleAlpha
8-
import androidx.compose.material.ripple.RippleTheme
96
import androidx.compose.material3.MaterialTheme
107
import androidx.compose.material3.darkColorScheme
118
import androidx.compose.material3.dynamicLightColorScheme
@@ -78,24 +75,4 @@ fun BuyOrNotTheme(
7875
}
7976
},
8077
)
81-
}
82-
83-
object ColorRippleTheme : RippleTheme {
84-
@Composable
85-
override fun defaultColor(): Color = BDSColor.Primary50
86-
87-
@Composable
88-
override fun rippleAlpha() = RippleAlpha(
89-
draggedAlpha = 1.0f,
90-
focusedAlpha = 1.0f,
91-
hoveredAlpha = 1.0f,
92-
pressedAlpha = 1.0f,
93-
)
94-
}
95-
96-
@Composable
97-
fun ColorRipple(content: @Composable () -> Unit) {
98-
CompositionLocalProvider(LocalRippleTheme provides ColorRippleTheme) {
99-
content()
100-
}
101-
}
78+
}

‎data/build.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,5 @@ dependencies {
6464
implementation rootProject.ext.daggerHilt
6565
kapt rootProject.ext.daggerHiltCompiler
6666

67-
implementation rootProject.ext.hiltViewModel
68-
kapt rootProject.ext.hiltCompiler
69-
7067
kapt rootProject.ext.kotlinMetadataJvm
7168
}

‎data/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="ddd.buyornot.data">
2+
<manifest>
33

44
</manifest>

0 commit comments

Comments
 (0)