Merge branch 'master' into release

Author: roninopf

.codeclimate.yml

@@ -0,0 +1,68 @@
+version: "2"
+exclude_patterns:
+  - ".*/"
+  - "build/"
+  - "host-app/"
+  - "images/"
+  - "inbox-ui-tests-app/"
+  - "sample-apps/"
+  - "scripts/"
+  - "swift-sdk/Resources/"
+  - "swift-sdk/Internal/Dwifft"
+  - "tests/"
+  - "ui-tests-app/"
+  - "**/.*"
+  - "**/*.h"
+  - "**/*.md"
+  - "**/*.plist"
+  - "**/*.podspec"
+  - "**/*.xcodeproj"
+  - "**/*.yml"
+  - "Package.swift"
+plugins:
+  tailor:
+    enabled: true
+    checks:
+      trailing-whitespace:
+        enabled: false
+checks:
+  argument-count:
+    enabled: true
+    config:
+      threshold: 4
+  complex-logic:
+    enabled: true
+    config:
+      threshold: 4
+  file-lines:
+    enabled: true
+    config:
+      threshold: 250
+  method-complexity:
+    enabled: true
+    config:
+      threshold: 5
+  method-count:
+    enabled: true
+    config:
+      threshold: 20
+  method-lines:
+    enabled: true
+    config:
+      threshold: 25
+  nested-control-flow:
+    enabled: true
+    config:
+      threshold: 4
+  return-statements:
+    enabled: true
+    config:
+      threshold: 4
+  similar-code:
+    enabled: true
+    config:
+      threshold: 40
+  identical-code:
+    enabled: true
+    config:
+      threshold: 40

.github/workflows/build-and-test.yml

@@ -3,7 +3,7 @@ name: Build and test
 on: pull_request
 
 jobs:
-  build:
+  run-tests-job:
     runs-on: macos-latest
 
     steps:

.github/workflows/e2e.yml

@@ -0,0 +1,25 @@
+name: Integration Testing
+
+on: pull_request
+
+jobs:
+  run-e2e-job:
+    runs-on: macos-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: maxim-lobanov/[email protected]
+      with:
+        xcode-version: 12.0
+
+    - name: Build and test
+      env: 
+        api_key: ${{secrets.E2E_API_KEY}}
+        push_campaign_id: ${{secrets.E2E_PUSH_CAMPAIGN_ID}}
+        push_template_id: ${{secrets.E2E_PUSH_TEMPLATE_ID}}
+        in_app_campaign_id: ${{secrets.E2E_IN_APP_CAMPAIGN_ID}}
+        in_app_template_id: ${{secrets.E2E_IN_APP_TEMPLATE_ID}}
+      run: |
+        ./tests/endpoint-tests/scripts/run_test.sh
+        

.gitignore

@@ -12,4 +12,8 @@ Pods/
 
 dev.config
 
-Build/
+Build/
+
+# needed integration testing
+env_vars.sh
+CI.swift

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode11.3
+osx_image: xcode12
 language: swift
 
 # if debugging this script, don't forget to check the environment vars on https://travis-ci.com/Iterable/swift-sdk/settings

BETA-TOS.md

@@ -1,4 +1,4 @@
-![Iterable logo](./images/Iterable-Logo.png "Iterable Logo")
+![Iterable logo](https://raw.githubusercontent.com/Iterable/swift-sdk/master/images/Iterable-Logo.png "Iterable Logo")
 
 [![License](https://img.shields.io/github/license/Iterable/swift-sdk)](https://opensource.org/licenses/MIT)
 [![Build Status](https://travis-ci.com/Iterable/swift-sdk.svg?branch=master)](https://travis-ci.com/Iterable/swift-sdk)
@@ -52,8 +52,9 @@ Release notes:
 
 Support policies:
 
-- Iterable's [Mobile SDK Support Policy](https://support.iterable.com/hc/articles/360027798391#mobile-sdk-support-policy)
-- Iterable's [iOS SDK Deprecation and End-of-Life Schedule](https://support.iterable.com/hc/articles/360027798391#ios-sdk-deprecation-and-end-of-life-schedule)
+- Iterable's [Mobile SDK Support Policy](https://support.iterable.com/hc/articles/360046136171)
+- Iterable's [iOS SDK Deprecation and End-of-Life Schedule](https://support.iterable.com/hc/articles/360027798391#deprecation-and-end-of-life-schedule)
+- Iterable's [Beta Mobile SDK Disclaimer](https://support.iterable.com/hc/articles/360034753412)
 
 Troubleshooting:
 
@@ -65,7 +66,7 @@ Please contact your customer success manager with any questions.
 
 ## License
 
-This SDK is released under the MIT License. See [LICENSE](https://github.com/Iterable/swift-sdk/blob/master/LICENSE?raw=true)
+This SDK is released under the MIT License. See [LICENSE](https://github.com/Iterable/swift-sdk/blob/master/LICENSE.md)
 for more information.
 
 ## Want to contribute?

LICENSE renamed to LICENSE.md

@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        return true
+        true
     }
 
     func applicationWillResignActive(_: UIApplication) {

README.md

@@ -11,7 +11,7 @@ import UserNotifications
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
     static var sharedInstance: AppDelegate {
-        return UIApplication.shared.delegate as! AppDelegate
+        UIApplication.shared.delegate as! AppDelegate
     }
 
     var window: UIWindow?
@@ -33,10 +33,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let config = IterableConfig()
         config.customActionDelegate = self
         config.urlDelegate = self
-        TestHelper.getTestUserDefaults().set("[email protected]", forKey: Const.UserDefaults.emailKey)
-        
+        let localStorage = MockLocalStorage()
+        localStorage.email = "[email protected]"
         IterableAPI.initializeForTesting(config: config,
                                          networkSession: mockNetworkSession,
+                                         localStorage: localStorage,
                                          inAppFetcher: mockInAppFetcher,
                                          urlOpener: AppUrlOpener())