Merge pull request #36 from junjange/chore/and_setting

CI 및 Gradle 수정
woowacourse-teams · Jul 11, 2024 · ce41e55 · ce41e55
2 parents ba8f7e0 + d94d2d9
commit ce41e55
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 17 deletions.
diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml
@@ -3,6 +3,8 @@ name: Android Pull Request CI
 on:
   push:
     branches: [ develop ]
+    paths:
+      - 'android/**'
   pull_request:
     branches: [ develop ]
     paths:
@@ -42,6 +44,9 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      - name: Lint Check
+        run: ./gradlew ktlintCheck
+
       - name: Run unit tests
         env:
           LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId = "com.woowacourse.friendogly"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
@@ -23,7 +23,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }

diff --git a/android/app/src/androidTest/java/com/woowacourse/friendogly/ExampleInstrumentedTest.kt b/android/app/src/androidTest/java/com/woowacourse/friendogly/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.woowacourse.friendogly
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

diff --git a/.../com/woowacourse/friendogly/data/empty.kt → ...ava/com/woowacourse/friendogly/data/Empty b/.../com/woowacourse/friendogly/data/empty.kt → ...ava/com/woowacourse/friendogly/data/Empty
diff --git a/android/app/src/main/java/com/woowacourse/friendogly/domain/Empty b/android/app/src/main/java/com/woowacourse/friendogly/domain/Empty
@@ -0,0 +1 @@
+package com.woowacourse.friendogly.data
diff --git a/android/app/src/main/java/com/woowacourse/friendogly/domain/empty.kt b/android/app/src/main/java/com/woowacourse/friendogly/domain/empty.kt
diff --git a/android/app/src/main/java/com/woowacourse/friendogly/local/Empty b/android/app/src/main/java/com/woowacourse/friendogly/local/Empty
@@ -0,0 +1 @@
+package com.woowacourse.friendogly.data
diff --git a/android/app/src/main/java/com/woowacourse/friendogly/local/empty.kt b/android/app/src/main/java/com/woowacourse/friendogly/local/empty.kt
diff --git a/android/app/src/main/java/com/woowacourse/friendogly/presentation/base/BaseFragment.kt b/android/app/src/main/java/com/woowacourse/friendogly/presentation/base/BaseFragment.kt
@@ -25,9 +25,10 @@ abstract class BaseFragment<T : ViewDataBinding>(
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
-        _binding = DataBindingUtil.inflate<T>(inflater, layoutResourceId, container, false).apply {
-            lifecycleOwner = viewLifecycleOwner
-        }
+        _binding =
+            DataBindingUtil.inflate<T>(inflater, layoutResourceId, container, false).apply {
+                lifecycleOwner = viewLifecycleOwner
+            }
         return binding.root
     }
 

diff --git a/android/app/src/main/java/com/woowacourse/friendogly/remote/Empty b/android/app/src/main/java/com/woowacourse/friendogly/remote/Empty
@@ -0,0 +1 @@
+package com.woowacourse.friendogly.data
diff --git a/android/app/src/main/java/com/woowacourse/friendogly/remote/empty.kt b/android/app/src/main/java/com/woowacourse/friendogly/remote/empty.kt
diff --git a/android/app/src/test/java/com/woowacourse/friendogly/ExampleUnitTest.kt b/android/app/src/test/java/com/woowacourse/friendogly/ExampleUnitTest.kt
@@ -1,9 +1,8 @@
 package com.woowacourse.friendogly
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -13,4 +13,9 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.jetbrainsKotlinAndroid) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.ktlint) apply false
+}
+
+allprojects {
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
 }
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -15,6 +15,7 @@ junit-jupiter = "5.10.2"
 assertj-core = "3.25.3"
 kotest-runner-junit5 = "5.8.0"
 mockk = "1.13.10"
+ktlint = "12.1.0"
 
 # android-library
 datastore = "1.1.1"
@@ -89,6 +90,9 @@ retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.r
 okhttp-core = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
 
+#ktlint
+ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint" }
+
 [bundles]
 kotlin = ["lifecycle-runtime-ktx", "lifecycle-extensions", "coroutines-core"]
 android = ["androidx-constraintlayout", "androidx-activity", "androidx-appcompat", "androidx-core-ktx", "material", "image-cropper", "glide", "paging-runtime-ktx"]
@@ -103,3 +107,4 @@ test = ["junit", "junit-jupiter", "assertj", "kotest", "mockk"]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }