diff --git a/README.md b/README.md
index b43de1f..34e5e5d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 20th-Android-Team-1-FE 플랜즈
+# 정말 편리한 약속잡기, 관리 서비스 플랜즈
![screen1](https://user-images.githubusercontent.com/33443660/183038971-0e87d601-16d9-485a-857e-031ae9fa285e.png)
@@ -43,3 +43,8 @@
![image](https://user-images.githubusercontent.com/33443660/183053485-631a62f7-1422-479b-88d5-5a1860472a13.png)
- 100 % Jetpack Compose
- Coroutines
+
+
+
+ ## 저희는 [YAPP](https://www.yapp.co.kr) Android 1팀에서 시작된 프로젝트예요!
+ 🙋♀️ 출시까지의 Android 파트 여정이 궁금하신 분들은 [여기](https://github.com/YAPP-Github/20th-Android-Team-1-FE)로 오시면 보실 수 있을 거예요! :)
diff --git a/build.gradle.kts b/build.gradle.kts
index a14c5cf..da4b4af 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath(ProjectDependencies.ANDROID_BUILD_TOOL)
+ classpath(ProjectDependencies.ANDROID_GRADLE_PLUGIN)
classpath(ProjectDependencies.KOTLIN_GRADLE_PLUGIN)
classpath(ProjectDependencies.HILT_GRADLE_PLUGIN)
classpath(ProjectDependencies.FIREBASE_CRASHLYTICS)
diff --git a/buildSrc/src/main/java/ProjectDependencies.kt b/buildSrc/src/main/java/ProjectDependencies.kt
index 55b49a5..c77fe44 100644
--- a/buildSrc/src/main/java/ProjectDependencies.kt
+++ b/buildSrc/src/main/java/ProjectDependencies.kt
@@ -1,5 +1,5 @@
object ProjectDependencies {
- const val ANDROID_BUILD_TOOL = "com.android.tools.build:gradle:${Versions.ANDROID_BUILD_TOOL}"
+ const val ANDROID_GRADLE_PLUGIN = "com.android.tools.build:gradle:${Versions.ANDROID_GRADLE_PLUGIN}"
const val KOTLIN_GRADLE_PLUGIN = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KOTLIN}"
const val HILT_GRADLE_PLUGIN = "com.google.dagger:hilt-android-gradle-plugin:${Versions.HILT}"
const val GOOGLE_SERVICE = "com.google.gms:google-services:${Versions.GOOGLE_SERVICE}"
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index 07dd2eb..a9fbf37 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -3,7 +3,7 @@ object Versions {
const val ACCOMPANIST_PAGER = "0.24.12-rc"
const val ACCOMPANIST_SYSTEM_UI_CONTROLLER = "0.24.12-rc"
const val ANDROID_APP_COMPAT = "1.4.1"
- const val ANDROID_BUILD_TOOL = "7.2.1"
+ const val ANDROID_GRADLE_PLUGIN = "7.3.1"
const val ANDROID_CORE = "1.7.0"
const val COIL = "1.4.0"
const val COMPOSE = "1.2.0"
@@ -13,7 +13,7 @@ object Versions {
const val COMPOSE_NAVIGATION = "2.5.0"
const val FIREBASE_BOM = "30.3.1"
const val FIREBASE_CRASHLYTICS = "2.9.1"
- const val GOOGLE_SERVICE = "4.3.10"
+ const val GOOGLE_SERVICE = "4.3.14"
const val HILT = "2.42"
const val HILT_ANDROID = "1.0.0-beta01"
const val JUNIT = "4.13.2"
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 0fdeb85..9a327ed 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -10,15 +10,10 @@ plugins {
android {
compileSdk = Configs.COMPILE_SDK
-
defaultConfig {
minSdk = Configs.MIN_SDK
targetSdk = Configs.TARGET_SDK
}
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- }
kotlinOptions {
jvmTarget = "1.8"
}
diff --git a/domain/src/main/java/com/yapp/growth/domain/NetworkResult.kt b/domain/src/main/java/com/yapp/growth/domain/NetworkResult.kt
index 28875b2..979b2ec 100644
--- a/domain/src/main/java/com/yapp/growth/domain/NetworkResult.kt
+++ b/domain/src/main/java/com/yapp/growth/domain/NetworkResult.kt
@@ -59,7 +59,7 @@ inline fun NetworkResult.mapCatching(transform: (T) -> R): NetworkResu
is NetworkResult.Loading -> NetworkResult.Loading
}
-inline fun NetworkResult.zip(other: R): NetworkResult> =
+fun NetworkResult.zip(other: R): NetworkResult> =
when (this) {
is NetworkResult.Success -> NetworkResult.Success(data to other)
is NetworkResult.Error -> NetworkResult.Error(this.exception)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0a9f36c..734f629 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Mon May 16 22:48:54 KST 2022
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
index 57e9acd..9fafe03 100644
--- a/presentation/build.gradle.kts
+++ b/presentation/build.gradle.kts
@@ -17,7 +17,6 @@ android {
defaultConfig {
minSdk = Configs.MIN_SDK
targetSdk = Configs.TARGET_SDK
-
vectorDrawables {
useSupportLibrary = true
}