From 7c73245694edee39d862dd140a3fec3424bed4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B0=95=ED=98=B8?= Date: Thu, 30 May 2024 11:26:20 +0900 Subject: [PATCH] Add: Fastlane (#78) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add: Fastlane fastlane * [#74]Feat: 신고하기 팝업 커스텀 - ContentView 자체를 커스텀해서 content view를 파라미터로 받아서 팝업에 표시하도록 구현 - left, right -> top, bottom으로 수정 - withSeprator 플래그를 만들어서 구분선 유뮤 구현 - bottom button(마지막 버튼)은 무조건 separator 있음 * [#74]Feat: Toast 메시지 구현 - Toast-Swift 참고 - 디폴트 값 설정 * Update: 컴포넌트의 접근 지정 연산자 수정 및 이름 수정 * Update: 테스트 이미지로 임시 변경 - 서버 연동 전까지는 해당 이미지로 테스트하고자 함 * [#74]Feat: 차단, 신고 시, .none 상태로 업데이트 후, 다음 셀로 스크롤 구현 - user info box 팝업에서 report(느낌표) 버튼 클릭 시, 멈춤 화면 디자인 반영 - 차단 or 신고 팝업 표시 시, 멈춤 화면에서 이미지, 텍스트 히든 - 중지했을 때의 동작을 enum으로 나눠서 처리할 필요 없는 거 같아서 bool로 변경 - 차단 or 신고 시, 멈춤 화면 없애고 dim view 표시 후, none 상태로 설정 * Update: 그레디언트 색상 추가 * [#79]Feat: 좋아요 버튼 클릭 시, 원형 timer, progress 그레디언트 적용 * [#74]Feat: 마지막 더미 유저 Footer View 추가 - footer와 section의 제약조건 설정 * [#74]Feat: 좋아요 버튼 액션 구현 - TimeState에 none 케이스 생성 - 좋아요, 싫어요, 신고, 차단 시, 타이머, 프로그래스를 초기화하기 위함 - 13초에서 15초로 디자인 반영 - vc에서는 scroll만 처리하고 나머지는 cell에서 처리할 수 있도록 구현 * CI_CD: add pkg extension to .gitignore and fastlane 인증 순서 변경 * CICD: TestFlight 수출 규정 암호화 규정 스킵 info plist에 추가 ITSAppUsesNonExemptEncryption --------- Co-authored-by: LeeSeungmin --- .gitignore | 11 + Gemfile | 7 + Gemfile.lock | 256 ++++++++++++++++++ .../Src/Home/FallingHomeViewController.swift | 32 ++- XCConfig/Debug.xcconfig | 9 + XCConfig/QA.xcconfig | 9 + XCConfig/Release.xcconfig | 9 + fastlane/Appfile | 6 + fastlane/Fastfile | 85 ++++++ fastlane/Matchfile | 14 + fastlane/Pluginfile | 5 + fastlane/README.md | 72 +++++ 12 files changed, 501 insertions(+), 14 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 XCConfig/Debug.xcconfig create mode 100644 XCConfig/QA.xcconfig create mode 100644 XCConfig/Release.xcconfig create mode 100644 fastlane/Appfile create mode 100644 fastlane/Fastfile create mode 100644 fastlane/Matchfile create mode 100644 fastlane/Pluginfile create mode 100644 fastlane/README.md diff --git a/.gitignore b/.gitignore index a9170ea1..02ba8c34 100644 --- a/.gitignore +++ b/.gitignore @@ -69,4 +69,15 @@ Derived/ ### Tuist managed dependencies ### Tuist/Dependencies +### Fastlane ### +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output +fastlane/*.env .env + +# App Packaging +*.ipa +*.dSYM.zip +*.dSYM diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..c24509ef --- /dev/null +++ b/Gemfile @@ -0,0 +1,7 @@ +source "https://rubygems.org" + +gem "fastlane" +gem "dotenv" +gem "bundle" +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..17b3ea43 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,256 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.931.0) + aws-sdk-core (3.196.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.81.0) + aws-sdk-core (~> 3, >= 3.193.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + bundle (0.0.1) + bundler + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + discordrb (3.3.0) + discordrb-webhooks (~> 3.3.0) + ffi (>= 1.9.24) + opus-ruby + rbnacl (~> 3.4.0) + rest-client (>= 2.1.0.rc1) + websocket-client-simple (>= 0.3.0) + discordrb-webhooks (3.3.0) + rest-client (>= 2.1.0.rc1) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + event_emitter (0.2.6) + excon (0.110.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.220.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-discord_notifier (0.1.7) + discordrb (~> 3.3.0) + ffi (1.16.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.7.2) + jwt (2.8.1) + base64 + mime-types (3.5.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2024.0507) + mini_magick (4.12.0) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.3.0) + naturally (2.2.1) + netrc (0.11.0) + nkf (0.2.0) + optparse (0.5.0) + opus-ruby (1.0.1) + ffi + os (1.1.4) + plist (3.7.1) + public_suffix (5.0.5) + rake (13.2.1) + rbnacl (3.4.0) + ffi + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + retriable (3.1.2) + rexml (3.2.8) + strscan (>= 3.0.9) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + strscan (3.1.0) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.5.0) + websocket (1.2.10) + websocket-client-simple (0.8.0) + event_emitter + websocket + word_wrap (1.0.0) + xcodeproj (1.24.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + bundle + dotenv + fastlane + fastlane-plugin-discord_notifier + +BUNDLED WITH + 2.5.9 diff --git a/Projects/Features/Falling/Src/Home/FallingHomeViewController.swift b/Projects/Features/Falling/Src/Home/FallingHomeViewController.swift index 25017041..48670aca 100644 --- a/Projects/Features/Falling/Src/Home/FallingHomeViewController.swift +++ b/Projects/Features/Falling/Src/Home/FallingHomeViewController.swift @@ -127,7 +127,7 @@ final class FallingHomeViewController: TFBaseViewController { }) dataSource.supplementaryViewProvider = { (view, kind, index) in - return view.dequeueConfiguredReusableSupplementary( + return self.homeView.collectionView.dequeueConfiguredReusableSupplementary( using: footerRegistration, for: index ) @@ -177,23 +177,25 @@ final class FallingHomeViewController: TFBaseViewController { alertContentView.photoTheftButton.rx.tap.asDriver(), alertContentView.profanityButton.rx.tap.asDriver(), alertContentView.sharingIllegalFootageButton.rx.tap.asDriver()) - .drive(with: self, onNext: { owner, _ in + .do { _ in complaintsButtonTapTrigger.accept(()) - owner.homeView.makeToast("신고하기가 완료되었습니다. 해당 사용자와\n서로 차단되며, 신고 사유는 검토 후 처리됩니다.", duration: 3.0, position: .bottom) + + self.homeView.makeToast("신고하기가 완료되었습니다. 해당 사용자와\n서로 차단되며, 신고 사유는 검토 후 처리됩니다.", duration: 3.0, position: .bottom) UIWindow.keyWindow?.rootViewController?.dismiss(animated: false) - }) + } + .drive() .disposed(by: disposeBag) reportButtonTapTriggerObserver.asDriverOnErrorJustEmpty() - .drive(with: self) { owner, _ in - owner.showAlert( + .do { _ in + self.showAlert( topActionTitle: "신고하기", bottomActionTitle: "차단하기", dimColor: DSKitAsset.Color.clear.color, topActionCompletion: { - owner.showAlert( - contentView: owner.alertContentView, + self.showAlert( + contentView: self.alertContentView, topActionTitle: nil, dimColor: DSKitAsset.Color.clear.color, bottomActionCompletion: { timerActiveRelay.accept(true) }, @@ -201,13 +203,13 @@ final class FallingHomeViewController: TFBaseViewController { ) }, bottomActionCompletion: { - owner.showAlert( + self.showAlert( action: .block, dimColor: DSKitAsset.Color.clear.color, topActionCompletion: { blockButtonTapTrigger.accept(()) - owner.homeView.makeToast("차단하기가 완료되었습니다. 해당 사용자와\n서로 차단되며 설정에서 확인 가능합니다.", duration: 3.0, position: .bottom) + self.homeView.makeToast("차단하기가 완료되었습니다. 해당 사용자와\n서로 차단되며 설정에서 확인 가능합니다.", duration: 3.0, position: .bottom) }, bottomActionCompletion: { timerActiveRelay.accept(true) }, dimActionCompletion: { timerActiveRelay.accept(true) } @@ -216,19 +218,21 @@ final class FallingHomeViewController: TFBaseViewController { dimActionCompletion: { timerActiveRelay.accept(true) } ) } + .drive() .disposed(by: disposeBag) Driver.merge(output.complaintsAction, output.blockAction) - .drive(with: self, onNext: { owner, indexPath in - guard let _ = owner.homeView.collectionView.cellForItem(at: indexPath) as? FallingUserCollectionViewCell else { return } + .do { indexPath in + guard let _ = self.homeView.collectionView.cellForItem(at: indexPath) as? FallingUserCollectionViewCell else { return } - owner.deleteItems(indexPath) + self.deleteItems(indexPath) DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { timeOverSubject.onNext(.delete) timerActiveRelay.accept(true) } - }) + } + .drive() .disposed(by: disposeBag) } } diff --git a/XCConfig/Debug.xcconfig b/XCConfig/Debug.xcconfig new file mode 100644 index 00000000..cdf5f704 --- /dev/null +++ b/XCConfig/Debug.xcconfig @@ -0,0 +1,9 @@ +// +// Debug.xcconfig +// +// +// Created by Kanghos on 5/21/24. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 diff --git a/XCConfig/QA.xcconfig b/XCConfig/QA.xcconfig new file mode 100644 index 00000000..5b7eee35 --- /dev/null +++ b/XCConfig/QA.xcconfig @@ -0,0 +1,9 @@ +// +// QA.xcconfig +// +// +// Created by Kanghos on 5/21/24. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 diff --git a/XCConfig/Release.xcconfig b/XCConfig/Release.xcconfig new file mode 100644 index 00000000..483da47f --- /dev/null +++ b/XCConfig/Release.xcconfig @@ -0,0 +1,9 @@ +// +// Release.xcconfig +// +// +// Created by Kanghos on 5/21/24. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 00000000..bffba2f2 --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,6 @@ +app_identifier("com.tht.demo.fallingdemoapp") # The bundle identifier of your app +apple_id(ENV["APPLE_ID"]) # Your Apple Developer Portal username + + +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 00000000..3b070cb2 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,85 @@ +default_platform(:ios) + +platform :ios do + #------------- Config ------------------------- + schemeName = "Falling" + projPath = "./Projects/Features/Falling/Falling.xcodeproj" + + + #------------- FETCH CERTFICATE --------------- + desc "match certificate " + lane :match_certificate do + match( + type: "development", + readonly: true + ) + match( + type: "appstore", + readonly: true + ) + app_store_connect_api_key(is_key_content_base64: true) + end + + + #------------- TEST --------------------------- + desc "Run all the tests" + lane :run_unit_tests do + scan( + scheme: schemeName, + clean: true, + devices: ["iPhone 15"] + ) + end + + #------------- BUILD -------------------------- + desc "build" + lane :gym_app do + match( + type: "appstore", + readonly: true + ) + new_build_number = latest_testflight_build_number() + 1 + + increment_build_number( + build_number: new_build_number, + xcodeproj: projPath + ) + + gym( + scheme: schemeName + ) + end + + #------------- Test Flight -------------------- + desc "upload to TestFlight" + lane :pilot_app do + pilot(skip_waiting_for_build_processing: true) + end + + #------------- run distribution ------------------ + desc "run distribution" + lane :run_app do + match_certificate + gym_app + pilot_app + td + end + + desc "test discord" + lane :td do + discord_notifier( + webhook_url:"https://discord.com/api/webhooks/1242348352973045801/9Y9OMT9AC5Uwpsj9PgckBTsCcYIYvkmvg5ygzqBiR1J9xiNK5UBHnHKlzCWnpdnKY4f6", + title: "title", + description: "테스트플라이트 업로드", + fields:[ + { + name:"version", + value:"업로드 성공" + } + ] + ) + end + +end + + diff --git a/fastlane/Matchfile b/fastlane/Matchfile new file mode 100644 index 00000000..c9f3142a --- /dev/null +++ b/fastlane/Matchfile @@ -0,0 +1,14 @@ +git_url("git@github.com:THT-Team/iOSCertificate.git") + +storage_mode("git") + +# The default type, can be: appstore, adhoc, enterprise or development +type("appstore") + +app_identifier(["com.tht.demo.fallingdemoapp"]) +username("ibcylon@naver.com") # Your Apple Developer Portal username + +# For all available options run `fastlane match --help` +# Remove the # in the beginning of the line to enable the other options + +# The docs are available on https://docs.fastlane.tools/actions/match diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile new file mode 100644 index 00000000..7ef2b026 --- /dev/null +++ b/fastlane/Pluginfile @@ -0,0 +1,5 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +gem 'fastlane-plugin-discord_notifier' diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 00000000..3d510554 --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,72 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## iOS + +### ios match_certificate + +```sh +[bundle exec] fastlane ios match_certificate +``` + +match certificate + +### ios run_unit_tests + +```sh +[bundle exec] fastlane ios run_unit_tests +``` + +Run all the tests + +### ios gym_app + +```sh +[bundle exec] fastlane ios gym_app +``` + +build + +### ios pilot_app + +```sh +[bundle exec] fastlane ios pilot_app +``` + +upload to TestFlight + +### ios run_app + +```sh +[bundle exec] fastlane ios run_app +``` + +run distribution + +### ios td + +```sh +[bundle exec] fastlane ios td +``` + +test discord + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).