From f0efdf90ff00ce55b60f41cda4b2fe41a7342b52 Mon Sep 17 00:00:00 2001 From: Son Myeongji Date: Mon, 25 Mar 2024 17:00:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20baseURL=20=EC=88=A8=EA=B9=80=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android.yml | 2 ++ app/build.gradle | 1 + .../android/youdongknowme/standard/network/RetrofitObject.kt | 4 +--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index a64efc37..802cadb6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -27,3 +27,5 @@ jobs: echo API_KEY=\"$API_KEY\" > ./local.properties - name: Build with Gradle run: ./gradlew build + env: + BASE_URL: ${{ secrets.BASE_URL }} diff --git a/app/build.gradle b/app/build.gradle index 45671f18..58f92497 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,6 +19,7 @@ android { versionName "1.0.3" buildConfigField "String", "API_KEY", properties['API_KEY'] + buildConfigField "String", "BASE_URL", properties['BASE_URL'] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt index c4f1d108..ecf3bbd4 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt @@ -12,8 +12,6 @@ object RetrofitObject { private const val TIME_OUT_COUNT: Long = 10 fun getNetwork(): Retrofit { - val baseUrl = "http://43.200.194.238:8080/" - val baseInterceptor = Interceptor { chain -> val request = chain.request().newBuilder() val originalHttpUrl = chain.request().url @@ -33,7 +31,7 @@ object RetrofitObject { }).build() return Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(BuildConfig.BASE_URL) .addConverterFactory(GsonConverterFactory.create()) .client(client) .build() From 0698022abe112882f3b94ed1a47a19aad83dc2fb Mon Sep 17 00:00:00 2001 From: Son Myeongji Date: Mon, 25 Mar 2024 17:18:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20CI=EC=97=90=20=EB=A7=89=ED=9E=8C?= =?UTF-8?q?=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 802cadb6..1d2e158e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -26,6 +26,7 @@ jobs: run: echo API_KEY=\"$API_KEY\" > ./local.properties - name: Build with Gradle - run: ./gradlew build env: BASE_URL: ${{ secrets.BASE_URL }} + run: + echo API_KEY=\"$API_KEY\" > ./local.properties