Added macOS and tvOS compatibility (matomo-org#155)

* re-enabled building the ios_demo app while performing tests * renamed ios test project * added macos example application * removed UIKit dependencies * Added tvOS Support * Moved ios Example Application * Updated travis to use the xcode8.3 image and always build the osx and tvos demos
niksawtschuk · Jun 10, 2017 · 9a46e68 · 9a46e68
1 parent 8b2eeec
commit 9a46e68
Show file tree

Hide file tree

Showing 88 changed files with 2,292 additions and 97 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,5 +5,5 @@ before_install:
     - cd $TRAVIS_BUILD_DIR
     - pod install || pod install --repo-update
 script: rake test
-osx_image: xcode8
+osx_image: xcode8.3
 cache: cocoapods
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Unreleased
+* **feature** Added macOS and tvOS compatibility. [#134](https://github.com/piwik/piwik-sdk-ios/issues/134)
+
 ## 4.0.0
 * **feature** Renamed the Tracker to PiwikTracker. [#146](https://github.com/piwik/piwik-sdk-ios/issues/146)
 * **feature** Added isOptedOut parameter to the PiwikTracker. [#124](https://github.com/piwik/piwik-sdk-ios/issues/124)

diff --git a/Example/iOS Example/AppDelegate.swift → Example/ios/iOS Example/AppDelegate.swift b/Example/iOS Example/AppDelegate.swift → Example/ios/iOS Example/AppDelegate.swift
diff --git a/Example/iOS Example/CampaignViewController.h → .../ios/iOS Example/CampaignViewController.h b/Example/iOS Example/CampaignViewController.h → .../ios/iOS Example/CampaignViewController.h
diff --git a/Example/iOS Example/CampaignViewController.m → .../ios/iOS Example/CampaignViewController.m b/Example/iOS Example/CampaignViewController.m → .../ios/iOS Example/CampaignViewController.m
diff --git a/...Example/ConfigurationViewController.swift → ...Example/ConfigurationViewController.swift b/...Example/ConfigurationViewController.swift → ...Example/ConfigurationViewController.swift
diff --git a/...OS Example/ContentTrackerViewController.h → ...OS Example/ContentTrackerViewController.h b/...OS Example/ContentTrackerViewController.h → ...OS Example/ContentTrackerViewController.h
diff --git a/...OS Example/ContentTrackerViewController.m → ...OS Example/ContentTrackerViewController.m b/...OS Example/ContentTrackerViewController.m → ...OS Example/ContentTrackerViewController.m
diff --git a/...S Example/CustomVariablesViewController.h → ...S Example/CustomVariablesViewController.h b/...S Example/CustomVariablesViewController.h → ...S Example/CustomVariablesViewController.h
diff --git a/...S Example/CustomVariablesViewController.m → ...S Example/CustomVariablesViewController.m b/...S Example/CustomVariablesViewController.m → ...S Example/CustomVariablesViewController.m
diff --git a/Example/iOS Example/DownloadViewController.h → .../ios/iOS Example/DownloadViewController.h b/Example/iOS Example/DownloadViewController.h → .../ios/iOS Example/DownloadViewController.h
diff --git a/Example/iOS Example/DownloadViewController.m → .../ios/iOS Example/DownloadViewController.m b/Example/iOS Example/DownloadViewController.m → .../ios/iOS Example/DownloadViewController.m
diff --git a/...ple/iOS Example/EcommerceViewController.h → ...ios/iOS Example/EcommerceViewController.h b/...ple/iOS Example/EcommerceViewController.h → ...ios/iOS Example/EcommerceViewController.h
diff --git a/...ple/iOS Example/EcommerceViewController.m → ...ios/iOS Example/EcommerceViewController.m b/...ple/iOS Example/EcommerceViewController.m → ...ios/iOS Example/EcommerceViewController.m
diff --git a/Example/iOS Example/EventsViewController.h → ...le/ios/iOS Example/EventsViewController.h b/Example/iOS Example/EventsViewController.h → ...le/ios/iOS Example/EventsViewController.h
diff --git a/Example/iOS Example/EventsViewController.m → ...le/ios/iOS Example/EventsViewController.m b/Example/iOS Example/EventsViewController.m → ...le/ios/iOS Example/EventsViewController.m
diff --git a/...le/iOS Example/EventsViewController.swift → ...os/iOS Example/EventsViewController.swift b/...le/iOS Example/EventsViewController.swift → ...os/iOS Example/EventsViewController.swift
diff --git a/...ple/iOS Example/ExceptionViewController.h → ...ios/iOS Example/ExceptionViewController.h b/...ple/iOS Example/ExceptionViewController.h → ...ios/iOS Example/ExceptionViewController.h
diff --git a/...ple/iOS Example/ExceptionViewController.m → ...ios/iOS Example/ExceptionViewController.m b/...ple/iOS Example/ExceptionViewController.m → ...ios/iOS Example/ExceptionViewController.m
diff --git a/Example/iOS Example/GoalsViewController.h → ...ple/ios/iOS Example/GoalsViewController.h b/Example/iOS Example/GoalsViewController.h → ...ple/ios/iOS Example/GoalsViewController.h
diff --git a/Example/iOS Example/GoalsViewController.m → ...ple/ios/iOS Example/GoalsViewController.m b/Example/iOS Example/GoalsViewController.m → ...ple/ios/iOS Example/GoalsViewController.m
diff --git a/Example/iOS Example/MenuViewController.swift → .../ios/iOS Example/MenuViewController.swift b/Example/iOS Example/MenuViewController.swift → .../ios/iOS Example/MenuViewController.swift
diff --git a/Example/iOS Example/OptOutViewController.h → ...le/ios/iOS Example/OptOutViewController.h b/Example/iOS Example/OptOutViewController.h → ...le/ios/iOS Example/OptOutViewController.h
diff --git a/Example/ios/iOS Example/OptOutViewController.m b/Example/ios/iOS Example/OptOutViewController.m
@@ -0,0 +1,45 @@
+//
+//  OptOutViewController.m
+//  PiwikTracker
+//
+//  Created by Mattias Levin on 9/17/13.
+//  Copyright (c) 2013 Mattias Levin. All rights reserved.
+//
+
+#import "OptOutViewController.h"
+#import "PiwikTracker.h"
+
+
+@interface OptOutViewController ()
+@end
+
+
+@implementation OptOutViewController
+
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+
+  self.optOutSwitch.on = ![PiwikTracker sharedInstance].optOut;
+
+}
+
+
+- (IBAction)sendOptOutAction:(id)sender {
+
+  UISwitch *option = (UISwitch*)sender;
+
+  if (option.on) {
+
+    [PiwikTracker sharedInstance].optOut = NO;
+
+  } else {
+
+    [PiwikTracker sharedInstance].optOut = YES;
+
+  }
+
+}
+
+
+@end
diff --git a/...le/iOS Example/ScreenViewController.swift → ...os/iOS Example/ScreenViewController.swift b/...le/iOS Example/ScreenViewController.swift → ...os/iOS Example/ScreenViewController.swift
diff --git a/Example/iOS Example/SearchViewController.h → ...le/ios/iOS Example/SearchViewController.h b/Example/iOS Example/SearchViewController.h → ...le/ios/iOS Example/SearchViewController.h
diff --git a/Example/iOS Example/SearchViewController.m → ...le/ios/iOS Example/SearchViewController.m b/Example/iOS Example/SearchViewController.m → ...le/ios/iOS Example/SearchViewController.m
diff --git a/... Example/SecondScreenViewController.swift → ... Example/SecondScreenViewController.swift b/... Example/SecondScreenViewController.swift → ... Example/SecondScreenViewController.swift
diff --git a/Example/iOS Example/SocialViewController.h → ...le/ios/iOS Example/SocialViewController.h b/Example/iOS Example/SocialViewController.h → ...le/ios/iOS Example/SocialViewController.h
diff --git a/Example/iOS Example/SocialViewController.m → ...le/ios/iOS Example/SocialViewController.m b/Example/iOS Example/SocialViewController.m → ...le/ios/iOS Example/SocialViewController.m
diff --git a/...mple/Supporting Files/[email protected] → ...mple/Supporting Files/[email protected] b/...mple/Supporting Files/[email protected] → ...mple/Supporting Files/[email protected]
diff --git a/.../iOS Example/Supporting Files/Default.png → .../iOS Example/Supporting Files/Default.png b/.../iOS Example/Supporting Files/Default.png → .../iOS Example/Supporting Files/Default.png
diff --git a/...S Example/Supporting Files/[email protected] → ...S Example/Supporting Files/[email protected] b/...S Example/Supporting Files/[email protected] → ...S Example/Supporting Files/[email protected]
diff --git a/...ting Files/PiwikTrackeriOSDemo-Info.plist → ...ting Files/PiwikTrackeriOSDemo-Info.plist b/...ting Files/PiwikTrackeriOSDemo-Info.plist → ...ting Files/PiwikTrackeriOSDemo-Info.plist
diff --git a/...ting Files/PiwikTrackeriOSDemo-Prefix.pch → ...ting Files/PiwikTrackeriOSDemo-Prefix.pch b/...ting Files/PiwikTrackeriOSDemo-Prefix.pch → ...ting Files/PiwikTrackeriOSDemo-Prefix.pch
diff --git a/...pporting Files/en.lproj/InfoPlist.strings → ...pporting Files/en.lproj/InfoPlist.strings b/...pporting Files/en.lproj/InfoPlist.strings → ...pporting Files/en.lproj/InfoPlist.strings
diff --git a/Example/iOS Example/Supporting Files/main.m → ...e/ios/iOS Example/Supporting Files/main.m b/Example/iOS Example/Supporting Files/main.m → ...e/ios/iOS Example/Supporting Files/main.m
diff --git a/Example/iOS Example/UserIDViewController.h → ...le/ios/iOS Example/UserIDViewController.h b/Example/iOS Example/UserIDViewController.h → ...le/ios/iOS Example/UserIDViewController.h
diff --git a/Example/iOS Example/UserIDViewController.m → ...le/ios/iOS Example/UserIDViewController.m b/Example/iOS Example/UserIDViewController.m → ...le/ios/iOS Example/UserIDViewController.m
diff --git a/...xample/en.lproj/MainStoryboard.storyboard → ...xample/en.lproj/MainStoryboard.storyboard b/...xample/en.lproj/MainStoryboard.storyboard → ...xample/en.lproj/MainStoryboard.storyboard
diff --git a/Example/iOS Example/ios-Bridging-Header.h → ...ple/ios/iOS Example/ios-Bridging-Header.h b/Example/iOS Example/ios-Bridging-Header.h → ...ple/ios/iOS Example/ios-Bridging-Header.h
diff --git a/Example/Example.xcodeproj/project.pbxproj → Example/ios/ios.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj → Example/ios/ios.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...areddata/xcschemes/Documentation.xcscheme → ...areddata/xcschemes/Documentation.xcscheme b/...areddata/xcschemes/Documentation.xcscheme → ...areddata/xcschemes/Documentation.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "CDC335FE17B97B110098386C"
                BuildableName = "Documentation"
                BlueprintName = "Documentation"
-               ReferencedContainer = "container:Example.xcodeproj">
+               ReferencedContainer = "container:ios.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "CDC335FE17B97B110098386C"
             BuildableName = "Documentation"
             BlueprintName = "Documentation"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ios.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "CDC335FE17B97B110098386C"
             BuildableName = "Documentation"
             BlueprintName = "Documentation"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ios.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...cshareddata/xcschemes/Upload API.xcscheme → ...cshareddata/xcschemes/Upload API.xcscheme b/...cshareddata/xcschemes/Upload API.xcscheme → ...cshareddata/xcschemes/Upload API.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "CDE4CAE61813DDFE007E0EF7"
                BuildableName = "Upload API"
                BlueprintName = "Upload API"
-               ReferencedContainer = "container:Example.xcodeproj">
+               ReferencedContainer = "container:ios.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "CDE4CAE61813DDFE007E0EF7"
             BuildableName = "Upload API"
             BlueprintName = "Upload API"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ios.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "CDE4CAE61813DDFE007E0EF7"
             BuildableName = "Upload API"
             BlueprintName = "Upload API"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ios.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...eproj/xcshareddata/xcschemes/ios.xcscheme → ...eproj/xcshareddata/xcschemes/ios.xcscheme b/...eproj/xcshareddata/xcschemes/ios.xcscheme → ...eproj/xcshareddata/xcschemes/ios.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "CD93EC8A17E76E290062BE20"
                BuildableName = "ios.app"
                BlueprintName = "ios"
-               ReferencedContainer = "container:Example.xcodeproj">
+               ReferencedContainer = "container:ios.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -35,7 +35,7 @@
             BlueprintIdentifier = "CD93EC8A17E76E290062BE20"
             BuildableName = "ios.app"
             BlueprintName = "ios"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ios.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -58,7 +58,7 @@
             BlueprintIdentifier = "CD93EC8A17E76E290062BE20"
             BuildableName = "ios.app"
             BlueprintName = "ios"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ios.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -77,7 +77,7 @@
             BlueprintIdentifier = "CD93EC8A17E76E290062BE20"
             BuildableName = "ios.app"
             BlueprintName = "ios"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ios.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>