From 36cdddfd24d1f52c7fc558c59ab811eaf958ea15 Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:02:31 +0900 Subject: [PATCH 01/13] =?UTF-8?q?chore:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index f73c84a74..713da9f1c 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -46,10 +46,10 @@ paging = "3.3.0" [libraries] # test junit = { group = "junit", name = "junit", version.ref = "junit" } -junit-jupiter = { group = "junit", name = "jupiter", version.ref = "junit-jupiter" } -assertj = { group = "assertj", name = "assertj-core", version.ref = "assertj-core" } -kotest = { group = "kotest", name = "kotest-runner-junit5", version.ref = "kotest-runner-junit5" } -mockk = { group = "mockk", name = "mockk", version.ref = "mockk" } +junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit-jupiter" } +assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj-core" } +kotest = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotest-runner-junit5" } +mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } From 44c3298682b0d6769f0779c0791311a6c2853397 Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:05:58 +0900 Subject: [PATCH 02/13] =?UTF-8?q?chore:=20ci=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/workflows/android-pull-request-ci.yml diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml new file mode 100644 index 000000000..44ed47eea --- /dev/null +++ b/.github/workflows/android-pull-request-ci.yml @@ -0,0 +1,54 @@ +name: Android Pull Request CI + +on: + pull_request: + branches: [ test ] +# paths: +# - 'android/**' +# +defaults: + run: + working-directory: ./android + +jobs: + unit_test: + runs-on: ubuntu-latest + + steps: + - name: Checkout the code + 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 17 + uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '17' + + - name: set up Android SDK + uses: android-actions/setup-android@v2 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Run unit tests + env: + LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }} + run: | + echo "$LOCAL_PROPERTIES" > local.properties + ./gradlew testDebugUnitTest --stacktrace + + - name: Publish Test Results + if: always() + uses: EnricoMi/publish-unit-test-result-action@v2 + with: + files: "**/test-results/**/*.xml" From ac7f7d31c99b761fc1ededc88af292b1240f2aaa Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:12:02 +0900 Subject: [PATCH 03/13] =?UTF-8?q?chore:=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 44ed47eea..6e41833e1 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -3,9 +3,9 @@ name: Android Pull Request CI on: pull_request: branches: [ test ] -# paths: -# - 'android/**' -# + paths: + - 'android/**' + defaults: run: working-directory: ./android From 3c16140c6d5d40095623db3f1174a52e0ad96580 Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:14:37 +0900 Subject: [PATCH 04/13] =?UTF-8?q?chore:=20branches=20develop=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 6e41833e1..29e22bf7c 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -2,7 +2,7 @@ name: Android Pull Request CI on: pull_request: - branches: [ test ] + branches: [ develop ] paths: - 'android/**' From 0e5239719ef919084057aac831e140a54a1ed81a Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:17:35 +0900 Subject: [PATCH 05/13] =?UTF-8?q?chore:=20branches=EB=AA=85=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 29e22bf7c..9fc78a88c 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -2,7 +2,7 @@ name: Android Pull Request CI on: pull_request: - branches: [ develop ] + branches: [ woowacourse-teams:develop ] paths: - 'android/**' From 205366217d2e6bf022e8d481305ea6dc06783fbf Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:22:49 +0900 Subject: [PATCH 06/13] =?UTF-8?q?chore:=20branches=EB=AA=85=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 9fc78a88c..29e22bf7c 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -2,7 +2,7 @@ name: Android Pull Request CI on: pull_request: - branches: [ woowacourse-teams:develop ] + branches: [ develop ] paths: - 'android/**' From 79ad78e07b7edee794cd22fd3e820c659cfccb3f Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:34:55 +0900 Subject: [PATCH 07/13] =?UTF-8?q?chore:=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 29e22bf7c..587d7f401 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -3,8 +3,8 @@ name: Android Pull Request CI on: pull_request: branches: [ develop ] - paths: - - 'android/**' +# paths: +# - 'android/**' defaults: run: From 5b907ff1c6d0914323060cc9814d64987fdd9151 Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:35:51 +0900 Subject: [PATCH 08/13] =?UTF-8?q?chore:=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 587d7f401..44836eacc 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -6,9 +6,9 @@ on: # paths: # - 'android/**' -defaults: - run: - working-directory: ./android +#defaults: +# run: +# working-directory: ./android jobs: unit_test: From 717e39a12d89656104f363f7f69b4997dfd44934 Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 17:36:31 +0900 Subject: [PATCH 09/13] =?UTF-8?q?chore:=20=ED=8A=B8=EB=A6=AC=EA=B1=B0,=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 44836eacc..29e22bf7c 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -3,12 +3,12 @@ name: Android Pull Request CI on: pull_request: branches: [ develop ] -# paths: -# - 'android/**' + paths: + - 'android/**' -#defaults: -# run: -# working-directory: ./android +defaults: + run: + working-directory: ./android jobs: unit_test: From 8aeddfa5d7ee8b1662e24995f48cc044b358a573 Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 18:02:28 +0900 Subject: [PATCH 10/13] =?UTF-8?q?chore:=20push=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 29e22bf7c..fb3b3d2f1 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -1,6 +1,8 @@ name: Android Pull Request CI on: + push: + branches: [ develop ] pull_request: branches: [ develop ] paths: From b2121fb22add12a71e45b535b79b185f88b9efef Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 18:08:22 +0900 Subject: [PATCH 11/13] =?UTF-8?q?chore:=20local=20properties=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index fb3b3d2f1..9e1130f98 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -43,10 +43,10 @@ jobs: run: chmod +x gradlew - name: Run unit tests - env: - LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }} +# env: +# LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }} run: | - echo "$LOCAL_PROPERTIES" > local.properties +# echo "$LOCAL_PROPERTIES" > local.properties ./gradlew testDebugUnitTest --stacktrace - name: Publish Test Results From 7ec10a491255ece928c2742bfecedd04cbecb78c Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 18:09:06 +0900 Subject: [PATCH 12/13] =?UTF-8?q?chore:=20local=20properties=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-pull-request-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml index 9e1130f98..fb3b3d2f1 100644 --- a/.github/workflows/android-pull-request-ci.yml +++ b/.github/workflows/android-pull-request-ci.yml @@ -43,10 +43,10 @@ jobs: run: chmod +x gradlew - name: Run unit tests -# env: -# LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }} + env: + LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }} run: | -# echo "$LOCAL_PROPERTIES" > local.properties + echo "$LOCAL_PROPERTIES" > local.properties ./gradlew testDebugUnitTest --stacktrace - name: Publish Test Results From 3eece335c10c00b4b875645c06abf0c247ea6c0b Mon Sep 17 00:00:00 2001 From: JunJangE Date: Thu, 11 Jul 2024 18:14:57 +0900 Subject: [PATCH 13/13] =?UTF-8?q?chore:=20git=20ignore=20=ED=95=84?= =?UTF-8?q?=EC=9A=94=EC=97=86=EB=8A=94=20=EB=82=B4=EC=9A=A9=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/.idea/.gitignore b/.idea/.gitignore index b9e7fa91a..cc18a8b86 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,36 +1,2 @@ -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Log/OS Files -*.log - -# Android Studio generated files and folders -captures/ -.externalNativeBuild/ -.cxx/ -*.apk -output.json - -# IntelliJ -*.iml -.idea/ -misc.xml -deploymentTargetDropDown.xml -render.experimental.xml - -# Keystore files -*.jks -*.keystore - -# Google Services (e.g. APIs or Firebase) -google-services.json - -# Android Profiling -*.hprof - # Mac Os .DS_Store