Merge branch 'release/1.1.4'

.gitignore

@@ -31,7 +31,7 @@ mb.log
 mb.pid
 
 # Cocoapods
-Pods/
+# Pods/
 
 # Carthage
 Carthage/

.travis.yml

@@ -1,17 +1,53 @@
 language: objective-c
-osx_image: xcode11.1
+osx_image: xcode11.2
+
 env:
-  matrix:
-  - TEST_PLATFORM="platform=iOS Simulator,OS=13.1,name=iPhone 8"
   global:
-    secure: H45yyUlB0cXQrzTTcnmD3WrkCyqjUzaop2jHgmBF3bm8ue4XOcTWKDSDcAN39SG0FUeDC7GdDCtWAc3VCpLwN++5IznAnvBuZSGgxQ2lCxWMhdTtXtOWU2mivgVvs+uldS7/TuVlOjZ7inrTgetl+jgFjenwESOGIIZwn7SXpPo=
+    - secure: H45yyUlB0cXQrzTTcnmD3WrkCyqjUzaop2jHgmBF3bm8ue4XOcTWKDSDcAN39SG0FUeDC7GdDCtWAc3VCpLwN++5IznAnvBuZSGgxQ2lCxWMhdTtXtOWU2mivgVvs+uldS7/TuVlOjZ7inrTgetl+jgFjenwESOGIIZwn7SXpPo=
+    - BUILD_DEST="platform=iOS Simulator,OS=13.2,name=iPhone 8"
+    - BUILD_PROJECT_LIB="-project Snowplow.xcodeproj"
+    - BUILD_SCHEME_LIB="-scheme Snowplow-iOS"
+    - BUILD_WORKSPACE_OBJC_DEMO="-workspace SnowplowDemo.xcworkspace"
+    - BUILD_SCHEME_OBJC_DEMO="-scheme SnowplowDemo"
+    - BUILD_WORKSPACE_SWIFT_DEMO="-workspace SnowplowSwiftDemo.xcworkspace"
+    - BUILD_PROJECT_SWIFT_DEMO="-project SnowplowSwiftDemo.xcodeproj"
+    - BUILD_SCHEME_SWIFT_DEMO="-scheme SnowplowSwiftDemo"
+
 rvm:
     - 2.3.7
+
 before_install:
-    - gem install slather
-    - gem install xcpretty -N --no-document
-    - gem install cocoapods -v '1.5.3'
-install:
-    - ./.travis/install.sh
-script: ./.travis/test.sh
-after_success: slather
+  - gem install slather
+  - gem install xcpretty -N --no-document
+  - gem install cocoapods -v '1.8.4'
+
+jobs:
+  include:
+    - name: "Test Snowplow framework [iOS]"
+      install:
+        - carthage bootstrap --platform iOS
+      script:
+        - set -o pipefail && xcodebuild -sdk iphonesimulator -destination "${BUILD_DEST}" ${BUILD_PROJECT_LIB} ${BUILD_SCHEME_LIB} clean test | xcpretty
+      after_success: slather
+
+    - name: "Test Snowplow ObjC demo app [iOS]"
+      install:
+        - cd Examples/SnowplowDemo
+        - pod update
+      script:
+        - set -o pipefail && xcodebuild -sdk iphonesimulator -destination "${BUILD_DEST}" ${BUILD_WORKSPACE_OBJC_DEMO} ${BUILD_SCHEME_OBJC_DEMO} clean build | xcpretty
+
+    - name: "Test Snowplow Swift demo app [iOS] using Cocoapods"
+      install:
+        - cd Examples/SnowplowSwiftCocoapodsDemo
+        - pod update
+      script:
+        - set -o pipefail && xcodebuild -sdk iphonesimulator -destination "${BUILD_DEST}" ${BUILD_WORKSPACE_SWIFT_DEMO} ${BUILD_SCHEME_SWIFT_DEMO} clean build | xcpretty
+
+    - name: "Test Snowplow Swift demo app [iOS] using Carthage"
+      install:
+        - cd Examples/SnowplowSwiftCarthageDemo
+        - ./generateCartfile.sh
+        - carthage update --platform ios
+      script:
+        - set -o pipefail && xcodebuild -sdk iphonesimulator -destination "${BUILD_DEST}" ${BUILD_PROJECT_SWIFT_DEMO} ${BUILD_SCHEME_SWIFT_DEMO} clean build | xcpretty

CHANGELOG

@@ -1,3 +1,18 @@
+Version 1.1.4 (2019-11-11)
+--------------------------
+Fix doc of method setTimestamp (close #467)
+Set simulator device model information when it runs on simulator (close #468)
+Update swift demo app for 1.1.4 (close #460)
+Update objc demo app for 1.1.4 (close #461)
+Fix Slather (close #453)
+SnowplowTracker-swift.h file not found static lib building (close #427)
+Fix building issues on MacOS target (close #466)
+Fix bridging issues importing the framework on swift demo app (close #458)
+Fix installation of SnowplowTracker via Carthage (#457)
+Fix Nocilla at 0.11 (#455)
+Comply with isAdvertisingTrackingEnabled (#447)
+Fix incomplete device model information (#444)
+
 Version 1.1.3 (2019-10-18)
 --------------------------
 Fix broken build process (#452)

Cartfile

@@ -1,5 +1,5 @@
 # Reachability.swift
-github "ashleymills/Reachability.swift" ~> 4.3
+github "ashleymills/Reachability.swift" ~> 4.3.1
 
 # FMDB
-github "ccgus/fmdb" ~> 2.7
+github "ccgus/fmdb" ~> 2.6

Cartfile.private

@@ -1,5 +1,5 @@
 # Stub library for testing
-github "luisobo/Nocilla" ~> 0.11.0
+github "luisobo/Nocilla" == 0.11.0
 
 # objc-iglu-client
 github "snowplow/iglu-objc-client" "feature/carthage"

SnowplowSwiftDemo/SnowplowSwiftDemo/AppDelegate.swift → Examples/CommonSwiftCode/AppDelegate.swift

@@ -55,7 +55,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 formatter.timeStyle = .medium
                 formatter.locale = Locale(identifier: "en_US")
                 let dateString = formatter.string(from: response.notification.date)
-
+                
                 let event = SPPushNotification.build({(builder : SPPushNotificationBuilder?) -> Void in
                     builder!.setAction(actionIdentifier)
                     builder!.setTrigger(SPUtilities.getTriggerType(request.trigger))
@@ -64,7 +64,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                     builder!.setThreadIdentifier(requestContent.threadIdentifier)
                     builder!.setNotification(content)
                 })
-
+                
                 //print(String(data: try! JSONSerialization.data(withJSONObject: event!.getPayload().getAsDictionary(), options: .prettyPrinted), encoding: .utf8 )!)
                 rootViewController.tracker?.trackPushNotificationEvent(event)
             }
@@ -74,11 +74,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
     }
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         UNUserNotificationCenter.current().requestAuthorization(options:[.badge, .alert, .sound]){ (granted, error) in }
         application.registerForRemoteNotifications()
         UNUserNotificationCenter.current().delegate = self
-
+        
         return true
     }