chore: update for release 3.5.0 (#371)

* update for release

* update readme and revert podspec

* Update CHANGELOG.md

Co-authored-by: Jae Kim <45045038+jaeopt@users.noreply.github.com>

* releasing today

* fix datafile handler test that used outside url

Co-authored-by: Jae Kim <45045038+jaeopt@users.noreply.github.com>

Author: thomaszurkan-optimizely

.travis.yml

@@ -106,7 +106,7 @@ jobs:
       os: osx
       osx_image: xcode11.3
       env:
-        - VERSION=3.4.1
+        - VERSION=3.5.0
       install:
         # install hub
         - wget https://github.com/github/hub/releases/download/v2.11.2/hub-darwin-amd64-2.11.2.tgz -O /tmp/hub-darwin-amd64-2.11.2.tgz && tar -xvf /tmp/hub-darwin-amd64-2.11.2.tgz -C /usr/local/opt && ln -s /usr/local/opt/hub-darwin-amd64-2.11.2/bin/hub /usr/local/bin/hub
@@ -123,7 +123,7 @@ jobs:
       os: osx
       osx_image: xcode11.3
       env:
-        - VERSION=3.4.1
+        - VERSION=3.5.0
       install:
         # install hub
         - wget https://github.com/github/hub/releases/download/v2.11.2/hub-darwin-amd64-2.11.2.tgz -O /tmp/hub-darwin-amd64-2.11.2.tgz && tar -xvf /tmp/hub-darwin-amd64-2.11.2.tgz -C /usr/local/opt && ln -s /usr/local/opt/hub-darwin-amd64-2.11.2/bin/hub /usr/local/bin/hub

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Optimizely Swift SDK Changelog
 
+## 3.5.0
+October 2, 2020
+
+### New Features
+* Add versioning that follows semantic version types and tests. ([#333](https://github.com/optimizely/swift-sdk/pull/333))
+
+### Bug Fixes
+* Fixing log messages for Targeted Rollouts and feature variable evaluation. ([#337](https://github.com/optimizely/swift-sdk/pull/337))
+
 ## 3.4.1
 September 22, 2020
 

README.md

@@ -34,22 +34,22 @@ Please note below that _\<platform\>_ is used to represent the platform on which
 ```
 dependencies: [
 	.package(url: "https://github.com/optimizely/swift-sdk.git", 
-    .upToNextMinor(from: “3.4.1”))
+    .upToNextMinor(from: “3.5.0”))
 ]
 ```
 
 #### CocoaPods 
 1. Add the following lines to the _Podfile_:<pre>
 ```use_frameworks!```
-```pod 'OptimizelySwiftSDK', '~> 3.4.1'```
+```pod 'OptimizelySwiftSDK', '~> 3.5.0'```
 </pre>
 
 2. Run the following command: <pre>``` pod install ```</pre>
 
 Further installation instructions for Cocoapods: https://guides.cocoapods.org/using/getting-started.html
 
 #### Carthage
-1. Add the following lines to the _Cartfile_:<pre>```github "optimizely/swift-sdk" ~> 3.4.1```</pre>
+1. Add the following lines to the _Cartfile_:<pre>```github "optimizely/swift-sdk" ~> 3.5.0```</pre>
 
 2. Run the following command:<pre>```carthage update```</pre>
 

Tests/OptimizelyTests-Common/DatafileHandlerTests.swift

@@ -478,10 +478,23 @@ class DatafileHandlerTests: XCTestCase {
         XCTAssert(count == 9)
     }
 
+    class TimoutDatafileHandler : DefaultDatafileHandler {
+        var localFileUrl:URL?
+        // override getSession to return our own session.
+        override func getSession(resourceTimeoutInterval: Double?) -> URLSession {
+            var session = MockUrlSession(failureCode: 200, withError: false)
+            session.downloadCacheUrl = localFileUrl
+            // will return 500
+            if let _ = resourceTimeoutInterval {
+                session = MockUrlSession(failureCode: 408, withError: true)
+            }
+            
+            return session
+        }
+    }
 
     func testDownloadTimeout() {
-        let handler = DefaultDatafileHandler()
-        handler.endPointStringFormat = "https://httpstat.us/200?sleep=5000&datafile=%@"
+        let handler = TimoutDatafileHandler()
 
         let expectation = XCTestExpectation(description: "should fail before 10")
         handler.downloadDatafile(sdkKey: "invalidKey1212121", resourceTimeoutInterval: 3) { (result) in
@@ -498,16 +511,20 @@ class DatafileHandlerTests: XCTestCase {
     }
 
     func testDownloadWithoutTimeout() {
-        let handler = DefaultDatafileHandler()
-        handler.endPointStringFormat = "https://httpstat.us/200?sleep=3000&datafile=%@"
-        
+
+        let handler = TimoutDatafileHandler()
+        // create a dummy file at a url to use as or datafile cdn location
+        let localUrl = OTUtils.saveAFile(name: "invalidKeyXXXXX", data: "{}".data(using: .utf8)!)
+        handler.localFileUrl = localUrl
+
         let expectation = XCTestExpectation(description: "will wait for response.")
         handler.downloadDatafile(sdkKey: "invalidKeyXXXXX") { (result) in
 
             if case let .success(data) = result  {
                 print(data ?? "")
                 XCTAssert(true)
                 expectation.fulfill()
+                OTUtils.removeAFile(name: "invalidKeyXXXXX")
             }
         }