Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 4 additions & 11 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Gradle cache
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
cache: gradle

- name: Write compile time google-services.json file
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,4 @@ fabric.properties

#Login API KEY
/app/src/main/res/values/kakao_strings.xml
gradle/gradle-daemon-jvm.properties
18 changes: 9 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ plugins {

id 'kotlin-parcelize'

id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10'
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.0'
id 'org.jetbrains.kotlin.plugin.compose'
id 'dagger.hilt.android.plugin'

// plugin for data binding, hilt
// plugin for ksp (Hilt, Glide)
id 'com.google.devtools.ksp'

// plugin for data binding
id 'kotlin-kapt'

// plugin for hiding keys used in manifest
Expand Down Expand Up @@ -66,10 +70,6 @@ android {
buildConfig = true
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.3'
}

buildTypes {
release {
minifyEnabled false
Expand Down Expand Up @@ -128,10 +128,10 @@ dependencies {
implementation("com.squareup.okhttp3:logging-interceptor")
//hilt
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
ksp "com.google.dagger:hilt-compiler:$hilt_version"
// Glide
implementation "com.github.bumptech.glide:glide:4.12.0"
kapt "com.github.bumptech.glide:compiler:4.12.0"
implementation "com.github.bumptech.glide:glide:4.16.0"
ksp "com.github.bumptech.glide:ksp:4.16.0"
//fragment change
implementation("androidx.fragment:fragment-ktx:1.5.5")
//coil
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
hilt_version = '2.44.2'
hilt_version = '2.56.2'
}

repositories {
Expand All @@ -16,7 +16,9 @@ buildscript {
}

plugins {
id 'com.android.application' version '8.1.3' apply false
id 'com.android.library' version '8.1.3' apply false
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
id 'com.android.application' version '8.13.2' apply false
id 'com.android.library' version '8.13.2' apply false
id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false
id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jan 22 18:11:59 KST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Empty file modified gradlew
100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ pluginManagement {
mavenCentral()
}
}
plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
Expand Down
Loading