From 5bf84efd8b97867551d1fdb9113b292fecb35bb7 Mon Sep 17 00:00:00 2001 From: roel Date: Fri, 10 Oct 2025 18:23:39 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[FEAT/#410]=20chucker=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++++ .../spoony/core/network/RetrofitModule.kt | 19 ++++++++++++++++--- gradle/libs.versions.toml | 3 +++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 78fa93d93..131fe2301 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -101,6 +101,10 @@ dependencies { // Debug debugImplementation(libs.bundles.debug) + debugImplementation(libs.chucker.library) + + // Release + releaseImplementation(libs.chucker.library.no.op) // Androidx implementation(libs.bundles.androidx) diff --git a/app/src/main/java/com/spoony/spoony/core/network/RetrofitModule.kt b/app/src/main/java/com/spoony/spoony/core/network/RetrofitModule.kt index 33f4ce835..574e51e7c 100644 --- a/app/src/main/java/com/spoony/spoony/core/network/RetrofitModule.kt +++ b/app/src/main/java/com/spoony/spoony/core/network/RetrofitModule.kt @@ -1,5 +1,7 @@ package com.spoony.spoony.core.network +import android.content.Context +import com.chuckerteam.chucker.api.ChuckerInterceptor import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import com.spoony.spoony.BuildConfig.BASE_URL import com.spoony.spoony.core.network.qualifier.Auth @@ -7,6 +9,7 @@ import com.spoony.spoony.core.network.qualifier.CoilClient import dagger.Module import dagger.Provides import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import javax.inject.Singleton import kotlinx.serialization.json.Json @@ -79,15 +82,21 @@ object RetrofitModule { @Singleton fun provideTokenAuthenticator(authenticator: TokenAuthenticator): Authenticator = authenticator + @Provides + @Singleton + fun provideChuckerInterceptor(@ApplicationContext context: Context): ChuckerInterceptor = ChuckerInterceptor.Builder(context).build() + @Provides @Singleton fun provideClient( loggingInterceptor: HttpLoggingInterceptor, authInterceptor: Interceptor, - tokenAuthenticator: TokenAuthenticator + tokenAuthenticator: TokenAuthenticator, + chuckerInterceptor: ChuckerInterceptor ) = OkHttpClient.Builder() .addInterceptor(loggingInterceptor) .addInterceptor(authInterceptor) + .addInterceptor(chuckerInterceptor) .authenticator(tokenAuthenticator) .build() @@ -95,18 +104,22 @@ object RetrofitModule { @Singleton @Auth fun provideAuthClient( - loggingInterceptor: HttpLoggingInterceptor + loggingInterceptor: HttpLoggingInterceptor, + chuckerInterceptor: ChuckerInterceptor ) = OkHttpClient.Builder() .addInterceptor(loggingInterceptor) + .addInterceptor(chuckerInterceptor) .build() @Provides @Singleton @CoilClient fun provideCoilClient( - loggingInterceptor: HttpLoggingInterceptor + loggingInterceptor: HttpLoggingInterceptor, + chuckerInterceptor: ChuckerInterceptor ) = OkHttpClient.Builder() .addInterceptor(loggingInterceptor) + .addInterceptor(chuckerInterceptor) .build() @Provides diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ebc83d588..19ed2cf02 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,6 +42,7 @@ firebaseBom = "34.3.0" firebaseCrashlyticsPlugin = "3.0.6" # Third Party +chucker = "4.0.0" okhttp = "4.11.0" retrofit = "2.9.0" retrofitKotlinSerializationConverter = "1.0.0" @@ -115,6 +116,8 @@ accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pa accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanistSystemuicontroller" } # Third Party +chucker-library = { group = "com.github.chuckerteam.chucker", name = "library", version.ref = "chucker" } +chucker-library-no-op = { group = "com.github.chuckerteam.chucker", name = "library-no-op", version.ref = "chucker" } okhttp = { group = "com.squareup.okhttp3", name = "okhttp" } okhttp-bom = { group = "com.squareup.okhttp3", name = "okhttp-bom", version.ref = "okhttp" } okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } From de4be0dea18b068a775b47e596be95c46f4c10b5 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Mon, 20 Oct 2025 20:12:27 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[CHORE/#418]=20stacktrace=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr_builder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_builder.yml b/.github/workflows/pr_builder.yml index dfca92693..9eef528bd 100644 --- a/.github/workflows/pr_builder.yml +++ b/.github/workflows/pr_builder.yml @@ -67,4 +67,4 @@ jobs: run: echo "$GOOGLE_SERVICES_JSON" > app/google-services.json - name: Build with Gradle - run: ./gradlew assembleDebug -PcompileSdkVersion=35 \ No newline at end of file + run: ./gradlew assembleDebug -PcompileSdkVersion=35 --stacktrace From 63fd42b494398351d9d2cc70ce2f099cb14eff2f Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Mon, 20 Oct 2025 20:18:42 +0900 Subject: [PATCH 3/3] [CHORE/#418] downgrade jdk version --- .github/workflows/pr_builder.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_builder.yml b/.github/workflows/pr_builder.yml index 9eef528bd..cd6ba956d 100644 --- a/.github/workflows/pr_builder.yml +++ b/.github/workflows/pr_builder.yml @@ -26,10 +26,10 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - - name: set up JDK 18 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 18 + java-version: 17 distribution: 'temurin' - name: Change gradlew permissions