chore: Gradle 업데이트, rebase

CheoCharm · Nov 15, 2023 · 3838e1f · 3838e1f
1 parent efa2a50
commit 3838e1f
Show file tree

Hide file tree

Showing 39 changed files with 257 additions and 69 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,12 +6,14 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    namespace = "com.cheocharm.mapz"
+
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.cheocharm.mapz"
         minSdk 23
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -25,11 +27,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     dataBinding {

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.1.3' apply false
+    id 'com.android.library' version '8.1.3' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
     id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
-    id 'com.google.dagger.hilt.android' version '2.42' apply false
+    id 'com.google.dagger.hilt.android' version '2.48.1' apply false
     id 'androidx.navigation.safeargs.kotlin' version "${navVersion}" apply false
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/data/build.gradle b/data/build.gradle
@@ -5,8 +5,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/data/src/main/java/com/cheocharm/data/di/RepositoryModule.kt b/data/src/main/java/com/cheocharm/data/di/RepositoryModule.kt
@@ -4,10 +4,12 @@ import com.cheocharm.data.repository.AuthRepositoryImpl
 import com.cheocharm.data.repository.GroupRepositoryImpl
 import com.cheocharm.data.repository.LoginRepositoryImpl
 import com.cheocharm.data.repository.MyGroupsRepositoryImpl
+import com.cheocharm.data.repository.WriteRepositoryImpl
 import com.cheocharm.domain.repository.AuthRepository
 import com.cheocharm.domain.repository.GroupRepository
 import com.cheocharm.domain.repository.LoginRepository
 import com.cheocharm.domain.repository.MyGroupsRepository
+import com.cheocharm.domain.repository.WriteRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -33,4 +35,8 @@ internal abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindMyGroupsRepository(repo: MyGroupsRepositoryImpl): MyGroupsRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindWriteRepository(repository: WriteRepositoryImpl): WriteRepository
 }
diff --git a/data/src/main/java/com/cheocharm/data/error/ErrorData.kt b/data/src/main/java/com/cheocharm/data/error/ErrorData.kt
@@ -15,4 +15,7 @@ sealed class ErrorData(
     data class SearchGroupUnavailable(override val message: String) : ErrorData(message)
     data class JoinGroupUnavailable(override val message: String) : ErrorData(message)
     data class GetMyGroupsUnavailable(override val message: String) : ErrorData(message)
+
+    data class WriteImagesUnavailable(override val message: String) : ErrorData(message)
+    data class WriteDiaryUnavailable(override val message: String) : ErrorData(message)
 }
diff --git a/data/src/main/java/com/cheocharm/data/error/ErrorMapper.kt b/data/src/main/java/com/cheocharm/data/error/ErrorMapper.kt
@@ -13,4 +13,6 @@ internal fun ErrorData.toDomain(): Error = when (this) {
     is ErrorData.SearchGroupUnavailable -> Error.SearchGroupUnavailable(message)
     is ErrorData.JoinGroupUnavailable -> Error.JoinGroupUnavailable(message)
     is ErrorData.GetMyGroupsUnavailable -> Error.GetMyGroupsUnavailable(message)
+    is ErrorData.WriteImagesUnavailable -> Error.WriteImagesUnavailable(message)
+    is ErrorData.WriteDiaryUnavailable -> Error.WriteDiaryUnavailable(message)
 }
diff --git a/domain/build.gradle b/domain/build.gradle
@@ -4,8 +4,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/domain/src/main/java/com/cheocharm/domain/model/Error.kt b/domain/src/main/java/com/cheocharm/domain/model/Error.kt
@@ -15,4 +15,7 @@ sealed class Error(
     data class SearchGroupUnavailable(override val message: String) : Error()
     data class JoinGroupUnavailable(override val message: String) : Error()
     data class GetMyGroupsUnavailable(override val message: String) : Error()
+
+    data class WriteImagesUnavailable(override val message: String) : Error()
+    data class WriteDiaryUnavailable(override val message: String) : Error()
 }
diff --git a/gradle.properties b/gradle.properties
@@ -21,12 +21,13 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
 
-coreKtxVersion=1.9.0
+coreKtxVersion=1.12.0
 junitVersion=1.1.5
 espressoCoreVersion=3.5.1
-navVersion=2.5.3
-hiltVersion=2.42
+navVersion=2.7.5
+hiltVersion=2.48.1
 coroutineVersion=1.6.3
 glideVersion=4.12.0
-pagingVersion=3.1.1
+pagingVersion=3.2.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 23 23:15:00 KST 2022
+#Wed Nov 15 11:07:58 KST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/local/build.gradle b/local/build.gradle
@@ -5,11 +5,13 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    namespace = "com.cheocharm.local"
+
+    compileSdk 34
 
     defaultConfig {
         minSdk 23
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -22,11 +24,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 

diff --git a/local/src/main/AndroidManifest.xml b/local/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cheocharm.local">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -11,11 +11,13 @@ Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
 android {
-    compileSdk 33
+    namespace = "com.cheocharm.presentation"
+
+    compileSdk 34
 
     defaultConfig {
         minSdk 23
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -30,15 +32,15 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 }
 
@@ -47,7 +49,7 @@ dependencies {
 
     implementation "androidx.core:core-ktx:$coreKtxVersion"
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.exifinterface:exifinterface:1.3.6'
     testImplementation 'junit:junit:4.13.2'
@@ -60,14 +62,14 @@ dependencies {
 
     // Hilt
     implementation "com.google.dagger:hilt-android:$hiltVersion"
-    implementation "androidx.hilt:hilt-navigation-fragment:1.0.0"
+    implementation "androidx.hilt:hilt-navigation-fragment:1.1.0"
     kapt "com.google.dagger:hilt-android-compiler:$hiltVersion"
 
     // Google Maps
-    implementation 'com.google.android.gms:play-services-maps:18.1.0'
+    implementation 'com.google.android.gms:play-services-maps:18.2.0'
 
     // google login
-    implementation 'com.google.android.gms:play-services-auth:20.4.1'
+    implementation 'com.google.android.gms:play-services-auth:20.7.0'
 
     // kotlin coroutine
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion"
@@ -78,8 +80,14 @@ dependencies {
     kapt "com.github.bumptech.glide:compiler:$glideVersion"
 
     // paging
-    implementation "androidx.paging:paging-runtime:$pagingVersion"
+    implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
 
     // SwipeRefreshLayout
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+
+    // 현재 위치
+    implementation 'com.google.android.gms:play-services-location:21.0.1'
+
+    // Text editor
+    implementation 'jp.wasabeef:richeditor-android:2.0.0'
 }
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cheocharm.presentation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data

diff --git a/presentation/src/main/java/com/cheocharm/presentation/common/Event.kt b/presentation/src/main/java/com/cheocharm/presentation/common/Event.kt
@@ -57,8 +57,8 @@ open class Event<out T>(private val content: T) {
  * [onEventUnhandledContent] is *only* called if the [Event]'s contents has not been handled.
  */
 class EventObserver<T>(private val onEventUnhandledContent: (T) -> Unit) : Observer<Event<T>> {
-    override fun onChanged(event: Event<T>?) {
-        event?.getContentIfNotHandled()?.let {
+    override fun onChanged(value: Event<T>) {
+        value.getContentIfNotHandled()?.let {
             onEventUnhandledContent(it)
         }
     }

diff --git a/presentation/src/main/java/com/cheocharm/presentation/common/TestValues.kt b/presentation/src/main/java/com/cheocharm/presentation/common/TestValues.kt
@@ -7,6 +7,7 @@ import com.cheocharm.presentation.model.Sticker
 object TestValues {
     val testGroups = listOf(
         Group(
+            0,
             "그룹제목 1",
             "맵지 고등학교 추억 교환일기!",
             "2022.02.23",
@@ -22,13 +23,15 @@ object TestValues {
             ), 4
         ),
         Group(
+            1,
             "그룹제목 2", "맵지 고등학교 추억 교환일기!",
             "2022.02.23",
             listOf(
                 GroupMember(), GroupMember(), GroupMember()
             ), 0
         ),
         Group(
+            2,
             "그룹제목 3", "맵지 고등학교 추억 교환일기!",
             "2022.02.23",
             listOf(

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/MainActivity.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/MainActivity.kt
@@ -3,15 +3,15 @@ package com.cheocharm.presentation.ui
 import android.content.Context
 import android.graphics.Rect
 import android.os.Bundle
-import androidx.core.view.isVisible
 import android.view.MotionEvent
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
+import androidx.core.view.isVisible
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
-import com.cheocharm.presentation.base.BaseActivity
 import com.cheocharm.presentation.R
+import com.cheocharm.presentation.base.BaseActivity
 import com.cheocharm.presentation.databinding.ActivityMainBinding
 import dagger.hilt.android.AndroidEntryPoint
 

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/home/HomeFragment.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/home/HomeFragment.kt
@@ -4,8 +4,8 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
-import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.R
+import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.databinding.FragmentHomeBinding
 import com.cheocharm.presentation.ui.MainActivity
 import dagger.hilt.android.AndroidEntryPoint

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignActivity.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignActivity.kt
@@ -7,8 +7,8 @@ import android.view.MotionEvent
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.navigation.fragment.NavHostFragment
-import com.cheocharm.presentation.base.BaseActivity
 import com.cheocharm.presentation.R
+import com.cheocharm.presentation.base.BaseActivity
 import com.cheocharm.presentation.databinding.ActivitySignInBinding
 import dagger.hilt.android.AndroidEntryPoint
 

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignInFragment.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignInFragment.kt
@@ -12,9 +12,9 @@ import androidx.core.os.bundleOf
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
-import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.BuildConfig
 import com.cheocharm.presentation.R
+import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.common.EventObserver
 import com.cheocharm.presentation.common.GOOGLE_ID_TOKEN
 import com.cheocharm.presentation.common.SIGN_UP_TYPE

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignUpAgreeFragment.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignUpAgreeFragment.kt
@@ -5,8 +5,8 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.R
+import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.common.GOOGLE_ID_TOKEN
 import com.cheocharm.presentation.common.SIGN_UP_TYPE
 import com.cheocharm.presentation.databinding.FragmentSignUpAgreeBinding

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignUpFragment.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignUpFragment.kt
@@ -11,8 +11,8 @@ import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.R
+import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.databinding.FragmentSignUpBinding
 import dagger.hilt.android.AndroidEntryPoint
 

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignUpProfileFragment.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/login/SignUpProfileFragment.kt
@@ -16,10 +16,10 @@ import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.R
-import com.cheocharm.presentation.util.UriUtil
+import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.databinding.FragmentSignUpProfileBinding
+import com.cheocharm.presentation.util.UriUtil
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint

diff --git a/presentation/src/main/java/com/cheocharm/presentation/ui/mypage/MyPageFragment.kt b/presentation/src/main/java/com/cheocharm/presentation/ui/mypage/MyPageFragment.kt
@@ -5,9 +5,9 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
-import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.BuildConfig
 import com.cheocharm.presentation.R
+import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.databinding.FragmentMyPageBinding
 import com.cheocharm.presentation.ui.MainActivity
 import com.cheocharm.presentation.ui.login.SignActivity