diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d52c0b0d..bbeea0b9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,28 +22,33 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + // ๐Ÿ‘‡ ๊ณต์‹ API + providers ์‚ฌ์šฉ + val localProps = gradleLocalProperties(rootDir, providers) + buildConfigField( "String", "NATIVE_APP_KEY", - gradleLocalProperties(rootDir).getProperty("native.app.key"), + "\"${localProps.getProperty("native.app.key")}\"" ) - manifestPlaceholders["NATIVE_APP_KEY"] = - gradleLocalProperties(rootDir).getProperty("nativeAppKey") + // manifestPlaceholders๋Š” ๋ฌธ์ž์—ด ๊ทธ ์ž์ฒด๋ฅผ ๋„ฃ์œผ๋ฉด ๋จ(๋”ฐ์˜ดํ‘œ ๋ถˆํ•„์š”) + manifestPlaceholders["NATIVE_APP_KEY"] = localProps.getProperty("nativeAppKey") } buildTypes { debug { + val localProps = gradleLocalProperties(rootDir, providers) buildConfigField( "String", "BASE_URL", - gradleLocalProperties(rootDir).getProperty("test.base.url") + "\"${localProps.getProperty("test.base.url")}\"" ) } release { + val localProps = gradleLocalProperties(rootDir, providers) buildConfigField( "String", "BASE_URL", - gradleLocalProperties(rootDir).getProperty("base.url") + "\"${localProps.getProperty("base.url")}\"" ) isMinifyEnabled = false proguardFiles( diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt index 2c92e510..b706777c 100644 --- a/buildSrc/src/main/kotlin/Constants.kt +++ b/buildSrc/src/main/kotlin/Constants.kt @@ -1,8 +1,8 @@ object Constants { const val packageName = "com.going.doorip" - const val compileSdk = 34 + const val compileSdk = 35 const val minSdk = 28 - const val targetSdk = 34 - const val versionCode = 12 - const val versionName = "1.2" + const val targetSdk = 35 + const val versionCode = 14 + const val versionName = "1.4" } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1812a6e7..ac0f9493 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,49 +1,77 @@ import org.gradle.api.JavaVersion object Versions { - const val gradleVersion = "8.0.2" - - const val buildToolsVersion = "30.0.3" - const val kotlinVersion = "1.8.20" - const val kotlinSerializationJsonVersion = "1.5.1" - const val kotlinDateTimeVersion = "0.4.0" - const val coreKtxVersion = "1.10.1" - const val appCompatVersion = "1.6.1" - const val materialDesignVersion = "1.9.0" - const val constraintLayoutVersion = "2.1.4" + // AGP (com.android.tools.build:gradle) + // plugins { id("com.android.application") version "8.7.2" } ๋กœ ๋งž์ถฐ ์“ฐ๋Š” ๊ฑธ ๊ถŒ์žฅ + const val gradleVersion = "8.7.2" + + // buildToolsVersion๋Š” AGP 8.x๋ถ€ํ„ฐ ๋ช…์‹œ ๋ถˆํ•„์š”. ๊ทธ๋ž˜๋„ ์ƒ์ˆ˜ ์œ ์ง€ํ•˜๋ ค๋ฉด 35๋กœ. + const val buildToolsVersion = "35.0.0" + + // Kotlin + const val kotlinVersion = "1.9.24" + const val kotlinSerializationJsonVersion = "1.6.3" + const val kotlinDateTimeVersion = "0.6.1" // ์ตœ์‹ ๊ถŒ์žฅ + + // AndroidX core / appcompat / material + const val coreKtxVersion = "1.13.1" + const val appCompatVersion = "1.7.0" + const val materialDesignVersion = "1.12.0" + + // UI + const val constraintLayoutVersion = "2.1.4" // 2.2.0์€ ์•„์ง ์•ˆ์ •ํ™” ๋Œ€๊ธฐ + const val flexboxVersion = "3.0.0" + const val circleIndicatorVersion = "2.1.6" + const val circleImageViewVersion = "3.1.0" + const val shimmerVersion = "0.5.0" + + // App Startup / Legacy / Security const val appStartUpVersion = "1.1.1" const val legacySupportVersion = "1.0.0" - const val securityVersion = "1.1.0-alpha06" - const val hiltVersion = "2.46.1" - const val activityKtxVersion = "1.7.2" - const val fragmentKtxVersion = "1.5.7" - const val coroutinesAndroidVersion = "1.7.1" - const val pagingVersion = "3.1.1" - const val lifecycleVersion = "2.6.1" - const val ossPluginVersion = "0.10.4" - const val ossVersion = "17.0.0" + const val securityVersion = "1.1.0-alpha06" // ์•ˆ์ •ํŒ ๋Œ€์ฒด ์—†์œผ๋ฉด ์œ ์ง€ + + // Hilt (Dagger) + const val hiltVersion = "2.51.1" + + // Activity/Fragment/Lifecycle/Navi/Paging/Work/Splash + const val activityKtxVersion = "1.9.2" + const val fragmentKtxVersion = "1.8.3" + const val lifecycleVersion = "2.8.4" + const val navigationVersion = "2.8.0" + const val pagingVersion = "3.3.2" + const val workManagerVersion = "2.9.1" const val splashVersion = "1.0.1" - const val workManagerVersion = "2.8.1" - const val coilVersion = "2.4.0" - const val retrofitVersion = "2.9.0" - const val kotlinSerializationConverterVersion = "1.0.0" - const val okHttpVersion = "4.11.0" + + // Coroutines + const val coroutinesAndroidVersion = "1.9.0" + + // Networking + const val retrofitVersion = "2.11.0" + const val kotlinSerializationConverterVersion = "1.0.0" // (JakeWharton) ์ตœ์‹  ์—ฌ์ „ํžˆ 1.0.0 + const val okHttpVersion = "4.12.0" // OkHttp 5๋Š” API ๋ณ€ํ™” ํผ โ†’ 4.12 ๊ถŒ์žฅ + + // ์ด๋ฏธ์ง€/์• ๋‹ˆ๋ฉ”์ด์…˜ + const val coilVersion = "2.6.0" + const val lottieVersion = "6.4.1" + + // ๊ธฐํƒ€ const val timberVersion = "5.0.1" const val progressViewVersion = "1.1.3" const val balloonVersion = "1.4.5" - const val lottieVersion = "6.0.0" const val circularProgressBar = "3.1.0" const val kakaoVersion = "2.19.0" - const val circleIndicatorVersion = "2.1.6" - const val shimmerVersion = "0.5.0" - const val navigationVersion = "2.6.0" - const val amplitudeVersion = "2.23.2" + const val amplitudeVersion = "2.23.2" // ํ”„๋กœ์ ํŠธ ์š”๊ตฌ ๋งž์ถ”๋˜, ํ•„์š”์‹œ ์ตœ์‹  ํ™•์ธ + + // ํ…Œ์ŠคํŠธ const val junitVersion = "4.13.2" - const val espressoVersion = "3.3.0" - const val androidTestVersion = "1.1.2" - const val flexboxVersion = "3.0.0" - const val circleImageViewVersion = "3.1.0" + const val espressoVersion = "3.6.1" + const val androidTestVersion = "1.2.1" // androidx.test:runner / rules ์„ธํŠธ ๊ธฐ์ค€ + + // Java / JVM + val javaVersion = JavaVersion.VERSION_21 + const val jvmVersion = "21" - val javaVersion = JavaVersion.VERSION_17 - const val jvmVersion = "17" + // โ–ท OSS Licenses + const val ossPluginVersion = "0.10.6" + const val ossVersion = "17.1.0" } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 4e010569..6e72500e 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -49,7 +49,7 @@ dependencies { ThirdPartyDependencies.run { implementation(retrofit) implementation(okHttp) - implementation(okHttpBom) + implementation(platform(okHttpBom)) implementation(okHttpLoggingInterceptor) implementation(retrofitJsonConverter) implementation(timber) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 02222dac..e1adfb49 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Dec 29 23:45:17 KST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists