diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b05f1ef8..9ab169ed 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: Setup GoogleService-Info.plist + run: | + mkdir -p "Friendly Competitions/Firebase/Release" + echo $GOOGLE_SERVICE_INFO_RELEASE > "Friendly Competitions/Firebase/Release/GoogleService-Info.plist" + env: + GOOGLE_SERVICE_INFO_RELEASE: ${{ secrets.GOOGLE_SERVICE_INFO_RELEASE }} - name: Homebrew run: brew bundle + + # https://docs.fastlane.tools/getting-started/ios/authentication/ - name: Deploy - run: fastlane release \ No newline at end of file + run: fastlane deploy + env: + APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }} + APP_STORE_CONNECT_API_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_ISSUER_ID }} + APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }} + MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2867ec8c..539fc8c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: Run unit tests on: pull_request: - branches: [ main ] + branches: [main, release/*] jobs: build: @@ -14,6 +14,12 @@ jobs: uses: actions/checkout@v2 - name: Restore build cache uses: mikehardy/buildcache-action@v1 + - name: Setup GoogleService-Info.plist + run: | + mkdir -p "Friendly Competitions/Firebase/Debug" + echo $GOOGLE_SERVICE_INFO_DEBUG > "Friendly Competitions/Firebase/Debug/GoogleService-Info.plist" + env: + GOOGLE_SERVICE_INFO_DEBUG: ${{ secrets.GOOGLE_SERVICE_INFO_DEBUG }} - name: Homebrew run: brew bundle - name: Test diff --git a/Friendly Competitions.xcodeproj/project.pbxproj b/Friendly Competitions.xcodeproj/project.pbxproj index 524a4b40..33d63015 100644 --- a/Friendly Competitions.xcodeproj/project.pbxproj +++ b/Friendly Competitions.xcodeproj/project.pbxproj @@ -43,10 +43,10 @@ C132336927BECCA800196D81 /* AttributedText.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132336827BECCA800196D81 /* AttributedText.swift */; }; C132336B27BF0AF700196D81 /* Sticker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132336A27BF0AF700196D81 /* Sticker.swift */; }; C132336D27BF0C0F00196D81 /* View+CornerRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132336C27BF0C0F00196D81 /* View+CornerRadius.swift */; }; + C132944A27DAB12200117548 /* DeepLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132944927DAB12200117548 /* DeepLinkTests.swift */; }; C132945227DB8DF000117548 /* ImageAsset+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132945127DB8DF000117548 /* ImageAsset+Extensions.swift */; }; C132945627DF6D9E00117548 /* Binding+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132945527DF6D9E00117548 /* Binding+Extensions.swift */; }; C132945827DF703C00117548 /* Publisher+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132945727DF703C00117548 /* Publisher+Extensions.swift */; }; - C132944A27DAB12200117548 /* DeepLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132944927DAB12200117548 /* DeepLinkTests.swift */; }; C1386C7E26D566210096E952 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = C1386C7D26D566210096E952 /* FirebaseAuth */; }; C13F922A27BFFEB500FC6880 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = C13F922927BFFEB500FC6880 /* FirebaseStorage */; }; C13F922C27BFFF9900FC6880 /* StorageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13F922B27BFFF9900FC6880 /* StorageManager.swift */; }; @@ -190,10 +190,10 @@ C132336827BECCA800196D81 /* AttributedText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedText.swift; sourceTree = ""; }; C132336A27BF0AF700196D81 /* Sticker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sticker.swift; sourceTree = ""; }; C132336C27BF0C0F00196D81 /* View+CornerRadius.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+CornerRadius.swift"; sourceTree = ""; }; + C132944927DAB12200117548 /* DeepLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinkTests.swift; sourceTree = ""; }; C132945127DB8DF000117548 /* ImageAsset+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ImageAsset+Extensions.swift"; sourceTree = ""; }; C132945527DF6D9E00117548 /* Binding+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Binding+Extensions.swift"; sourceTree = ""; }; C132945727DF703C00117548 /* Publisher+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Publisher+Extensions.swift"; sourceTree = ""; }; - C132944927DAB12200117548 /* DeepLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinkTests.swift; sourceTree = ""; }; C1386C8126D56CD60096E952 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; C13F922B27BFFF9900FC6880 /* StorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageManager.swift; sourceTree = ""; }; C13F922D27C0017400FC6880 /* FirestoreImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestoreImage.swift; sourceTree = ""; }; diff --git a/Friendly Competitions/Firebase/Debug/GoogleService-Info.plist b/Friendly Competitions/Firebase/Debug/GoogleService-Info.plist deleted file mode 100644 index fda034ae..00000000 --- a/Friendly Competitions/Firebase/Debug/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - CLIENT_ID - 787056522440-po3e4qhi7fhdn5j0mm8mp60a9qccdpfi.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.787056522440-po3e4qhi7fhdn5j0mm8mp60a9qccdpfi - API_KEY - AIzaSyBl7DXJT1Au4iCksyU_cY1d7siKe8JE3Fg - GCM_SENDER_ID - 787056522440 - PLIST_VERSION - 1 - BUNDLE_ID - com.evancooper.FriendlyCompetitions.debug - PROJECT_ID - compyboi-79ae0 - STORAGE_BUCKET - compyboi-79ae0.appspot.com - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:787056522440:ios:7f8c86b5fa545ff7c121fd - DATABASE_URL - https://compyboi-79ae0-default-rtdb.firebaseio.com - - diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 49c6b5e2..d1609418 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,40 +1,6 @@ -# This file contains the fastlane.tools configuration -# You can find the documentation at https://docs.fastlane.tools -# -# For a list of all available actions, check out -# -# https://docs.fastlane.tools/actions -# -# For a list of all available plugins, check out -# -# https://docs.fastlane.tools/plugins/available-plugins -# - -# Uncomment the line if you want fastlane to automatically update itself -# update_fastlane - -default_platform(:ios) +default_platform :ios platform :ios do - desc "Push a new release build to the App Store" - lane :release do - increment_build_number(xcodeproj: "Friendly Competitions.xcodeproj") - build_app(scheme: "Friendly Competitions") - upload_to_app_store - end -end - -lane :test do - run_tests(scheme: "Friendly Competitions") -end - -lane :release do |options| - match(type: "appstore", readonly: is_ci) - build_app( - scheme: "Friendly Competitions", - include_bitcode: true - ) - upload_to_app_store( - force: true - ) + import "lanes/deploy.rb" + import "lanes/test.rb" end \ No newline at end of file diff --git a/fastlane/README.md b/fastlane/README.md index 9008f031..cd880bcc 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -13,34 +13,23 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do # Available Actions -### test - -```sh -[bundle exec] fastlane test -``` - - +## iOS -### release +### ios deploy ```sh -[bundle exec] fastlane release +[bundle exec] fastlane ios deploy ``` ----- - - -## iOS - -### ios release +### ios test ```sh -[bundle exec] fastlane ios release +[bundle exec] fastlane ios test ``` -Push a new release build to the App Store + ---- diff --git a/fastlane/lanes/deploy.rb b/fastlane/lanes/deploy.rb new file mode 100644 index 00000000..23d641da --- /dev/null +++ b/fastlane/lanes/deploy.rb @@ -0,0 +1,25 @@ +lane :deploy do + setup_ci + app_store_connect_api_key( + key_id: ENV["APP_STORE_CONNECT_API_KEY_ID"], + issuer_id: ENV["APP_STORE_CONNECT_API_ISSUER_ID"], + key_content: ENV["APP_STORE_CONNECT_API_KEY_CONTENT"], + duration: 1200, # optional (maximum 1200) + in_house: false # optional but may be required if using match/sigh + ) if is_ci + match(type: "appstore", readonly: true) + increment_build_number( + build_number: latest_testflight_build_number + 1 + ) + build_app( + include_bitcode: true + ) + upload_symbols_to_crashlytics( + gsp_path: "Friendly Competitions/Firebase/Release/GoogleService-Info.plist", + binary_path: "fastlane/scripts/upload-symbols" + ) + upload_to_app_store( + force: true, + precheck_include_in_app_purchases: false + ) +end \ No newline at end of file diff --git a/fastlane/lanes/test.rb b/fastlane/lanes/test.rb new file mode 100644 index 00000000..5ff23e05 --- /dev/null +++ b/fastlane/lanes/test.rb @@ -0,0 +1,3 @@ +lane :test do + run_tests(scheme: "Friendly Competitions") +end \ No newline at end of file diff --git a/fastlane/scripts/upload-symbols b/fastlane/scripts/upload-symbols new file mode 100755 index 00000000..e450db65 Binary files /dev/null and b/fastlane/scripts/upload-symbols differ diff --git a/icon/android/ic_launcher-web.png b/icon/android/ic_launcher-web.png deleted file mode 100644 index 0c6faf60..00000000 Binary files a/icon/android/ic_launcher-web.png and /dev/null differ diff --git a/icon/android/mipmap-anydpi-v26/ic_launcher.xml b/icon/android/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc..00000000 --- a/icon/android/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/icon/android/mipmap-anydpi-v26/ic_launcher_round.xml b/icon/android/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc..00000000 --- a/icon/android/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/icon/android/mipmap-hdpi/ic_launcher.png b/icon/android/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 3be60068..00000000 Binary files a/icon/android/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/icon/android/mipmap-hdpi/ic_launcher_foreground.png b/icon/android/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index f7df0680..00000000 Binary files a/icon/android/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/icon/android/mipmap-hdpi/ic_launcher_round.png b/icon/android/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 0cd9cfea..00000000 Binary files a/icon/android/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/icon/android/mipmap-ldpi/ic_launcher.png b/icon/android/mipmap-ldpi/ic_launcher.png deleted file mode 100644 index c7278ab7..00000000 Binary files a/icon/android/mipmap-ldpi/ic_launcher.png and /dev/null differ diff --git a/icon/android/mipmap-mdpi/ic_launcher.png b/icon/android/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index f1fe3ae7..00000000 Binary files a/icon/android/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/icon/android/mipmap-mdpi/ic_launcher_foreground.png b/icon/android/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index e5c164b8..00000000 Binary files a/icon/android/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/icon/android/mipmap-mdpi/ic_launcher_round.png b/icon/android/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 9bb7e81e..00000000 Binary files a/icon/android/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/icon/android/mipmap-xhdpi/ic_launcher.png b/icon/android/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 1ac4e40c..00000000 Binary files a/icon/android/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/icon/android/mipmap-xhdpi/ic_launcher_foreground.png b/icon/android/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 40c7af91..00000000 Binary files a/icon/android/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/icon/android/mipmap-xhdpi/ic_launcher_round.png b/icon/android/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 38130770..00000000 Binary files a/icon/android/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/icon/android/mipmap-xxhdpi/ic_launcher.png b/icon/android/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 1230e335..00000000 Binary files a/icon/android/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/icon/android/mipmap-xxhdpi/ic_launcher_foreground.png b/icon/android/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 731237eb..00000000 Binary files a/icon/android/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/icon/android/mipmap-xxhdpi/ic_launcher_round.png b/icon/android/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index c4dde9c2..00000000 Binary files a/icon/android/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/icon/android/mipmap-xxxhdpi/ic_launcher.png b/icon/android/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 7f40d79a..00000000 Binary files a/icon/android/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/icon/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/icon/android/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index c0982a15..00000000 Binary files a/icon/android/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/icon/android/mipmap-xxxhdpi/ic_launcher_round.png b/icon/android/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index a3589059..00000000 Binary files a/icon/android/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/icon/android/playstore-icon.png b/icon/android/playstore-icon.png deleted file mode 100644 index 33e20ccf..00000000 Binary files a/icon/android/playstore-icon.png and /dev/null differ diff --git a/icon/android/values/ic_launcher_background.xml b/icon/android/values/ic_launcher_background.xml deleted file mode 100644 index 53721124..00000000 --- a/icon/android/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #261f22 - \ No newline at end of file diff --git a/icon/raw.png b/icon/raw.png deleted file mode 100644 index 2d946fe6..00000000 Binary files a/icon/raw.png and /dev/null differ