Release 2.5.2

.github/workflows/xcode_tests.yml

@@ -9,24 +9,26 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  Xcode_Tests:
-    if: "!contains(github.event.head_commit.message, '#TestFlight')"
+  TestFlight-Alpha:
+    if: "contains(github.event.head_commit.message, '#TestFlight') && !contains(github.event.head_commit.message, '#beta')"
     runs-on: macos-latest
+    environment: Apple TestFlight- Alpha
 
     steps:
     - uses: actions/checkout@v2
 
     - uses: actions/cache@v2
+      id: podcache
       with:
         path: Pods
-        key: ${{ runner.os }}-pods-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Podfile.lock') }}
+        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
         restore-keys: |
                 ${{ runner.os }}-pods-
 
-    - uses: actions/cache@v1
+    - uses: actions/cache@v2
       with:
         path: vendor/bundle
-        key: ${{ runner.os }}-gem-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Gemfile.lock') }}
+        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-gem-
 
@@ -40,19 +42,42 @@ jobs:
         ShipBook_appKey: ${{ secrets.SHIPBOOK_APPKEY }}
         kkid_apikey: ${{ secrets.KKID_APIKEY }}
         newrelic_token: ${{ secrets.NEWRELIC_TOKEN }}
+        unsplash_accesskey: ${{ secrets.UNSPLASH_ACCESSKEY }}
+        unsplash_secretkey: ${{ secrets.UNSPLASH_SECRETKEY }}
       run: bundle exec pod check || bundle exec pod install
 
-    - name: CocoaPods Update
-      if: "contains(github.event.head_commit.message, '#pod update')"
-      run: bundle exec pod update
+    - name: Fastlane Match
+      env:
+        FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
+        FASTLANE_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
+        FASTLANE_USER: "[email protected]"
+        MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
+        MATCH_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
+        MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
+      run: bundle exec fastlane matchget
 
-    - name: Run tests
-      run: bundle exec fastlane test
+    - name: Upload To TestFlight Alpha
+      if: "!contains(github.event.head_commit.message, '#beta')"
+      env:
+        APPLE_APPSTORE_API_ISSUER_ID: ${{ secrets.APPLE_APPSTORE_API_ISSUER_ID }}
+        APPLE_APP_STORE_API_KEY: ${{ secrets.APPLE_APP_STORE_API_KEY }}
+        APPLE_APP_STORE_API_KEY_ID: ${{ secrets.APPLE_APP_STORE_API_KEY_ID }}
+      run: bundle exec fastlane alpha
 
-  TestFlight:
-    if: "contains(github.event.head_commit.message, '#TestFlight')"
+    - name: Commit and Push
+      run: |
+        git config --global user.name 'Justin Kumpe (via GitHub Actions)'
+        git config --global user.email '[email protected]'
+        git remote set-url origin https://x-access-token:${{ secrets.PERSONAL_GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        git commit ./KKid.xcodeproj ./KKid/Info.plist KKidUITests/Info.plist ./fastlane/ -m "Pushed to TestFlight and bumped Build Version Number"
+        git push
+
+  TestFlight-Beta:
+    if: "contains(github.event.head_commit.message, '#TestFlight') && contains(github.event.head_commit.message, '#beta')"
     runs-on: macos-latest
-    environment: Apple App Store
+    environment: 
+      name: Apple TestFlight- Beta
+      url: https://kkid-beta.kumpe.app
 
     steps:
     - uses: actions/checkout@v2
@@ -61,14 +86,14 @@ jobs:
       id: podcache
       with:
         path: Pods
-        key: ${{ runner.os }}-pods-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Podfile.lock') }}
+        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
         restore-keys: |
                 ${{ runner.os }}-pods-
 
     - uses: actions/cache@v2
       with:
         path: vendor/bundle
-        key: ${{ runner.os }}-gem-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Gemfile.lock') }}
+        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-gem-
 
@@ -82,12 +107,10 @@ jobs:
         ShipBook_appKey: ${{ secrets.SHIPBOOK_APPKEY }}
         kkid_apikey: ${{ secrets.KKID_APIKEY }}
         newrelic_token: ${{ secrets.NEWRELIC_TOKEN }}
+        unsplash_accesskey: ${{ secrets.UNSPLASH_ACCESSKEY }}
+        unsplash_secretkey: ${{ secrets.UNSPLASH_SECRETKEY }}
       run: bundle exec pod check || bundle exec pod install
 
-    - name: CocoaPods Update
-      if: "contains(github.event.head_commit.message, '#pod update')"
-      run: bundle exec pod update
-
     - name: Fastlane Match
       env:
         FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
@@ -98,14 +121,6 @@ jobs:
         MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
       run: bundle exec fastlane matchget
 
-    - name: Upload To TestFlight Alpha
-      if: "!contains(github.event.head_commit.message, '#beta')"
-      env:
-        APPLE_APPSTORE_API_ISSUER_ID: ${{ secrets.APPLE_APPSTORE_API_ISSUER_ID }}
-        APPLE_APP_STORE_API_KEY: ${{ secrets.APPLE_APP_STORE_API_KEY }}
-        APPLE_APP_STORE_API_KEY_ID: ${{ secrets.APPLE_APP_STORE_API_KEY_ID }}
-      run: bundle exec fastlane alpha
-
     - name: Upload To TestFlight Beta
       if: "contains(github.event.head_commit.message, '#beta')"
       env:
@@ -115,4 +130,59 @@ jobs:
       run: bundle exec fastlane beta
 
     - name: Commit and Push
-      run: git commit ./KKid.xcodeproj ./KKid/Info.plist KKidUITests/Info.plist ./fastlane/ -m "Updated Fastfile" && git push
+      run: |
+        git config --global user.name 'Justin Kumpe (via GitHub Actions)'
+        git config --global user.email '[email protected]'
+        git remote set-url origin https://x-access-token:${{ secrets.PERSONAL_GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        git commit ./KKid.xcodeproj ./KKid/Info.plist KKidUITests/Info.plist ./fastlane/ -m "Pushed to TestFlight for Public Beta and bumped Build Version Number"
+        git push
+
+  Xcode_Tests:
+    if: ${{ always() }}
+    needs: [TestFlight-Beta,TestFlight-Alpha]
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: actions/cache@v2
+      with:
+        path: Pods
+        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+        restore-keys: |
+                ${{ runner.os }}-pods-
+
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-gem-
+
+    - name: Bundle dependencies
+      run: bundle install
+
+    - name: CocoaPods dependencies
+      env:
+        tmdb_apiKey: ${{ secrets.TMDB_APIKEY }}
+        ShipBook_appId: ${{ secrets.SHIPBOOK_APPID }}
+        ShipBook_appKey: ${{ secrets.SHIPBOOK_APPKEY }}
+        kkid_apikey: ${{ secrets.KKID_APIKEY }}
+        newrelic_token: ${{ secrets.NEWRELIC_TOKEN }}
+        unsplash_accesskey: ${{ secrets.UNSPLASH_ACCESSKEY }}
+        unsplash_secretkey: ${{ secrets.UNSPLASH_SECRETKEY }}
+      run: bundle exec pod check || bundle exec pod install
+
+    - name: CocoaPods Update
+      if: "contains(github.event.head_commit.message, '#pod update')"
+      run: bundle exec pod update
+
+    - name: Install Missing Simulator
+      run: xcrun simctl create "iPad Pro (12.9-inch) (3rd generation)" "com.apple.CoreSimulator.SimDeviceType.iPad-Pro--12-9-inch---3rd-generation-"
+
+    - name: Install xcbeautify
+      uses: Cyberbeni/install-swift-tool@master
+      with:
+        url: https://github.com/tuist/xcbeautify.git
+
+    - name: Run tests
+      run: bundle exec fastlane test

Gemfile.lock

@@ -6,7 +6,7 @@ GEM
     RubyInline (3.12.6)
       ZenTest (~> 4.3)
     ZenTest (4.12.1)
-    activesupport (6.1.6)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -20,8 +20,8 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.610.0)
-    aws-sdk-core (3.131.3)
+    aws-partitions (1.619.0)
+    aws-sdk-core (3.132.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -85,6 +85,7 @@ GEM
     cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
+    colorize (0.8.1)
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.1.10)
@@ -93,13 +94,13 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
     excon (0.92.4)
-    faraday (1.10.0)
+    faraday (1.10.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -128,7 +129,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.208.0)
+    fastlane (2.209.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -169,6 +170,12 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-badge (1.5.0)
       badge (~> 0.13.0)
+    fastlane-plugin-test_center (3.19.1)
+      colorize
+      json
+      plist
+      xcodeproj
+      xctest_list (>= 1.2.1)
     ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -188,19 +195,19 @@ GEM
       google-apis-core (>= 0.7, < 2.a)
     google-apis-playcustomapp_v1 (0.10.0)
       google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.18.0)
+    google-apis-storage_v1 (0.17.0)
       google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.37.0)
+    google-cloud-storage (1.38.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.17.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -215,15 +222,15 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
     json (2.6.2)
     jwt (2.4.1)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    minitest (5.16.2)
+    minitest (5.16.3)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -267,7 +274,7 @@ GEM
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
@@ -287,6 +294,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
+    xctest_list (1.2.1)
     zeitwerk (2.6.0)
 
 PLATFORMS
@@ -298,6 +306,7 @@ DEPENDENCIES
   cocoapods-keys
   fastlane
   fastlane-plugin-badge
+  fastlane-plugin-test_center
 
 BUNDLED WITH
-   2.3.17
+   2.3.18

KKid.xcodeproj/project.pbxproj

@@ -894,15 +894,15 @@
 				CODE_SIGN_ENTITLEMENTS = KKid/KKid.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 44;
+				CURRENT_PROJECT_VERSION = 65;
 				DEVELOPMENT_TEAM = 2T42Z3DM34;
 				INFOPLIST_FILE = KKid/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.1;
+				MARKETING_VERSION = 2.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kumpeapps.ios.KKid;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development com.kumpeapps.ios.KKid";
@@ -919,15 +919,15 @@
 				CODE_SIGN_ENTITLEMENTS = KKid/KKid.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 44;
+				CURRENT_PROJECT_VERSION = 65;
 				DEVELOPMENT_TEAM = 2T42Z3DM34;
 				INFOPLIST_FILE = KKid/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.1;
+				MARKETING_VERSION = 2.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kumpeapps.ios.KKid;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.kumpeapps.ios.KKid";

KKid/Controller/AllowanceViewController.swift

@@ -32,8 +32,8 @@ class AllowanceViewController: UIViewController, NSFetchedResultsControllerDeleg
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         reachable = ReachabilitySetup()
-        imageLogo.image = PersistBackgrounds.loadImage(isBackground: false)
-        imageBackground.image = PersistBackgrounds.loadImage(isBackground: true)
+        imageLogo.imageFromiCloud(imageName: "logo", waitForUpdate: false)
+        imageBackground.imageFromiCloud(imageName: "background", waitForUpdate: false)
         let image = Pathifier.makeImage(for: NSAttributedString(string: "$"), withFont: UIFont(name: "QDBetterComicSansBold", size: 109)!, withPatternImage: UIImage(named: "money")!)
         imageBalance.image = image
         getAllowance()

KKid/Controller/ChoresViewController.swift

@@ -99,8 +99,8 @@ class ChoresViewController: UIViewController {
         tableView.tableFooterView = UIView()
         tableView.delegate = self
         tableView.dataSource = self
-        imageLogo.image = PersistBackgrounds.loadImage(isBackground: false)
-        imageBackground.image = PersistBackgrounds.loadImage(isBackground: true)
+        imageLogo.imageFromiCloud(imageName: "logo", waitForUpdate: false)
+        imageBackground.imageFromiCloud(imageName: "background", waitForUpdate: false)
         buttonAdd.isEnabled = LoggedInUser.user!.isAdmin
         if let indexPath = tableView.indexPathForSelectedRow {
             tableView.deselectRow(at: indexPath, animated: false)