Skip to content

Release/2.1.0 #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tristanjung1006 merged 3 commits into from
Aug 1, 2025
Merged

Release/2.1.0 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2ef54f
[refactor] Base_Url from to-you.store to to-you.shop
tristanjung1006 Aug 1, 2025
1fb7842
[refactor] update compileSdk and targetSdk to 35, increment version t…
tristanjung1006 Aug 1, 2025
9c05c0c
Merge pull request #115 from Team-ToYou/refactor
tristanjung1006 Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ android {
}
}
namespace = "com.toyou.toyouandroid"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.toyou.toyouandroid"
minSdk = 28
targetSdk = 34
versionCode = 11
versionName = "1.1.0"
targetSdk = 35
versionCode = 12
versionName = "2.1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/toyou/toyouandroid/network/AuthNetworkModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import timber.log.Timber

object AuthNetworkModule {

private const val BASE_URL = "https://to-you.store"
private const val BASE_URL = "https://to-you.shop"
private var retrofit: Retrofit? = null
private var accessToken: String? = null

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/toyou/toyouandroid/network/NetworkModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import retrofit2.converter.gson.GsonConverterFactory

object NetworkModule {

private const val BASE_URL = "https://to-you.store"
private const val BASE_URL = "https://to-you.shop"

private var retrofit: Retrofit? = null

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/toyou/toyouandroid/network/RetrofitInstance.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory

object RetrofitInstance {
private const val BASE_URL = "https://to-you.store/"
private const val BASE_URL = "https://to-you.shop"

fun getInstance() : Retrofit{
val client = OkHttpClient()
val interceptor = HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY)
val clientBuilder: OkHttpClient.Builder =
client.newBuilder().addInterceptor(interceptor as HttpLoggingInterceptor)
client.newBuilder().addInterceptor(interceptor)

return Retrofit.Builder().baseUrl(BASE_URL)
.addConverterFactory(GsonConverterFactory.create())
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<string name="mypage_contact">문의하기</string>
<string name="mypage_terms_of_use">약관 및 정책</string>
<string name="mypage_version">서비스 버전</string>
<string name="mypage_version_name">1.1.0</string>
<string name="mypage_version_name">2.1.0</string>
<string name="mypage_logout">로그아웃</string>
<string name="mypage_signout">회원탈퇴</string>
<string name="home_emotion_tv">멘트</string>
Expand Down
Loading