From a22f2c67f5eb7baa543ac6450f9dd7f7b31d9e52 Mon Sep 17 00:00:00 2001 From: KIM SEONGGYU Date: Tue, 13 Apr 2021 16:48:21 +0900 Subject: [PATCH 1/3] feat: Change BaseUrl BaseUrl is seperated into SecretStrings.kt but this is included in gitignore. --- .gitignore | 3 +++ .../main/java/com/stormers/storm/network/RetrofitClient.kt | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b8d3326b..580b757a 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,6 @@ fabric.properties /app/google-services.json ### key keystores/ + +# SecretStrings. ex) baseUrl +app/src/main/java/com/stormers/storm/SecretStrings.kt diff --git a/app/src/main/java/com/stormers/storm/network/RetrofitClient.kt b/app/src/main/java/com/stormers/storm/network/RetrofitClient.kt index 3d0566dc..d01ade82 100644 --- a/app/src/main/java/com/stormers/storm/network/RetrofitClient.kt +++ b/app/src/main/java/com/stormers/storm/network/RetrofitClient.kt @@ -1,12 +1,11 @@ package com.stormers.storm.network -import com.stormers.storm.ui.LoginActivity +import com.stormers.storm.SecretStrings import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory -import retrofit2.create object RetrofitClient { - private const val BASE_URL = "http://3.34.179.75:3000" + private const val BASE_URL = SecretStrings.BASE_URL private fun getInstance() : Retrofit { return Retrofit.Builder() From 591eaa5aca9df0c458035917121ead15726b3abe Mon Sep 17 00:00:00 2001 From: KIM SEONGGYU Date: Tue, 13 Apr 2021 16:48:47 +0900 Subject: [PATCH 2/3] fix: Fix OkHttp IllegalStateException https://publicobject.com/2020/02/25/okhttp-restricted-apis/ --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 601773d7..643dfaa5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,7 +86,7 @@ dependencies { //Retrofit2 implementation 'com.google.code.gson:gson:2.8.6' - implementation 'com.squareup.retrofit2:retrofit:2.7.1' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.7.1' //평화랑 겹칠 수 있음 둘 중 하나 지우기 From 57bda32f00d7a728c26d47b29c568f114066f594 Mon Sep 17 00:00:00 2001 From: KIM SEONGGYU Date: Tue, 13 Apr 2021 16:49:00 +0900 Subject: [PATCH 3/3] chore: Change versionCode --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2d3ae286..d774582d 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,8 @@ buildscript { } project.ext { - versionCode = 2 - versionName = "1.1.1" + versionCode = 3 + versionName = "1.1.2" compileSdkVersion = 30 targetSdkVersion = 30