Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] 타겟 api level 34로 변경 #309

Merged
merged 2 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ plugins {
id(ModulePlugins.kotlinKapt)
id(ModulePlugins.kotlinSerialization)
id(ModulePlugins.hilt)
id(ModulePlugins.oss)
id(ModulePlugins.googleService)
id(ModulePlugins.firebaseAppdistribution)
id(ModulePlugins.firebaseAppDistribution)
id(ModulePlugins.firebaseCrashlytics)
}

Expand Down Expand Up @@ -95,21 +94,17 @@ dependencies {
implementation(appCompat)
implementation(constraintLayout)
implementation(swipeRefreshLayout)
implementation(startup)
implementation(hilt)
implementation(activity)
implementation(fragment)
implementation(legacy)
implementation(security)
implementation(lifecycleKtx)
implementation(lifecycleLiveDataKtx)
implementation(lifecycleViewModelKtx)
implementation(lifecycleJava8)
implementation(lifecycleService)
implementation(splashScreen)
implementation(pagingRuntime)
implementation(workManager)
implementation(hiltWorkManager)
implementation(exif)
implementation(dataStore)
implementation(dataStoreCore)
Expand All @@ -123,12 +118,10 @@ dependencies {

KaptDependencies.run {
kapt(hiltAndroidCompiler)
kapt(hiltWorkManagerCompiler)
}

GoogleDependencies.run {
implementation(materialDesign)
implementation(ossLicense)
implementation(inAppUpdate)
implementation(inAppUpdateKtx)
}
Expand All @@ -142,23 +135,16 @@ dependencies {
implementation(retrofitJsonConverter)
implementation(timber)
implementation(progressView)
implementation(balloon)
implementation(lottie)
implementation(circleImageView)
implementation(kakaoLogin)
implementation(amplitude)

debugImplementation(flipper)
debugImplementation(flipperNetwork)
debugImplementation(flipperLeakCanary)
debugImplementation(soloader)
}

FirebaseDependencies.run {
implementation(platform(bom))
implementation(messaging)
implementation(analytics)
implementation(crashlytics)
implementation(remoteConfig)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ data class ResponseGetNotificationDto(
notiType = data.notiType,
isChecked = data.isChecked,
timeAgo = data.timeAgo,
linkId = data.linkId ?: null
linkId = data.linkId
)
}
}
4 changes: 1 addition & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ buildscript {
classpath(ClassPathPlugins.gradle)
classpath(ClassPathPlugins.kotlinGradlePlugin)
classpath(ClassPathPlugins.hilt)
classpath(ClassPathPlugins.oss)
classpath(ClassPathPlugins.googleService)
classpath(ClassPathPlugins.firebaseAppdistribution)
classpath(ClassPathPlugins.firebaseAppDistribution)
classpath(ClassPathPlugins.firebaseCrashlytics)
}
}

plugins {
id(ProjectPlugins.ktlint) version Versions.ktlintVersion
id(ProjectPlugins.kotlinSerialization) version Versions.kotlinVersion
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
}

allprojects {
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/src/main/java/DefaultConfig.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
object DefaultConfig {
const val packageName = "org.go.sopt.winey"
const val compileSdk = 33
const val compileSdk = 34
const val minSdk = 28
const val targetSdk = 33
const val versionCode = 32
const val versionName = "1.1.0"
const val targetSdk = 34
const val versionCode = 33
const val versionName = "1.1.1"
}
23 changes: 2 additions & 21 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ object AndroidXDependencies {
const val constraintLayout =
"androidx.constraintlayout:constraintlayout:${Versions.constraintLayoutVersion}"
const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:${Versions.swipeRefreshLayoutVersion}"
const val startup = "androidx.startup:startup-runtime:${Versions.appStartUpVersion}"
const val hilt = "com.google.dagger:hilt-android:${Versions.hiltVersion}"
const val activity = "androidx.activity:activity-ktx:${Versions.activityKtxVersion}"
const val fragment = "androidx.fragment:fragment-ktx:${Versions.fragmentKtxVersion}"
const val legacy = "androidx.legacy:legacy-support-v4:${Versions.legacySupportVersion}"
const val security = "androidx.security:security-crypto:${Versions.securityVersion}"
const val lifecycleKtx = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycleVersion}"
const val lifecycleLiveDataKtx =
"androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycleVersion}"
Expand All @@ -28,12 +26,8 @@ object AndroidXDependencies {
"androidx.lifecycle:lifecycle-common-java8:${Versions.lifecycleVersion}"
const val lifecycleService =
"androidx.lifecycle:lifecycle-service:${Versions.lifecycleVersion}"
const val ossLicense =
"com.google.android.gms:play-services-oss-licenses:${Versions.ossVersion}"
const val splashScreen = "androidx.core:core-splashscreen:${Versions.splashVersion}"
const val pagingRuntime = "androidx.paging:paging-runtime:${Versions.pagingVersion}"
const val workManager = "androidx.work:work-runtime-ktx:${Versions.workManagerVersion}"
const val hiltWorkManager = "androidx.hilt:hilt-work:1.0.0"
const val exif = "androidx.exifinterface:exifinterface:${Versions.exifVersion}"
const val dataStore = "androidx.datastore:datastore-preferences:${Versions.dataStoreVersion}"
const val dataStoreCore = "androidx.datastore:datastore-preferences-core:${Versions.dataStoreVersion}"
Expand All @@ -47,14 +41,11 @@ object TestDependencies {

object KaptDependencies {
const val hiltAndroidCompiler = "com.google.dagger:hilt-android-compiler:${Versions.hiltVersion}"
const val hiltWorkManagerCompiler = "androidx.hilt:hilt-compiler:1.0.0"
}

object GoogleDependencies {
const val materialDesign =
"com.google.android.material:material:${Versions.materialDesignVersion}"
const val ossLicense =
"com.google.android.gms:play-services-oss-licenses:${Versions.ossVersion}"
const val inAppUpdate = "com.google.android.play:app-update:${Versions.inAppUpdateVersion}"
const val inAppUpdateKtx = "com.google.android.play:app-update-ktx:${Versions.inAppUpdateVersion}"
}
Expand All @@ -69,25 +60,15 @@ object ThirdPartyDependencies {
"com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:${Versions.kotlinSerializationConverterVersion}"
const val timber = "com.jakewharton.timber:timber:${Versions.timberVersion}"
const val progressView = "com.github.skydoves:progressview:${Versions.progressViewVersion}"
const val balloon = "com.github.skydoves:balloon:${Versions.balloonVersion}"
const val lottie = "com.airbnb.android:lottie:${Versions.lottieVersion}"
const val flipper = "com.facebook.flipper:flipper:${Versions.flipperVersion}"
const val flipperNetwork =
"com.facebook.flipper:flipper-network-plugin:${Versions.flipperVersion}"
const val flipperLeakCanary =
"com.facebook.flipper:flipper-leakcanary2-plugin:${Versions.flipperVersion}"
const val leakCanary =
"com.squareup.leakcanary:leakcanary-android:${Versions.leakCanaryVersion}"
const val soloader = "com.facebook.soloader:soloader:${Versions.soloaderVersion}"
const val circleImageView = "de.hdodenhof:circleimageview:${Versions.circleImageViewVersion}"
const val kakaoLogin = "com.kakao.sdk:v2-user:${Versions.kakaoLoginVersion}"
const val amplitude = "com.amplitude:android-sdk:${Versions.amplitudeVersion}"
}

object FirebaseDependencies {
const val bom = "com.google.firebase:firebase-bom:32.2.0"
const val bom = "com.google.firebase:firebase-bom:${Versions.firabaseBomVersion}"
const val messaging = "com.google.firebase:firebase-messaging-ktx"
const val crashlytics = "com.google.firebase:firebase-crashlytics-ktx"
const val analytics = "com.google.firebase:firebase-analytics-ktx"
const val remoteConfig = "com.google.firebase:firebase-config-ktx"
const val crashlytics = "com.google.firebase:firebase-crashlytics-ktx"
}
6 changes: 2 additions & 4 deletions buildSrc/src/main/java/Plugins.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ object ClassPathPlugins {
const val gradle = "com.android.tools.build:gradle:${Versions.gradleVersion}"
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}"
const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hiltVersion}"
const val oss = "com.google.android.gms:oss-licenses-plugin:${Versions.ossPluginVersion}"
const val googleService = "com.google.gms:google-services:${Versions.googleServiceVersion}"
const val firebaseAppdistribution = "com.google.firebase:firebase-appdistribution-gradle:${Versions.firebaseAppdistributionVersion}"
const val firebaseAppDistribution = "com.google.firebase:firebase-appdistribution-gradle:${Versions.firebaseAppDistributionVersion}"
const val firebaseCrashlytics = "com.google.firebase:firebase-crashlytics-gradle:${Versions.firebaseCrashlyticsVersion}"
}

Expand All @@ -20,8 +19,7 @@ object ModulePlugins {
const val kotlinParcelize = "kotlin-parcelize"
const val kotlinSerialization = "kotlinx-serialization"
const val hilt = "dagger.hilt.android.plugin"
const val oss = "com.google.android.gms.oss-licenses-plugin"
const val googleService = "com.google.gms.google-services"
const val firebaseAppdistribution = "com.google.firebase.appdistribution"
const val firebaseAppDistribution = "com.google.firebase.appdistribution"
const val firebaseCrashlytics = "com.google.firebase.crashlytics"
}
16 changes: 3 additions & 13 deletions buildSrc/src/main/java/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.gradle.api.JavaVersion

object Versions {
const val gradleVersion = "8.0.2"
const val gradleVersion = "8.1.1"
const val kotlinVersion = "1.8.20"
const val kotlinSerializationJsonVersion = "1.5.1"
const val kotlinDateTimeVersion = "0.4.0"
Expand All @@ -11,23 +11,17 @@ object Versions {
const val appCompatVersion = "1.6.1"
const val constraintLayoutVersion = "2.1.4"
const val swipeRefreshLayoutVersion = "1.1.0"
const val appStartUpVersion = "1.1.1"
const val legacySupportVersion = "1.0.0"
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 securityVersion = "1.0.0"
const val lifecycleVersion = "2.6.1"
const val splashVersion = "1.0.1"
const val workManagerVersion = "2.8.1"
const val exifVersion = "1.3.2"
const val dataStoreVersion = "1.0.0"

const val materialDesignVersion = "1.6.1"
const val ossPluginVersion = "0.10.4"
const val ossVersion = "17.0.0"
const val inAppUpdateVersion = "2.1.0"

const val coilVersion = "2.4.0"
Expand All @@ -36,18 +30,14 @@ object Versions {
const val okHttpVersion = "4.11.0"
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 flipperVersion = "0.193.0"
const val soloaderVersion = "0.10.5"
const val leakCanaryVersion = "2.11"
const val circleImageViewVersion = "3.1.0"
const val kakaoLoginVersion = "2.10.0"
const val amplitudeVersion = "2.34.0"

const val firabaseVersion = "30.4.0"
const val firabaseBomVersion = "32.2.0"
const val googleServiceVersion = "4.3.15"
const val firebaseAppdistributionVersion = "4.0.0"
const val firebaseAppDistributionVersion = "4.0.0"
const val firebaseCrashlyticsVersion = "2.9.7"

val javaVersion = JavaVersion.VERSION_17
Expand Down
Loading