From 7125a4c18ba6c763e7833bed16c6bc2a1a353182 Mon Sep 17 00:00:00 2001 From: leeeha Date: Mon, 21 Oct 2024 22:19:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[del]=20#307=20=EB=AF=B8=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=20=EB=94=94=ED=8E=9C=EB=8D=98=EC=8B=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 16 +------------ .../response/ResponseGetNotificationDto.kt | 2 +- build.gradle.kts | 4 +--- buildSrc/src/main/java/Dependencies.kt | 23 ++----------------- buildSrc/src/main/java/Plugins.kt | 6 ++--- buildSrc/src/main/java/Versions.kt | 14 ++--------- 6 files changed, 9 insertions(+), 56 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c11105d4..41a29a49 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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) } @@ -95,12 +94,10 @@ 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) @@ -108,8 +105,6 @@ dependencies { implementation(lifecycleService) implementation(splashScreen) implementation(pagingRuntime) - implementation(workManager) - implementation(hiltWorkManager) implementation(exif) implementation(dataStore) implementation(dataStoreCore) @@ -123,12 +118,10 @@ dependencies { KaptDependencies.run { kapt(hiltAndroidCompiler) - kapt(hiltWorkManagerCompiler) } GoogleDependencies.run { implementation(materialDesign) - implementation(ossLicense) implementation(inAppUpdate) implementation(inAppUpdateKtx) } @@ -142,16 +135,10 @@ 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 { @@ -159,6 +146,5 @@ dependencies { implementation(messaging) implementation(analytics) implementation(crashlytics) - implementation(remoteConfig) } } diff --git a/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt index b434a516..ada56bb9 100644 --- a/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt @@ -37,7 +37,7 @@ data class ResponseGetNotificationDto( notiType = data.notiType, isChecked = data.isChecked, timeAgo = data.timeAgo, - linkId = data.linkId ?: null + linkId = data.linkId ) } } diff --git a/build.gradle.kts b/build.gradle.kts index c6b2541c..789db823 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,9 +8,8 @@ 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) } } @@ -18,7 +17,6 @@ buildscript { 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 { diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 9f94dcb7..ffee8fc3 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -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}" @@ -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}" @@ -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}" } @@ -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" } diff --git a/buildSrc/src/main/java/Plugins.kt b/buildSrc/src/main/java/Plugins.kt index b8a3b271..f2adf489 100644 --- a/buildSrc/src/main/java/Plugins.kt +++ b/buildSrc/src/main/java/Plugins.kt @@ -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}" } @@ -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" } diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 0a212d9a..9f8cca17 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -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" @@ -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 From 30570398215bc441ea8b947b0475213c8ea11401 Mon Sep 17 00:00:00 2001 From: leeeha Date: Tue, 22 Oct 2024 17:56:19 +0900 Subject: [PATCH 2/2] [chore] #305 target sdk, agp version upgrade - targetSdk: 33 -> 34 - agp: 8.0.2 -> 8.1.1 --- buildSrc/src/main/java/DefaultConfig.kt | 8 ++++---- buildSrc/src/main/java/Versions.kt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/java/DefaultConfig.kt b/buildSrc/src/main/java/DefaultConfig.kt index 8eda37a4..bab524d9 100644 --- a/buildSrc/src/main/java/DefaultConfig.kt +++ b/buildSrc/src/main/java/DefaultConfig.kt @@ -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" } diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 9f8cca17..4e6499a1 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -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"