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 { 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" - } } } }