Skip to content

7주차_미션_해리/박상재 #27

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

7주차_미션_해리/박상재 #27

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f02059
7주차
saojaem May 27, 2024
3f50f7a
8주차 미션 해리/박상재
saojaem Jun 2, 2024
916b770
10주차 미션
saojaem Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions 해리_박상재/.idea/.gitignore
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions 해리_박상재/.idea/harry.iml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions 해리_박상재/.idea/misc.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions 해리_박상재/.idea/modules.xml
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions 해리_박상재/README.md
View file
Open in desktop

This file was deleted.

Binary file modified 해리_박상재/UMCflo/.gradle/8.4/checksums/checksums.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/checksums/md5-checksums.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/checksums/sha1-checksums.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/executionHistory/executionHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/executionHistory/executionHistory.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/fileHashes/fileHashes.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/fileHashes/resourceHashesCache.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/buildOutputCleanup/outputFiles.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/file-system.probe
View file
Open in desktop
Binary file not shown.
10 changes: 0 additions & 10 deletions 해리_박상재/UMCflo/.idea/deploymentTargetSelector.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions 해리_박상재/UMCflo/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions 해리_박상재/UMCflo/.idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions 해리_박상재/UMCflo/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
}

android {
Expand All @@ -27,22 +28,25 @@ 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 = JavaVersion.VERSION_17.toString()
}
buildFeatures{
viewBinding = true
}

}

dependencies {
<<<<<<< Updated upstream
implementation("androidx.room:room-migration:2.6.0")
implementation("androidx.room:room-runtime:2.6.0")
kapt("androidx.room:room-compiler:2.6.0")


implementation ("com.google.code.gson:gson:2.8.7")
=======
>>>>>>> Stashed changes
implementation("me.relex:circleindicator:2.1.6")
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
Expand Down
Loading