Merge pull request #49 from Automattic/issue/48-cocoapods-1.0

Update to CocoaPods 1.0

.travis.yml

@@ -1,8 +1,8 @@
 install:
-- gem install cocoapods -v 0.37.2 && pod install
-osx_image: xcode6.4
+- gem install cocoapods -v 1.0.0 && pod install
+osx_image: xcode7.3
 language: objective-c
 xcode_workspace: Automattic-Tracks-iOS.xcworkspace
 xcode_scheme: Automattic-Tracks-iOS
-xcode_sdk: iphonesimulator8.4
+xcode_sdk: iphonesimulator
 

Automattic-Tracks-OSX.podspec

@@ -8,9 +8,13 @@ Pod::Spec.new do |spec|
   spec.summary      = 'Simple way to track events in an iOS app with Automattic Tracks internal service'
   spec.source       = { :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :tag => spec.version.to_s }
   spec.source_files = 'Automattic-Tracks-iOS/**/*.{h,m}'
+  spec.private_header_files = 'Automattic-Tracks-iOS/TracksLogging.h'
   spec.resource_bundle = { 'DataModel' => ['Automattic-Tracks-iOS/**/*.xcdatamodeld'] }
   spec.framework    = 'CoreData'
 
+  spec.header_dir = 'AutomatticTracks'
+  spec.module_name = 'AutomatticTracks'
+
   spec.dependency 'CocoaLumberjack', '~>2.2.0'
   spec.dependency 'Reachability', '~>3.1'
 end

Automattic-Tracks-iOS.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name         = 'Automattic-Tracks-iOS'
   spec.version      = File.read("Automattic-Tracks-iOS/TracksConstants.m").split("const TracksLibraryVersion = @\"").last.split("\"").first
-  spec.platform     = :ios, "7.0"
+  spec.platform     = :ios, "9.0"
   spec.license      = { :type => 'GPLv2' }
   spec.homepage     = 'https://github.com/automattic/automattic-tracks-ios'
   spec.authors      = { 'Aaron Douglas' => '[email protected]' }
@@ -13,6 +13,9 @@ Pod::Spec.new do |spec|
   spec.framework    = 'CoreData'
   spec.framework    = 'CoreTelephony'
 
+  spec.header_dir = 'AutomatticTracks'
+  spec.module_name = 'AutomatticTracks'
+
   spec.dependency 'UIDeviceIdentifier', '~> 0.4'
   spec.dependency 'CocoaLumberjack', '~>2.2.0'
   spec.dependency 'Reachability', '~>3.1'

Automattic-Tracks-iOS.xcodeproj/xcshareddata/xcschemes/Automattic-Tracks-iOS.xcscheme

@@ -14,8 +14,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "93C021181AB0A6330014096A"
-               BuildableName = "libAutomattic-Tracks-iOS.a"
+               BlueprintIdentifier = "93B5C7AA1CE25D40002820B3"
+               BuildableName = "AutomatticTracks.framework"
                BlueprintName = "Automattic-Tracks-iOS"
                ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
             </BuildableReference>
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "93C021231AB0A6330014096A"
+               BlueprintIdentifier = "93B5C7B31CE25D40002820B3"
                BuildableName = "Automattic-Tracks-iOSTests.xctest"
                BlueprintName = "Automattic-Tracks-iOSTests"
                ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
@@ -42,7 +42,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "93C021231AB0A6330014096A"
+               BlueprintIdentifier = "93B5C7B31CE25D40002820B3"
                BuildableName = "Automattic-Tracks-iOSTests.xctest"
                BlueprintName = "Automattic-Tracks-iOSTests"
                ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
@@ -60,7 +60,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "93C021231AB0A6330014096A"
+               BlueprintIdentifier = "93B5C7B31CE25D40002820B3"
                BuildableName = "Automattic-Tracks-iOSTests.xctest"
                BlueprintName = "Automattic-Tracks-iOSTests"
                ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
@@ -70,7 +70,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "93C021231AB0A6330014096A"
+               BlueprintIdentifier = "93B5C7B31CE25D40002820B3"
                BuildableName = "Automattic-Tracks-iOSTests.xctest"
                BlueprintName = "Automattic-Tracks-iOSTests"
                ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
@@ -80,8 +80,8 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "93C021181AB0A6330014096A"
-            BuildableName = "libAutomattic-Tracks-iOS.a"
+            BlueprintIdentifier = "93B5C7AA1CE25D40002820B3"
+            BuildableName = "AutomatticTracks.framework"
             BlueprintName = "Automattic-Tracks-iOS"
             ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
          </BuildableReference>
@@ -102,8 +102,8 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "93C021181AB0A6330014096A"
-            BuildableName = "libAutomattic-Tracks-iOS.a"
+            BlueprintIdentifier = "93B5C7AA1CE25D40002820B3"
+            BuildableName = "AutomatticTracks.framework"
             BlueprintName = "Automattic-Tracks-iOS"
             ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
          </BuildableReference>
@@ -120,8 +120,8 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "93C021181AB0A6330014096A"
-            BuildableName = "libAutomattic-Tracks-iOS.a"
+            BlueprintIdentifier = "93B5C7AA1CE25D40002820B3"
+            BuildableName = "AutomatticTracks.framework"
             BlueprintName = "Automattic-Tracks-iOS"
             ReferencedContainer = "container:Automattic-Tracks-iOS.xcodeproj">
          </BuildableReference>

Automattic-Tracks-iOS/Automattic-Tracks-iOS.h

@@ -0,0 +1,12 @@
+#import <UIKit/UIKit.h>
+
+//! Project version number for Automattic-Tracks-iOS.
+FOUNDATION_EXPORT double Automattic_Tracks_iOSVersionNumber;
+
+//! Project version string for Automattic-Tracks-iOS.
+FOUNDATION_EXPORT const unsigned char Automattic_Tracks_iOSVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <Automattic_Tracks_iOS/PublicHeader.h>
+#import <AutomatticTracks/TracksContextManager.h>
+
+

Automattic-Tracks-iOS/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

Automattic-Tracks-iOS/Private/Logging.h

@@ -0,0 +1,2 @@
+@import CocoaLumberjack;
+extern int ddLogLevel;

Automattic-Tracks-iOS/Private/Logging.m

@@ -0,0 +1,2 @@
+#import "Logging.h"
+int ddLogLevel = DDLogLevelWarning;

Automattic-Tracks-iOS/Tracks.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+/// Turns on Swift compilation and fixes problems with module map not being created
+class Tracks {
+
+}

Automattic-Tracks-iOS/TracksConstants.m

@@ -1,4 +1,4 @@
 #import "TracksConstants.h"
 
 NSString *const TracksErrorDomain = @"TracksErrorDomain";
-NSString *const TracksLibraryVersion = @"0.0.13";
+NSString *const TracksLibraryVersion = @"0.1.0";

Automattic-Tracks-iOS/TracksContextManager.m

@@ -1,5 +1,5 @@
 #import "TracksContextManager.h"
-#import "TracksLogging.h"
+#import "Logging.h"
 
 @interface TracksContextManager ()
 

Automattic-Tracks-iOS/TracksEventPersistenceService.m

@@ -1,6 +1,6 @@
 #import "TracksEventPersistenceService.h"
 #import "TracksEventCoreData.h"
-#import "TracksLogging.h"
+#import "Logging.h"
 
 @interface TracksEventPersistenceService ()
 

Automattic-Tracks-iOS/TracksEventService.m

@@ -1,6 +1,6 @@
 #import "TracksEventService.h"
 #import "TracksEventPersistenceService.h"
-#import "TracksLogging.h"
+#import "Logging.h"
 
 @interface TracksEventService ()
 

Automattic-Tracks-iOS/TracksLogging.h

@@ -1,3 +1,2 @@
-#define LOG_LEVEL_DEF AutomatticTracksLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-static const DDLogLevel AutomatticTracksLogLevel = DDLogLevelWarning;
+int TracksGetLoggingLevel();
+void TracksSetLoggingLevel(int level);

Automattic-Tracks-iOS/TracksLogging.m

@@ -0,0 +1,10 @@
+#import "TracksLogging.h"
+#import "Logging.h"
+
+int TracksGetLoggingLevel() {
+    return ddLogLevel;
+}
+
+void TracksSetLoggingLevel(int level) {
+    ddLogLevel = level;
+}

Automattic-Tracks-iOS/TracksService.m

@@ -1,6 +1,6 @@
 #import "TracksService.h"
 #import "TracksDeviceInformation.h"
-#import "TracksLogging.h"
+#import "Logging.h"
 #import <Reachability/Reachability.h>
 
 #if TARGET_OS_IPHONE

Podfile

@@ -2,14 +2,15 @@
 # platform :ios, '6.0'
 
 inhibit_all_warnings!
+use_frameworks!
 
 target 'Automattic-Tracks-iOS' do
   pod 'UIDeviceIdentifier', '~> 0.4'
-  pod 'CocoaLumberjack', '2.0.0'
+  pod 'CocoaLumberjack', '~> 2.2.0'
   pod 'Reachability', '~>3.1'
-end
 
-target 'Automattic-Tracks-iOSTests' do
-  pod 'OCMock'
+  target 'Automattic-Tracks-iOSTests' do
+    pod 'OCMock'
+  end
 end
 

Podfile.lock

@@ -1,26 +1,28 @@
 PODS:
-  - CocoaLumberjack (2.0.0):
-    - CocoaLumberjack/Default (= 2.0.0)
-    - CocoaLumberjack/Extensions (= 2.0.0)
-  - CocoaLumberjack/Core (2.0.0)
-  - CocoaLumberjack/Default (2.0.0):
+  - CocoaLumberjack (2.2.0):
+    - CocoaLumberjack/Default (= 2.2.0)
+    - CocoaLumberjack/Extensions (= 2.2.0)
+  - CocoaLumberjack/Core (2.2.0)
+  - CocoaLumberjack/Default (2.2.0):
     - CocoaLumberjack/Core
-  - CocoaLumberjack/Extensions (2.0.0):
+  - CocoaLumberjack/Extensions (2.2.0):
     - CocoaLumberjack/Default
-  - OCMock (3.1.5)
+  - OCMock (3.3)
   - Reachability (3.2)
-  - UIDeviceIdentifier (0.4.5)
+  - UIDeviceIdentifier (0.5.0)
 
 DEPENDENCIES:
-  - CocoaLumberjack (= 2.0.0)
+  - CocoaLumberjack (~> 2.2.0)
   - OCMock
   - Reachability (~> 3.1)
   - UIDeviceIdentifier (~> 0.4)
 
 SPEC CHECKSUMS:
-  CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
-  OCMock: 4c2925291f80407c3738dd1db14d21d0cc278864
+  CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
+  OCMock: d68685bde31f69cb61d518dcb39269080c78b5ed
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  UIDeviceIdentifier: f7b32c087f4d4957badbb6181a4c78520c5806ae
+  UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 28efd03c2d3b8e9c79cb60acdace2b79f1a23706
+
+COCOAPODS: 1.0.0

TracksDemo/Podfile

@@ -1,6 +1,8 @@
 # Uncomment this line to define a global platform for your project
 # platform :ios, '6.0'
 
+use_frameworks!
+
 target 'TracksDemo' do
   pod 'Automattic-Tracks-iOS', :path => '../'
 end

TracksDemo/Podfile.lock

@@ -22,9 +22,11 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  Automattic-Tracks-iOS: ba47c35576a07376facc7a91740fb78867831e1c
+  Automattic-Tracks-iOS: 9949713f608f9fcca92300c89e1c5bfedc674069
   CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 9d2aa11c63ab1392b560f48fd9863fd05ad26436
+
+COCOAPODS: 1.0.0