Replaced Piwik with Matomo in a few more files

CHANGELOG.md

@@ -1,45 +1,45 @@
 # Changelog
 
 ## 4.4.1
-* **bugfix** Fixed a crash happening due to concurrent access of the MemoryQueue. [#216](https://github.com/piwik/piwik-sdk-ios/pull/216)
+* **bugfix** Fixed a crash happening due to concurrent access of the MemoryQueue. [#216](https://github.com/matomo-org/matomo-sdk-ios/pull/216)
 
 ## 4.4.0
-* **feature** Added a way to add custom dimension in the action scope. [#111](https://github.com/piwik/piwik-sdk-ios/issues/111)
-* **feature** Added automatic generation of the url property. [#197](https://github.com/piwik/piwik-sdk-ios/issues/197)
-* **improvement** The PiwikTracker is now save to create in a background thread. [#175](https://github.com/piwik/piwik-sdk-ios/pull/175)
-* **improvement** The Logger is now objc compatible. [#185](https://github.com/piwik/piwik-sdk-ios/issues/185)
-* **improvement** Default `example.com` urls aren't generated anymore. [#194](https://github.com/piwik/piwik-sdk-ios/pull/195)
-* **improvement** The Device and Applications structs are now public. [#191](https://github.com/piwik/piwik-sdk-ios/issues/191)
+* **feature** Added a way to add custom dimension in the action scope. [#111](https://github.com/matomo-org/matomo-sdk-ios/issues/111)
+* **feature** Added automatic generation of the url property. [#197](https://github.com/matomo-org/matomo-sdk-ios/issues/197)
+* **improvement** The PiwikTracker is now save to create in a background thread. [#175](https://github.com/matomo-org/matomo-sdk-ios/pull/175)
+* **improvement** The Logger is now objc compatible. [#185](https://github.com/matomo-org/matomo-sdk-ios/issues/185)
+* **improvement** Default `example.com` urls aren't generated anymore. [#194](https://github.com/matomo-org/matomo-sdk-ios/pull/195)
+* **improvement** The Device and Applications structs are now public. [#191](https://github.com/matomo-org/matomo-sdk-ios/issues/191)
 
 ## 4.3.0
-* **feature** Added the ability to send custom events with custom tracking parameters. [#153](https://github.com/piwik/piwik-sdk-ios/issues/153)
-* **bugfix** Fixed a crash when initializing a new tracker. [#162](https://github.com/piwik/piwik-sdk-ios/issues/162)
-* **bugfix** Removed old, unused AFNetworking Submodule to fix Carthage usage. [#190](https://github.com/piwik/piwik-sdk-ios/issues/190)
+* **feature** Added the ability to send custom events with custom tracking parameters. [#153](https://github.com/matomo-org/matomo-sdk-ios/issues/153)
+* **bugfix** Fixed a crash when initializing a new tracker. [#162](https://github.com/matomo-org/matomo-sdk-ios/issues/162)
+* **bugfix** Removed old, unused AFNetworking Submodule to fix Carthage usage. [#190](https://github.com/matomo-org/matomo-sdk-ios/issues/190)
 
 ## 4.2.0
-* **feature** Added ability to customize user agent. [#168](https://github.com/piwik/piwik-sdk-ios/pull/168)
+* **feature** Added ability to customize user agent. [#168](https://github.com/matomo-org/matomo-sdk-ios/pull/168)
 * **feature** Added ability to customize User ID.
-[#180](https://github.com/piwik/piwik-sdk-ios/issues/180) (by @niksawtschuk)
-* **feature** Added Carthage support [#74](https://github.com/piwik/piwik-sdk-ios/issues/74) (by @elitalon)
-* **feature** Added a way to set a custom visitor ID [#180](https://github.com/piwik/piwik-sdk-ios/pull/181) (by @niksawtschuk)
+[#180](https://github.com/matomo-org/matomo-sdk-ios/issues/180) (by @niksawtschuk)
+* **feature** Added Carthage support [#74](https://github.com/matomo-org/matomo-sdk-ios/issues/74) (by @elitalon)
+* **feature** Added a way to set a custom visitor ID [#180](https://github.com/matomo-org/matomo-sdk-ios/pull/181) (by @niksawtschuk)
 * **improvement** Added Swift support
 
 ## 4.1.0
-* **feature** Added Custom Dimension Tracking for the Visit Scope. [#111](https://github.com/piwik/piwik-sdk-ios/issues/111)
-* **feature** Transmitting the Screen resolution to the Piwik Backend. [#149](https://github.com/piwik/piwik-sdk-ios/issues/149) (by @akshaykolte)
-* **feature** Added a Logger that can log messages in different levels. [#147](https://github.com/piwik/piwik-sdk-ios/issues/147)
-* **feature** Added macOS and tvOS compatibility. [#134](https://github.com/piwik/piwik-sdk-ios/issues/134)
-* **bugfix** Fixed a bug, where the tracker would stop automatic dispatching. [#167](https://github.com/piwik/piwik-sdk-ios/issues/167)
+* **feature** Added Custom Dimension Tracking for the Visit Scope. [#111](https://github.com/matomo-org/matomo-sdk-ios/issues/111)
+* **feature** Transmitting the Screen resolution to the Piwik Backend. [#149](https://github.com/matomo-org/matomo-sdk-ios/issues/149) (by @akshaykolte)
+* **feature** Added a Logger that can log messages in different levels. [#147](https://github.com/matomo-org/matomo-sdk-ios/issues/147)
+* **feature** Added macOS and tvOS compatibility. [#134](https://github.com/matomo-org/matomo-sdk-ios/issues/134)
+* **bugfix** Fixed a bug, where the tracker would stop automatic dispatching. [#167](https://github.com/matomo-org/matomo-sdk-ios/issues/167)
 
 ## 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)
+* **feature** Renamed the Tracker to PiwikTracker. [#146](https://github.com/matomo-org/matomo-sdk-ios/issues/146)
+* **feature** Added isOptedOut parameter to the PiwikTracker. [#124](https://github.com/matomo-org/matomo-sdk-ios/issues/124)
 
 ## 4.0.0-beta2
-* **feature** Added the possibility to set the url for a screen view event. [#92](https://github.com/piwik/piwik-sdk-ios/issues/92)
-* **feature** Added the functionality to start new sessions. [#136](https://github.com/piwik/piwik-sdk-ios/issues/136)
-* **fixed** The value of an event got wrongly encoded when dispatching. [#140](https://github.com/piwik/piwik-sdk-ios/pull/140)
-* **fixed** Fixed an issue where tracking an event wasn’t possible from Objective-C code. [#142](https://github.com/piwik/piwik-sdk-ios/issues/142)
+* **feature** Added the possibility to set the url for a screen view event. [#92](https://github.com/matomo-org/matomo-sdk-ios/issues/92)
+* **feature** Added the functionality to start new sessions. [#136](https://github.com/matomo-org/matomo-sdk-ios/issues/136)
+* **fixed** The value of an event got wrongly encoded when dispatching. [#140](https://github.com/matomo-org/matomo-sdk-ios/pull/140)
+* **fixed** Fixed an issue where tracking an event wasn’t possible from Objective-C code. [#142](https://github.com/matomo-org/matomo-sdk-ios/issues/142)
 
 ## 4.0.0-beta1
 * no changes

CONTRIBUTING.md

@@ -6,23 +6,23 @@ Welcome! We are very happy to have you here. There are always too many things to
 
 Did you find a bug? Bummer! Please help us find the reason and fix them.
 
-* Search on GitHub under [Issues](https://github.com/matomo-org/piwik-sdk-ios/issues) if it was already reported. Maybe you can add information to it?
-* If you're unable to find an open issue addressing the problem, please [open a new one](https://github.com/matomo-org/piwik-sdk-ios/issues/new). Please explain your problem and include as much detail as you can as they might help the maintainers to reproduce it:
+* Search on GitHub under [Issues](https://github.com/matomo-org/matomo-sdk-ios/issues) if it was already reported. Maybe you can add information to it?
+* If you're unable to find an open issue addressing the problem, please [open a new one](https://github.com/matomo-org/matomo-sdk-ios/issues/new). Please explain your problem and include as much detail as you can as they might help the maintainers to reproduce it:
   * A clear and descriptive title.
   * Describe your issue and add exact steps to reproduce the issue. You found a crash? Please attach a symbolicated crash report.
   * If possible add a few lines of code or possibly even an example project.
 
 ## Discussing
 
-We love to discuss changes and improvements. If there is functionality you want to add or improve please [open an issue](https://github.com/matomo-org/piwik-sdk-ios/issues/new) and describe what you want to do, why and how. Maybe the feature already exists but is hidden? Maybe somebody wants to add ideas on how to implement it.
+We love to discuss changes and improvements. If there is functionality you want to add or improve please [open an issue](https://github.com/matomo-org/matomo-sdk-ios/issues/new) and describe what you want to do, why and how. Maybe the feature already exists but is hidden? Maybe somebody wants to add ideas on how to implement it.
 
-You are always welcome to add your thoughts to an existing [issue in discussion](https://github.com/matomo-org/piwik-sdk-ios/labels/discussion).
+You are always welcome to add your thoughts to an existing [issue in discussion](https://github.com/matomo-org/matomo-sdk-ios/labels/discussion).
 
 ## Submitting changes
 
 When contributing to this repository, please first discuss the change you wish to make via an issue before making a change.
 
-If you implemented a change please send a [Pull Request](https://github.com/matomo-org/piwik-sdk-ios/compare?expand=1) with a clear list of what you have done. Try to only tackle one thing a time. This will lead to smaller pull requests that are easier to review.
+If you implemented a change please send a [Pull Request](https://github.com/matomo-org/matomo-sdk-ios/compare?expand=1) with a clear list of what you have done. Try to only tackle one thing a time. This will lead to smaller pull requests that are easier to review.
 
 ## Contributing Code
 

MatomoTracker.podspec

@@ -2,10 +2,10 @@ Pod::Spec.new do |spec|
   spec.name         = "MatomoTracker"
   spec.version      = "4.4.1"
   spec.summary      = "A Matomo tracker written in Swift for iOS, tvOS and macOS apps."
-  spec.homepage     = "https://github.com/matomo-org/piwik-sdk-ios/"
+  spec.homepage     = "https://github.com/matomo-org/matomo-sdk-ios/"
   spec.license      = { :type => 'MIT', :file => 'LICENSE.md' }
   spec.author       = { "Mattias Levin" => "[email protected]", "Cornelius Horstmann" => "[email protected]" }
-  spec.source       = { :git => "https://github.com/matomo-org/piwik-sdk-ios.git", :tag => "v#{spec.version}" }
+  spec.source       = { :git => "https://github.com/matomo-org/matomo-sdk-ios.git", :tag => "v#{spec.version}" }
   spec.ios.deployment_target = '8.0'
   spec.tvos.deployment_target = '9.0'
   spec.osx.deployment_target = '10.12'

Podfile

@@ -3,6 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 abstract_target :example do
   use_frameworks!
   inhibit_all_warnings!
+  project 'MatomoTracker'
   workspace 'MatomoTracker'
 
   target :ios do
@@ -29,6 +30,7 @@ target 'MatomoTrackerTests' do
   use_frameworks!
   platform :ios, '8.0'
   inhibit_all_warnings!
+  project 'MatomoTracker'
   workspace 'MatomoTracker'
   inherit! :search_paths
 

README.md

@@ -2,9 +2,9 @@
 
 The MatomoTracker is an iOS, tvOS and macOS SDK for sending app analytics to a Matomo (former Piwik) server. MatomoTracker can be used from Swift and [Objective-C](#objective-c-compatibility).
 
-**Fancy help improve this SDK? Check [this list](https://github.com/matomo-org/piwik-sdk-ios/issues?utf8=✓&q=is%3Aopen%20is%3Aissue%20label%3Adiscussion%20label%3Aswift3) to see what is left and can be improved.**
+**Fancy help improve this SDK? Check [this list](https://github.com/matomo-org/matomo-sdk-ios/issues?utf8=✓&q=is%3Aopen%20is%3Aissue%20label%3Adiscussion%20label%3Aswift3) to see what is left and can be improved.**
 
-[![Build Status](https://travis-ci.org/matomo-org/piwik-sdk-ios.svg?branch=develop)](https://travis-ci.org/matomo-org/piwik-sdk-ios)
+[![Build Status](https://travis-ci.org/matomo-org/matomo-sdk-ios.svg?branch=develop)](https://travis-ci.org/matomo-org/matomo-sdk-ios)
 
 ## Installation
 ### [CocoaPods](https://cocoapods.org)
@@ -138,7 +138,7 @@ MatomoTracker.configureSharedInstance(withSiteID: "5", baseURL: URL(string: "htt
 
 ### Objective-C compatibility
 
-Version 4 of this SDK is written in Swift, but you can use it in your Objective-C project as well. If you don't want to update you can still use the unsupported older [version 3](https://github.com/matomo-org/piwik-sdk-ios/tree/version-3). Using the Swift SDK from Objective-C should be pretty straight forward.
+Version 4 of this SDK is written in Swift, but you can use it in your Objective-C project as well. If you don't want to update you can still use the unsupported older [version 3](https://github.com/matomo-org/matomo-sdk-ios/tree/version-3). Using the Swift SDK from Objective-C should be pretty straight forward.
 
 ```
 [MatomoTracker configureSharedInstanceWithSiteID:@"5" baseURL:[NSURL URLWithString:@"http://your.server.org/path-to-matomo/piwik.php"] userAgent:nil];
@@ -170,28 +170,28 @@ You can define the url property on every `Event`. If none is defined, the SDK wi
 
 ### Event dispatching
 
-Whenever you track an event or a page view it is stored in memory first. In every dispatch run a batch of thos events are sent to the server. If the device is offline or the server doesn't respond these events will be kept and resent at a later time. Events currently aren't stored on disk and will be lost if the application is terminated. [#137](https://github.com/matomo-org/piwik-sdk-ios/issues/137)
+Whenever you track an event or a page view it is stored in memory first. In every dispatch run a batch of thos events are sent to the server. If the device is offline or the server doesn't respond these events will be kept and resent at a later time. Events currently aren't stored on disk and will be lost if the application is terminated. [#137](https://github.com/matomo-org/matomo-sdk-ios/issues/137)
 
 ## Contributing
-Please read [CONTRIBUTING.md](https://github.com/matomo-org/piwik-sdk-ios/blob/swift3/CONTRIBUTING.md) for details.
+Please read [CONTRIBUTING.md](https://github.com/matomo-org/matomo-sdk-ios/blob/swift3/CONTRIBUTING.md) for details.
 
 ## ToDo
 ### These features aren't implemented yet
 
 - Basic functionality
-  - [Persisting non dispatched events](https://github.com/matomo-org/piwik-sdk-ios/issues/137)
+  - [Persisting non dispatched events](https://github.com/matomo-org/matomo-sdk-ios/issues/137)
 - Tracking of more things
   - Exceptions
   - Social Interactions
   - Search
   - Goals and Conversions
   - Outlinks
   - Downloads
-  - [Ecommerce Transactions](https://github.com/matomo-org/piwik-sdk-ios/issues/110)
-  - [Campaigns](https://github.com/matomo-org/piwik-sdk-ios/issues/109)
+  - [Ecommerce Transactions](https://github.com/matomo-org/matomo-sdk-ios/issues/110)
+  - [Campaigns](https://github.com/matomo-org/matomo-sdk-ios/issues/109)
   - Content Impressions / Content Interactions
 - Customizing the tracker
-  - add prefixing? (The objc-SDK had a prefixing functionality ![Example screenshot](http://matomo-org.github.io/piwik-sdk-ios/piwik_prefixing.png))
+  - add prefixing? (The objc-SDK had a prefixing functionality ![Example screenshot](http://matomo-org.github.io/matomo-sdk-ios/piwik_prefixing.png))
   - set the dispatch interval
   - use different dispatchers (Alamofire)