Skip to content
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.

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

[ADD/#3] pr checker 추가 #4

Merged
merged 6 commits into from
Jul 4, 2024
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
45 changes: 45 additions & 0 deletions .github/workflows/pr_checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: TerningPoint PR Checker

on:
pull_request:
branches: [ develop ]

defaults:
run:
shell: bash
working-directory: .

jobs:
build:
name: PR Checker
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

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

- name: Change gradlew permissions
run: chmod +x ./gradlew

- name: Create Local Properties
run: touch local.properties

- name: Access Local Properties
env:
base_url: ${{ secrets.BASE_URL }}
run: |
echo base.url=\"$base_url\" >> local.properties
9 changes: 6 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ android {
debug {
buildConfigField(
"String",
"OPEN_BASE_URL",
gradleLocalProperties(rootDir, providers).getProperty("open.base.url")
"BASE_URL",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

base.url 변경 확인했슴둥.!

gradleLocalProperties(rootDir, providers).getProperty("base.url")
)
}
release {
Expand Down Expand Up @@ -69,27 +69,30 @@ dependencies {
implementation(project(":domain"))
implementation(project(":feature"))

// KotlinDependencies
implementation(libs.kotlinx.serialization.json)
implementation(libs.coroutines.android)
implementation(libs.kotlin)

// AndroidXDependencies
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.hilt.android)
ksp(libs.hilt.android.compiler)
ksp(libs.hilt.manager)
implementation(libs.androidx.workManager)
implementation(libs.androidx.hiltWorkManager)

implementation(libs.hilt.compiler)
implementation(libs.androidx.hiltWorkManagerCompiler)

// TestDependencies
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4)

// ThirdPartyDependencies
implementation(platform(libs.okhttp.bom))
implementation(libs.okhttp)
implementation(libs.okhttp.logging)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/terning/point/di/RetrofitModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ object RetrofitModule {
client: OkHttpClient,
factory: Converter.Factory
): Retrofit = Retrofit.Builder()
.baseUrl(BuildConfig.OPEN_BASE_URL)
.baseUrl(BuildConfig.BASE_URL)
.addConverterFactory(factory)
.client(client)
.build()
Expand Down
6 changes: 6 additions & 0 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,23 @@ android {
}

dependencies {
// Kotlin
implementation(libs.kotlin)

// Lifecycle Ktx
implementation(libs.androidx.lifecycle.runtime.ktx)

// Hilt
implementation(libs.hilt.android)

// Material Design
implementation(libs.material)
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.foundation.android)
implementation(libs.androidx.material3.android)

// Test Dependency
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand Down
4 changes: 4 additions & 0 deletions data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,25 @@ android {
dependencies {
implementation(project(":domain"))

// AndroidXDependencies
implementation(libs.hilt.android)
implementation(libs.androidx.security)
implementation(libs.androidx.core.ktx)

// KotlinDependencies
implementation(libs.kotlin)
implementation(libs.kotlinx.serialization.json.v151)
implementation(libs.coroutines.android)

// ThirdPartyDependencies
implementation(libs.retrofit.core)
implementation(libs.okhttp)
implementation(platform(libs.okhttp.bom))
implementation(libs.okhttp.logging)
implementation (libs.retrofit2.kotlinx.serialization.converter.v080)
implementation(libs.timber)

// TestDependencies
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand Down
1 change: 1 addition & 0 deletions domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ java {
}

dependencies{
// KotlinDependencies
implementation(libs.kotlin)
implementation(libs.coroutines.android)
}
8 changes: 7 additions & 1 deletion feature/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ dependencies {
implementation(project(":core"))
implementation(project(":domain"))

// KotlinDependencies
implementation(libs.kotlin)
implementation(libs.coroutines.android)
implementation(libs.kotlinx.serialization.json)

// AndroidXDependencies
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.hilt.android)
Expand All @@ -65,21 +67,25 @@ dependencies {
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.lifecycle.viewModelCompose)
implementation(libs.androidx.workManager)

implementation(libs.hilt.compiler)
implementation(libs.androidx.lifecycle.runtime.compose.android)

// KspDependencies
ksp(libs.hilt.android.compiler)
ksp(libs.hilt.manager)

// Material Design
implementation(libs.material)
implementation(libs.androidx.material3.android)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.ui.graphics)

// TestDependencies
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)

// ThirdPartyDependencies
implementation(libs.compose.coil)
implementation(libs.timber)
implementation(libs.ossLicense)
Expand Down
4 changes: 2 additions & 2 deletions feature/src/main/java/com/terning/feature/main/MainTab.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ enum class MainTab(
val route: MainTabRoute,
) {
FIRST(
icon = R.drawable.ic_launcher_foreground,
icon = R.drawable.ic_home,
contentDescription = R.string.first,
route = First
),
MOCK(
icon = R.drawable.ic_launcher_foreground,
icon = R.drawable.ic_home,
contentDescription = R.string.mock,
route = Mock
);
Expand Down
9 changes: 9 additions & 0 deletions feature/src/main/res/drawable/ic_home.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<path
android:pathData="M18,8.452V14.49C18,16.425 16.488,18 14.625,18H11.25V13.681C11.25,13.105 10.782,12.637 10.206,12.637H7.794C7.218,12.637 6.759,13.105 6.759,13.681V18H3.375C1.512,18 0,16.425 0,14.49V8.452C0,7.417 0.441,6.436 1.197,5.762L6.822,0.83C8.091,-0.277 9.918,-0.277 11.178,0.83L16.803,5.762C17.568,6.436 18,7.417 18,8.452Z"
android:fillColor="#BCBCBC"/>
</vector>
Loading