Skip to content

Commit c84ca8b

Browse files
chattyminchattymin
authored
apply android 15 (sdk 35) version control
android 15 대응함
2 parents 64906e2 + c5be723 commit c84ca8b

File tree

5 files changed

+79
-47
lines changed

5 files changed

+79
-47
lines changed

‎app/build.gradle.kts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,33 @@ android {
2222

2323
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2424

25+
// 👇 공식 API + providers 사용
26+
val localProps = gradleLocalProperties(rootDir, providers)
27+
2528
buildConfigField(
2629
"String",
2730
"NATIVE_APP_KEY",
28-
gradleLocalProperties(rootDir).getProperty("native.app.key"),
31+
"\"${localProps.getProperty("native.app.key")}\""
2932
)
30-
manifestPlaceholders["NATIVE_APP_KEY"] =
31-
gradleLocalProperties(rootDir).getProperty("nativeAppKey")
33+
// manifestPlaceholders는 문자열 그 자체를 넣으면 됨(따옴표 불필요)
34+
manifestPlaceholders["NATIVE_APP_KEY"] = localProps.getProperty("nativeAppKey")
3235
}
3336

3437
buildTypes {
3538
debug {
39+
val localProps = gradleLocalProperties(rootDir, providers)
3640
buildConfigField(
3741
"String",
3842
"BASE_URL",
39-
gradleLocalProperties(rootDir).getProperty("test.base.url")
43+
"\"${localProps.getProperty("test.base.url")}\""
4044
)
4145
}
4246
release {
47+
val localProps = gradleLocalProperties(rootDir, providers)
4348
buildConfigField(
4449
"String",
4550
"BASE_URL",
46-
gradleLocalProperties(rootDir).getProperty("base.url")
51+
"\"${localProps.getProperty("base.url")}\""
4752
)
4853
isMinifyEnabled = false
4954
proguardFiles(

‎buildSrc/src/main/kotlin/Constants.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
object Constants {
22
const val packageName = "com.going.doorip"
3-
const val compileSdk = 34
3+
const val compileSdk = 35
44
const val minSdk = 28
5-
const val targetSdk = 34
6-
const val versionCode = 12
7-
const val versionName = "1.2"
5+
const val targetSdk = 35
6+
const val versionCode = 14
7+
const val versionName = "1.4"
88
}

‎buildSrc/src/main/kotlin/Versions.kt‎

Lines changed: 63 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,77 @@
11
import org.gradle.api.JavaVersion
22

33
object Versions {
4-
const val gradleVersion = "8.0.2"
5-
6-
const val buildToolsVersion = "30.0.3"
7-
const val kotlinVersion = "1.8.20"
8-
const val kotlinSerializationJsonVersion = "1.5.1"
9-
const val kotlinDateTimeVersion = "0.4.0"
10-
const val coreKtxVersion = "1.10.1"
11-
const val appCompatVersion = "1.6.1"
12-
const val materialDesignVersion = "1.9.0"
13-
const val constraintLayoutVersion = "2.1.4"
4+
// AGP (com.android.tools.build:gradle)
5+
// plugins { id("com.android.application") version "8.7.2" } 로 맞춰 쓰는 걸 권장
6+
const val gradleVersion = "8.7.2"
7+
8+
// buildToolsVersion는 AGP 8.x부터 명시 불필요. 그래도 상수 유지하려면 35로.
9+
const val buildToolsVersion = "35.0.0"
10+
11+
// Kotlin
12+
const val kotlinVersion = "1.9.24"
13+
const val kotlinSerializationJsonVersion = "1.6.3"
14+
const val kotlinDateTimeVersion = "0.6.1" // 최신권장
15+
16+
// AndroidX core / appcompat / material
17+
const val coreKtxVersion = "1.13.1"
18+
const val appCompatVersion = "1.7.0"
19+
const val materialDesignVersion = "1.12.0"
20+
21+
// UI
22+
const val constraintLayoutVersion = "2.1.4" // 2.2.0은 아직 안정화 대기
23+
const val flexboxVersion = "3.0.0"
24+
const val circleIndicatorVersion = "2.1.6"
25+
const val circleImageViewVersion = "3.1.0"
26+
const val shimmerVersion = "0.5.0"
27+
28+
// App Startup / Legacy / Security
1429
const val appStartUpVersion = "1.1.1"
1530
const val legacySupportVersion = "1.0.0"
16-
const val securityVersion = "1.1.0-alpha06"
17-
const val hiltVersion = "2.46.1"
18-
const val activityKtxVersion = "1.7.2"
19-
const val fragmentKtxVersion = "1.5.7"
20-
const val coroutinesAndroidVersion = "1.7.1"
21-
const val pagingVersion = "3.1.1"
22-
const val lifecycleVersion = "2.6.1"
23-
const val ossPluginVersion = "0.10.4"
24-
const val ossVersion = "17.0.0"
31+
const val securityVersion = "1.1.0-alpha06" // 안정판 대체 없으면 유지
32+
33+
// Hilt (Dagger)
34+
const val hiltVersion = "2.51.1"
35+
36+
// Activity/Fragment/Lifecycle/Navi/Paging/Work/Splash
37+
const val activityKtxVersion = "1.9.2"
38+
const val fragmentKtxVersion = "1.8.3"
39+
const val lifecycleVersion = "2.8.4"
40+
const val navigationVersion = "2.8.0"
41+
const val pagingVersion = "3.3.2"
42+
const val workManagerVersion = "2.9.1"
2543
const val splashVersion = "1.0.1"
26-
const val workManagerVersion = "2.8.1"
27-
const val coilVersion = "2.4.0"
28-
const val retrofitVersion = "2.9.0"
29-
const val kotlinSerializationConverterVersion = "1.0.0"
30-
const val okHttpVersion = "4.11.0"
44+
45+
// Coroutines
46+
const val coroutinesAndroidVersion = "1.9.0"
47+
48+
// Networking
49+
const val retrofitVersion = "2.11.0"
50+
const val kotlinSerializationConverterVersion = "1.0.0" // (JakeWharton) 최신 여전히 1.0.0
51+
const val okHttpVersion = "4.12.0" // OkHttp 5는 API 변화 큼 → 4.12 권장
52+
53+
// 이미지/애니메이션
54+
const val coilVersion = "2.6.0"
55+
const val lottieVersion = "6.4.1"
56+
57+
// 기타
3158
const val timberVersion = "5.0.1"
3259
const val progressViewVersion = "1.1.3"
3360
const val balloonVersion = "1.4.5"
34-
const val lottieVersion = "6.0.0"
3561
const val circularProgressBar = "3.1.0"
3662
const val kakaoVersion = "2.19.0"
37-
const val circleIndicatorVersion = "2.1.6"
38-
const val shimmerVersion = "0.5.0"
39-
const val navigationVersion = "2.6.0"
40-
const val amplitudeVersion = "2.23.2"
63+
const val amplitudeVersion = "2.23.2" // 프로젝트 요구 맞추되, 필요시 최신 확인
64+
65+
// 테스트
4166
const val junitVersion = "4.13.2"
42-
const val espressoVersion = "3.3.0"
43-
const val androidTestVersion = "1.1.2"
44-
const val flexboxVersion = "3.0.0"
45-
const val circleImageViewVersion = "3.1.0"
67+
const val espressoVersion = "3.6.1"
68+
const val androidTestVersion = "1.2.1" // androidx.test:runner / rules 세트 기준
69+
70+
// Java / JVM
71+
val javaVersion = JavaVersion.VERSION_21
72+
const val jvmVersion = "21"
4673

47-
val javaVersion = JavaVersion.VERSION_17
48-
const val jvmVersion = "17"
74+
// ▷ OSS Licenses
75+
const val ossPluginVersion = "0.10.6"
76+
const val ossVersion = "17.1.0"
4977
}

‎data/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies {
4949
ThirdPartyDependencies.run {
5050
implementation(retrofit)
5151
implementation(okHttp)
52-
implementation(okHttpBom)
52+
implementation(platform(okHttpBom))
5353
implementation(okHttpLoggingInterceptor)
5454
implementation(retrofitJsonConverter)
5555
implementation(timber)

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Dec 29 23:45:17 KST 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
54
zipStoreBase=GRADLE_USER_HOME
65
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)