From e3189d8be6398d7432742f09523fd9f03ba5d672 Mon Sep 17 00:00:00 2001
From: Wooyoung Myung <mwy3055@gmail.com>
Date: Wed, 13 Nov 2024 22:23:22 +0900
Subject: [PATCH] =?UTF-8?q?=ED=81=B4=EB=A6=B0=20=EB=B9=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=8B=9C=EC=97=90=EB=8F=84=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A5=BC=20=EC=8B=A4=ED=96=89=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#380)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert "빌드시 테스트 태스크 제외시키고 CI에서만 돌리기 (#362)"

This reverts commit 6177d5019bdcd01166899b3c9472db8dd9d2ca8e.

* gradle: 오타 제거
---
 .github/workflows/android-develop.yml                    | 4 ++--
 .github/workflows/android-release.yml                    | 8 ++++----
 .../ku_ring/buildlogic/convention/FeaturePlugin.kt       | 9 +--------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/android-develop.yml b/.github/workflows/android-develop.yml
index 5bd5b5aed..694be4b40 100644
--- a/.github/workflows/android-develop.yml
+++ b/.github/workflows/android-develop.yml
@@ -42,8 +42,8 @@ jobs:
       
     # Build Debug App
     - name: Build with Gradle
-      run: ./gradlew :app:assembleDebug -PisCI=true
+      run: ./gradlew :app:assembleDebug
       
     # Run unit test
     - name: Run unit test
-      run: ./gradlew testdebugUnitTest
+      run: ./gradlew testDebugUnitTest
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 10ac06b62..6f03cadbd 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -37,20 +37,20 @@ jobs:
         echo '${{ secrets.KU_RING_KEY_STORE_JKS }}' | base64 -d > ./app/signing/ku_ring_keystore.jks
         echo '${{ secrets.KEY_STORE_PROPERTIES }}' > ./app/signing/keystore.properties
 
-    - name: Create local.properteis
+    - name: Create local.properties
       run: echo '${{ secrets.LOCAL_PROPERTIES }}' > ./local.properties
 
     # Run unit test
     - name: Run unit test
-      run: ./gradlew testreleaseUnitTest
+      run: ./gradlew testReleaseUnitTest
 
     # Build APK Release
     - name: Build release Apk
-      run: ./gradlew :app:assembleRelease -PisCI=true
+      run: ./gradlew :app:assembleRelease
 
     # Build AAB Release
     - name: Build release Bundle
-      run: ./gradlew :app:bundleRelease -PisCI=true
+      run: ./gradlew :app:bundleRelease
       
     # Upload AAB
     - name: Upload a Build AAB Artifact
diff --git a/build-logic/src/main/kotlin/com/ku_stacks/ku_ring/buildlogic/convention/FeaturePlugin.kt b/build-logic/src/main/kotlin/com/ku_stacks/ku_ring/buildlogic/convention/FeaturePlugin.kt
index b4c40bf2c..eaa47bdb1 100644
--- a/build-logic/src/main/kotlin/com/ku_stacks/ku_ring/buildlogic/convention/FeaturePlugin.kt
+++ b/build-logic/src/main/kotlin/com/ku_stacks/ku_ring/buildlogic/convention/FeaturePlugin.kt
@@ -1,14 +1,13 @@
 package com.ku_stacks.ku_ring.buildlogic.convention
 
+import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.LibraryExtension
-import com.android.build.gradle.tasks.factory.AndroidUnitTest
 import com.ku_stacks.ku_ring.buildlogic.dsl.configureAndroidLibrary
 import com.ku_stacks.ku_ring.buildlogic.primitive.CommonAndroidPlugin
 import com.ku_stacks.ku_ring.buildlogic.primitive.HiltPlugin
 import com.ku_stacks.ku_ring.buildlogic.primitive.KotlinPlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 
@@ -33,12 +32,6 @@ class FeaturePlugin: Plugin<Project> {
                     proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
                 }
             }
-            tasks.withType(Test::class.java).configureEach {
-                enabled = project.hasProperty("isCI") && project.property("isCI") == "true"
-            }
-            tasks.withType(AndroidUnitTest::class.java).configureEach {
-                enabled = project.hasProperty("isCI") && project.property("isCI") == "true"
-            }
         }
     }
 }