[#17] 통신을 위한 네트워크 관련 베이스 코드 작성

- 코루틴 버전 1.6.0 적용
MoyeoRun · Apr 25, 2022 · 2878873 · 2878873
1 parent 35bf843
commit 2878873
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -77,6 +77,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
+    // Firebase
     implementation platform('com.google.firebase:firebase-bom:29.2.0')
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'com.google.firebase:firebase-crashlytics-ktx'
@@ -88,4 +89,11 @@ dependencies {
     // Glide
     implementation "com.github.bumptech.glide:glide:$glide_version"
     annotationProcessor "com.github.bumptech.glide:compiler:$glide_version"
+
+    // Retrofit2
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+
+    // Coroutine
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,12 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.moyerun.moyeorun_android">
 
-<<<<<<< HEAD
-    <uses-permission android:name="android.permission.INTERNET" />
-=======
     <uses-permission android:name="android.permission.INTERNET"/>
 
->>>>>>> [#17] 통신을 위한 네트워크 관련 베이스 코드 작성
     <application
         android:name=".MoyeoRunApplication"
         android:allowBackup="true"

diff --git a/...main/java/com/moyerun/moyeorun_android/network/calladapter/ApiResultCallAdapterFactory.kt b/...main/java/com/moyerun/moyeorun_android/network/calladapter/ApiResultCallAdapterFactory.kt
@@ -1,7 +1,5 @@
-package com.moyerun.moyeorun_android.network.calladapter
+package com.moyerun.moyeorun_android.network.callAdapter
 
-import com.moyerun.moyeorun_android.network.callAdapter.ApiResult
-import com.moyerun.moyeorun_android.network.callAdapter.ApiResultCallAdapter
 import retrofit2.Call
 import retrofit2.CallAdapter
 import retrofit2.Retrofit

diff --git a/app/src/main/java/com/moyerun/moyeorun_android/network/client/Retrofit.kt b/app/src/main/java/com/moyerun/moyeorun_android/network/client/Retrofit.kt
@@ -1,6 +1,6 @@
 package com.moyerun.moyeorun_android.network.client
 
-import com.moyerun.moyeorun_android.network.calladapter.ApiResultCallAdapterFactory
+import com.moyerun.moyeorun_android.network.callAdapter.ApiResultCallAdapterFactory
 import com.moyerun.moyeorun_android.network.api.ApiService
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory