[MERGE] #3 -> develop

[ADD/#3] pr checker 추가
teamterning · Jul 4, 2024 · 16e746f · 16e746f
2 parents 3745e87 + cbe6b89
commit 16e746f
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 7 deletions.
diff --git a/.github/workflows/pr_checker.yml b/.github/workflows/pr_checker.yml
@@ -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
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -29,8 +29,8 @@ android {
         debug {
             buildConfigField(
                 "String",
-                "OPEN_BASE_URL",
-                gradleLocalProperties(rootDir, providers).getProperty("open.base.url")
+                "BASE_URL",
+                gradleLocalProperties(rootDir, providers).getProperty("base.url")
             )
         }
         release {
@@ -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)

diff --git a/app/src/main/java/com/terning/point/di/RetrofitModule.kt b/app/src/main/java/com/terning/point/di/RetrofitModule.kt
@@ -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()

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -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)

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -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)

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -10,6 +10,7 @@ java {
 }
 
 dependencies{
+    // KotlinDependencies
     implementation(libs.kotlin)
     implementation(libs.coroutines.android)
 }
diff --git a/feature/build.gradle.kts b/feature/build.gradle.kts
@@ -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)
@@ -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)

diff --git a/feature/src/main/java/com/terning/feature/main/MainTab.kt b/feature/src/main/java/com/terning/feature/main/MainTab.kt
@@ -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
     );

diff --git a/...va/com/terning/feature/mock/MockScreen.kt → ...ava/com/terning/feature/mock/MockRoute.kt b/...va/com/terning/feature/mock/MockScreen.kt → ...ava/com/terning/feature/mock/MockRoute.kt
diff --git a/feature/src/main/res/drawable/ic_home.xml b/feature/src/main/res/drawable/ic_home.xml
@@ -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>