diff --git a/.github/workflows/pr_checker.yml b/.github/workflows/pr_checker.yml
index 030237f..0a169de 100644
--- a/.github/workflows/pr_checker.yml
+++ b/.github/workflows/pr_checker.yml
@@ -20,6 +20,7 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
+
- name: set up JDK 17
uses: actions/setup-java@v3
with:
@@ -35,6 +36,7 @@ jobs:
base_url: ${{ secrets.base_url }}
run: |
echo base_url=\"$base_url\" >> local.properties
+
- name: Grant execute permission for gradlew
run: chmod +x gradlew
diff --git a/app/build.gradle b/app/build.gradle
index d8ba4b9..2ddd84d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,11 +33,11 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
- jvmTarget = '1.8'
+ jvmTarget = '17'
}
buildFeatures {
viewBinding true
@@ -50,14 +50,12 @@ android {
dependencies {
// hilt
- implementation "com.google.dagger:hilt-android:2.44.2"
+ implementation "com.google.dagger:hilt-android:2.46"
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
- kapt "com.google.dagger:hilt-compiler:2.44.2"
+ kapt "com.google.dagger:hilt-compiler:2.46"
// ktx
- implementation "androidx.activity:activity-ktx:1.7.0"
- implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
- implementation "androidx.fragment:fragment-ktx:1.5.6"
+ implementation "androidx.fragment:fragment-ktx:1.5.7"
// recyclerview
implementation "androidx.recyclerview:recyclerview:1.3.0"
@@ -67,16 +65,16 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
// network
- implementation "com.squareup.okhttp3:logging-interceptor:4.10.0"
- implementation "com.google.code.gson:gson:2.9.1"
+ implementation "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11"
+ implementation "com.google.code.gson:gson:2.10.1"
implementation "com.squareup.retrofit2:retrofit:2.9.0"
// coil
- implementation "io.coil-kt:coil:2.2.2"
+ implementation "io.coil-kt:coil:2.3.0"
// json
- implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
- implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0'
+ implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0'
+ implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0'
// timber
implementation "com.jakewharton.timber:timber:5.0.1"
@@ -90,7 +88,7 @@ dependencies {
implementation "com.kakao.sdk:v2-user:2.8.6"
// shared preference
- implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'
+ implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
// firebase
implementation platform('com.google.firebase:firebase-bom:31.1.1')
@@ -98,12 +96,18 @@ dependencies {
// firebase storage
implementation 'com.google.firebase:firebase-core:21.1.1'
- implementation 'com.google.firebase:firebase-storage:20.1.0'
+ implementation 'com.google.firebase:firebase-storage:20.2.0'
- implementation 'androidx.core:core-ktx:1.9.0'
+ // app compat
implementation 'androidx.appcompat:appcompat:1.6.1'
+
+ // material
implementation 'com.google.android.material:material:1.8.0'
+
+ // constraint layout
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+
+ // test
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/app/src/main/res/font/font_pretendard_bold.xml b/app/src/main/res/font/font_pretendard_bold.xml
new file mode 100644
index 0000000..9dcec87
--- /dev/null
+++ b/app/src/main/res/font/font_pretendard_bold.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/font_pretendard_medium.xml b/app/src/main/res/font/font_pretendard_medium.xml
new file mode 100644
index 0000000..96f724e
--- /dev/null
+++ b/app/src/main/res/font/font_pretendard_medium.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/keyneez_font.xml b/app/src/main/res/font/font_pretendard_semibold.xml
similarity index 50%
rename from app/src/main/res/font/keyneez_font.xml
rename to app/src/main/res/font/font_pretendard_semibold.xml
index a42fedc..9e72ef7 100644
--- a/app/src/main/res/font/keyneez_font.xml
+++ b/app/src/main/res/font/font_pretendard_semibold.xml
@@ -1,15 +1,7 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 5b1bd62..dfebb9b 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -24,7 +24,7 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/appearances.xml
similarity index 54%
rename from app/src/main/res/values/styles.xml
rename to app/src/main/res/values/appearances.xml
index 6265376..a0683a9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/appearances.xml
@@ -1,7 +1,8 @@
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 22783e3..58d28b7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,5 @@
- #FFBB86FC
- #FF6200EE
- #FF3700B3
- #FF03DAC5
- #FF018786
-
-
#00A5CB
#2CC9ED
#69D6EF
@@ -48,7 +41,7 @@
#F7F7F7
#FFFFFF
-
+
#CC000000
#33000000
#CCFFFFFF
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bef1290..383a9af 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,22 +1,23 @@
-
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 720b31d..7953285 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
}
plugins {
- id 'com.android.application' version '7.4.2' apply false
- id 'com.android.library' version '7.4.2' apply false
+ id 'com.android.application' version '8.0.1' apply false
+ id 'com.android.library' version '8.0.1' apply false
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
id 'com.google.dagger.hilt.android' version '2.44' apply false
}
diff --git a/gradle.properties b/gradle.properties
index 3c5031e..a2e90d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7c3d13e..35cc54b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Wed Mar 22 22:22:47 KST 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME