diff --git a/.travis.yml b/.travis.yml index fca58de1..0fe343a8 100644 --- a/.travis.yml +++ b/.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 diff --git a/Automattic-Tracks-OSX.podspec b/Automattic-Tracks-OSX.podspec index 3f2cbad1..ab6bb7b3 100644 --- a/Automattic-Tracks-OSX.podspec +++ b/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 diff --git a/Automattic-Tracks-iOS.podspec b/Automattic-Tracks-iOS.podspec index d0484d1f..ae09277d 100644 --- a/Automattic-Tracks-iOS.podspec +++ b/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' => 'aaron@automattic.com' } @@ -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' diff --git a/Automattic-Tracks-iOS.xcodeproj/project.pbxproj b/Automattic-Tracks-iOS.xcodeproj/project.pbxproj index 9b66136d..153a0a57 100644 --- a/Automattic-Tracks-iOS.xcodeproj/project.pbxproj +++ b/Automattic-Tracks-iOS.xcodeproj/project.pbxproj @@ -7,55 +7,53 @@ objects = { /* Begin PBXBuildFile section */ - 7CF8858E7F085063E5FA37C3 /* libPods-Automattic-Tracks-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C2FC310E80CC6BB7A70F0437 /* libPods-Automattic-Tracks-iOS.a */; }; - 931EE6B31ACEEA7C00E8711C /* Tracks.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = 93AD39951AC713F20069344D /* Tracks.xcdatamodeld */; }; - 931EE6CC1AD404D000E8711C /* TracksEventTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 931EE6CB1AD404D000E8711C /* TracksEventTests.m */; }; - 931EE6D01AD5A58D00E8711C /* TestTracksContextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 931EE6CF1AD5A58D00E8711C /* TestTracksContextManager.m */; }; - 9333CA9E1ACB22D300ACE506 /* TracksEventCoreData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9333CA9D1ACB22D300ACE506 /* TracksEventCoreData.m */; }; - 9339E70C1ADE98B800AEAB68 /* TracksConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 9339E70B1ADE98B800AEAB68 /* TracksConstants.m */; }; - 937632841AC1F45600086BC6 /* TracksEventService.m in Sources */ = {isa = PBXBuildFile; fileRef = 937632831AC1F45600086BC6 /* TracksEventService.m */; }; - 937632B81AC30F8700086BC6 /* TracksEventServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 937632B71AC30F8700086BC6 /* TracksEventServiceTests.m */; }; - 93771E381ACC58AC00B1E5FF /* TracksDeviceInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 93771E371ACC58AC00B1E5FF /* TracksDeviceInformation.m */; }; - 93771E3B1ACC6FD700B1E5FF /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93771E3A1ACC6FD700B1E5FF /* CoreTelephony.framework */; }; - 93AD39931AC713110069344D /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93AD39921AC713110069344D /* CoreData.framework */; }; - 93AD39971AC713F20069344D /* Tracks.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93AD39951AC713F20069344D /* Tracks.xcdatamodeld */; }; - 93AD399A1AC714A80069344D /* TracksContextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 93AD39991AC714A80069344D /* TracksContextManager.m */; }; - 93AD399E1ACACC560069344D /* libAutomattic-Tracks-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93C021191AB0A6330014096A /* libAutomattic-Tracks-iOS.a */; }; - 93AD39A41ACADA650069344D /* TracksEventPersistenceService.m in Sources */ = {isa = PBXBuildFile; fileRef = 93AD39A31ACADA650069344D /* TracksEventPersistenceService.m */; }; - 93C021361AB0BB100014096A /* TracksEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C021351AB0BB100014096A /* TracksEvent.m */; }; - 93C0213A1AB1BFF30014096A /* TracksServiceRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C021391AB1BFF30014096A /* TracksServiceRemote.m */; }; - 93C0213D1AB32BFA0014096A /* TracksServiceRemoteIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C0213C1AB32BFA0014096A /* TracksServiceRemoteIntegrationTests.m */; }; - 93F595511AB9B7A800280F9E /* TracksService.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F595501AB9B7A800280F9E /* TracksService.m */; }; - 93F595531ABA01AE00280F9E /* TracksServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F595521ABA01AE00280F9E /* TracksServiceTests.m */; }; - F051CD3C866E35262F42ACE8 /* libPods-Automattic-Tracks-iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 148BAA4989EB1CFF84CBF8A4 /* libPods-Automattic-Tracks-iOSTests.a */; }; + 00EC19F5C9B3F78F5F50366F /* Pods_Automattic_Tracks_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EBDB237A5CBEE0EE8433798 /* Pods_Automattic_Tracks_iOS.framework */; }; + 93B5C7AE1CE25D40002820B3 /* Automattic-Tracks-iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B5C7AD1CE25D40002820B3 /* Automattic-Tracks-iOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 93B5C7B51CE25D40002820B3 /* AutomatticTracks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93B5C7AB1CE25D40002820B3 /* AutomatticTracks.framework */; }; + 93B5C7C21CE25D66002820B3 /* Logging.m in Sources */ = {isa = PBXBuildFile; fileRef = 93B5C7681CE230AD002820B3 /* Logging.m */; }; + 93B5C7C31CE25D66002820B3 /* TracksContextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 93AD39991AC714A80069344D /* TracksContextManager.m */; }; + 93B5C7C41CE25D66002820B3 /* TracksEventCoreData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9333CA9D1ACB22D300ACE506 /* TracksEventCoreData.m */; }; + 93B5C7C51CE25D66002820B3 /* TracksEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C021351AB0BB100014096A /* TracksEvent.m */; }; + 93B5C7C61CE25D66002820B3 /* TracksDeviceInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 93771E371ACC58AC00B1E5FF /* TracksDeviceInformation.m */; }; + 93B5C7C71CE25D66002820B3 /* TracksEventPersistenceService.m in Sources */ = {isa = PBXBuildFile; fileRef = 93AD39A31ACADA650069344D /* TracksEventPersistenceService.m */; }; + 93B5C7C81CE25D66002820B3 /* TracksEventService.m in Sources */ = {isa = PBXBuildFile; fileRef = 937632831AC1F45600086BC6 /* TracksEventService.m */; }; + 93B5C7C91CE25D66002820B3 /* TracksService.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F595501AB9B7A800280F9E /* TracksService.m */; }; + 93B5C7CA1CE25D66002820B3 /* TracksServiceRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C021391AB1BFF30014096A /* TracksServiceRemote.m */; }; + 93B5C7CB1CE25D66002820B3 /* TracksConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 9339E70B1ADE98B800AEAB68 /* TracksConstants.m */; }; + 93B5C7CC1CE25D66002820B3 /* TracksLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = 93B5C7641CE2303D002820B3 /* TracksLogging.m */; }; + 93B5C7CD1CE25D7D002820B3 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B5C7671CE230AD002820B3 /* Logging.h */; }; + 93B5C7CE1CE25D7D002820B3 /* TracksContextManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AD39981AC714A80069344D /* TracksContextManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 93B5C7CF1CE25D7D002820B3 /* TracksEventCoreData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9333CA9C1ACB22D300ACE506 /* TracksEventCoreData.h */; }; + 93B5C7D01CE25D7D002820B3 /* TracksEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C021341AB0BB100014096A /* TracksEvent.h */; }; + 93B5C7D11CE25D7D002820B3 /* TracksDeviceInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 93771E361ACC58AC00B1E5FF /* TracksDeviceInformation.h */; }; + 93B5C7D21CE25D7D002820B3 /* TracksEventPersistenceService.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AD39A21ACADA650069344D /* TracksEventPersistenceService.h */; }; + 93B5C7D31CE25D7D002820B3 /* TracksEventService.h in Headers */ = {isa = PBXBuildFile; fileRef = 937632821AC1F45600086BC6 /* TracksEventService.h */; }; + 93B5C7D41CE25D7D002820B3 /* TracksService.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F5954F1AB9B7A800280F9E /* TracksService.h */; }; + 93B5C7D51CE25D7D002820B3 /* TracksServiceRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C021381AB1BFF30014096A /* TracksServiceRemote.h */; }; + 93B5C7D61CE25D7D002820B3 /* TracksConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 9339E70A1ADE98B800AEAB68 /* TracksConstants.h */; }; + 93B5C7D71CE25D7D002820B3 /* TracksLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = E1DBEA181C07071300FF2F73 /* TracksLogging.h */; }; + 93B5C7D81CE25D8E002820B3 /* TestTracksContextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 931EE6CF1AD5A58D00E8711C /* TestTracksContextManager.m */; }; + 93B5C7D91CE25D8E002820B3 /* TracksEventServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 937632B71AC30F8700086BC6 /* TracksEventServiceTests.m */; }; + 93B5C7DA1CE25D8E002820B3 /* TracksEventTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 931EE6CB1AD404D000E8711C /* TracksEventTests.m */; }; + 93B5C7DB1CE25D8E002820B3 /* TracksServiceRemoteIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C0213C1AB32BFA0014096A /* TracksServiceRemoteIntegrationTests.m */; }; + 93D77A511CE2640C009EDB38 /* Tracks.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93AD39951AC713F20069344D /* Tracks.xcdatamodeld */; }; + 93D77A531CE26C43009EDB38 /* Tracks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93D77A521CE26C43009EDB38 /* Tracks.swift */; }; + 991C666EE9B8040B88B209D8 /* Pods_Automattic_Tracks_iOS_Automattic_Tracks_iOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0FCA58B981387A89FC10B2E /* Pods_Automattic_Tracks_iOS_Automattic_Tracks_iOSTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 93C021261AB0A6330014096A /* PBXContainerItemProxy */ = { + 93B5C7B61CE25D40002820B3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 93C021111AB0A6330014096A /* Project object */; proxyType = 1; - remoteGlobalIDString = 93C021181AB0A6330014096A; + remoteGlobalIDString = 93B5C7AA1CE25D40002820B3; remoteInfo = "Automattic-Tracks-iOS"; }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 93C021171AB0A6330014096A /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - 148BAA4989EB1CFF84CBF8A4 /* libPods-Automattic-Tracks-iOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Automattic-Tracks-iOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 792B829D0A23395238AF6CAB /* Pods-Automattic-Tracks-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOS/Pods-Automattic-Tracks-iOS.debug.xcconfig"; sourceTree = ""; }; - 7C14B632CA74A30467DE3176 /* Pods-Automattic-Tracks-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOS/Pods-Automattic-Tracks-iOS.release.xcconfig"; sourceTree = ""; }; + 530BAF6F02DA9721EA743DCC /* Pods-Automattic-Tracks-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOS/Pods-Automattic-Tracks-iOS.debug.xcconfig"; sourceTree = ""; }; + 6EBDB237A5CBEE0EE8433798 /* Pods_Automattic_Tracks_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Automattic_Tracks_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 931EE6CB1AD404D000E8711C /* TracksEventTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksEventTests.m; sourceTree = ""; }; 931EE6CE1AD5A58D00E8711C /* TestTracksContextManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestTracksContextManager.h; sourceTree = ""; }; 931EE6CF1AD5A58D00E8711C /* TestTracksContextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestTracksContextManager.m; sourceTree = ""; }; @@ -76,42 +74,46 @@ 93AD39991AC714A80069344D /* TracksContextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksContextManager.m; sourceTree = ""; }; 93AD39A21ACADA650069344D /* TracksEventPersistenceService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TracksEventPersistenceService.h; sourceTree = ""; }; 93AD39A31ACADA650069344D /* TracksEventPersistenceService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksEventPersistenceService.m; sourceTree = ""; }; - 93C021191AB0A6330014096A /* libAutomattic-Tracks-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libAutomattic-Tracks-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 93C021241AB0A6330014096A /* Automattic-Tracks-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Automattic-Tracks-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 93C0212A1AB0A6330014096A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 93B5C7641CE2303D002820B3 /* TracksLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksLogging.m; sourceTree = ""; }; + 93B5C7671CE230AD002820B3 /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = ""; }; + 93B5C7681CE230AD002820B3 /* Logging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logging.m; sourceTree = ""; }; + 93B5C7AB1CE25D40002820B3 /* AutomatticTracks.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AutomatticTracks.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 93B5C7AD1CE25D40002820B3 /* Automattic-Tracks-iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Automattic-Tracks-iOS.h"; sourceTree = ""; }; + 93B5C7AF1CE25D40002820B3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 93B5C7B41CE25D40002820B3 /* Automattic-Tracks-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Automattic-Tracks-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 93B5C7BB1CE25D40002820B3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 93C021341AB0BB100014096A /* TracksEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TracksEvent.h; sourceTree = ""; }; 93C021351AB0BB100014096A /* TracksEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksEvent.m; sourceTree = ""; }; 93C021381AB1BFF30014096A /* TracksServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TracksServiceRemote.h; sourceTree = ""; }; 93C021391AB1BFF30014096A /* TracksServiceRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksServiceRemote.m; sourceTree = ""; }; 93C0213C1AB32BFA0014096A /* TracksServiceRemoteIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksServiceRemoteIntegrationTests.m; sourceTree = ""; }; 93C0213E1AB75F770014096A /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93D77A521CE26C43009EDB38 /* Tracks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tracks.swift; sourceTree = ""; }; 93F5954F1AB9B7A800280F9E /* TracksService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TracksService.h; sourceTree = ""; }; 93F595501AB9B7A800280F9E /* TracksService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksService.m; sourceTree = ""; }; 93F595521ABA01AE00280F9E /* TracksServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksServiceTests.m; sourceTree = ""; }; - AEBCF3262C67E03BDCA66153 /* Pods-Automattic-Tracks-iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOSTests.debug.xcconfig"; sourceTree = ""; }; - C2FC310E80CC6BB7A70F0437 /* libPods-Automattic-Tracks-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Automattic-Tracks-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - E15E3CC272CAA5A286551AB0 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D68681CFE7A89CD717A87F8 /* Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.release.xcconfig"; sourceTree = ""; }; + A0FCA58B981387A89FC10B2E /* Pods_Automattic_Tracks_iOS_Automattic_Tracks_iOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Automattic_Tracks_iOS_Automattic_Tracks_iOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E1DBEA181C07071300FF2F73 /* TracksLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TracksLogging.h; sourceTree = ""; }; - E6ED7D1786D23CF511D84A90 /* Pods-Automattic-Tracks-iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOSTests.release.xcconfig"; sourceTree = ""; }; + F4CDF4E3ABD693CAED06290A /* Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.debug.xcconfig"; sourceTree = ""; }; + F9DF6A99F99A34C92777F30D /* Pods-Automattic-Tracks-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Tracks-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-Tracks-iOS/Pods-Automattic-Tracks-iOS.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 93C021161AB0A6330014096A /* Frameworks */ = { + 93B5C7A71CE25D40002820B3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 93771E3B1ACC6FD700B1E5FF /* CoreTelephony.framework in Frameworks */, - 93AD39931AC713110069344D /* CoreData.framework in Frameworks */, - 7CF8858E7F085063E5FA37C3 /* libPods-Automattic-Tracks-iOS.a in Frameworks */, + 00EC19F5C9B3F78F5F50366F /* Pods_Automattic_Tracks_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 93C021211AB0A6330014096A /* Frameworks */ = { + 93B5C7B11CE25D40002820B3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 93AD399E1ACACC560069344D /* libAutomattic-Tracks-iOS.a in Frameworks */, - F051CD3C866E35262F42ACE8 /* libPods-Automattic-Tracks-iOSTests.a in Frameworks */, + 93B5C7B51CE25D40002820B3 /* AutomatticTracks.framework in Frameworks */, + 991C666EE9B8040B88B209D8 /* Pods_Automattic_Tracks_iOS_Automattic_Tracks_iOSTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -123,9 +125,8 @@ children = ( 93771E3A1ACC6FD700B1E5FF /* CoreTelephony.framework */, 93AD39921AC713110069344D /* CoreData.framework */, - C2FC310E80CC6BB7A70F0437 /* libPods-Automattic-Tracks-iOS.a */, - 148BAA4989EB1CFF84CBF8A4 /* libPods-Automattic-Tracks-iOSTests.a */, - E15E3CC272CAA5A286551AB0 /* libPods.a */, + 6EBDB237A5CBEE0EE8433798 /* Pods_Automattic_Tracks_iOS.framework */, + A0FCA58B981387A89FC10B2E /* Pods_Automattic_Tracks_iOS_Automattic_Tracks_iOSTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -135,10 +136,10 @@ children = ( 93C0213E1AB75F770014096A /* Podfile */, 937632B91AC3141800086BC6 /* Automattic-Tracks-iOS.podspec */, - AEBCF3262C67E03BDCA66153 /* Pods-Automattic-Tracks-iOSTests.debug.xcconfig */, - E6ED7D1786D23CF511D84A90 /* Pods-Automattic-Tracks-iOSTests.release.xcconfig */, - 792B829D0A23395238AF6CAB /* Pods-Automattic-Tracks-iOS.debug.xcconfig */, - 7C14B632CA74A30467DE3176 /* Pods-Automattic-Tracks-iOS.release.xcconfig */, + 530BAF6F02DA9721EA743DCC /* Pods-Automattic-Tracks-iOS.debug.xcconfig */, + F9DF6A99F99A34C92777F30D /* Pods-Automattic-Tracks-iOS.release.xcconfig */, + F4CDF4E3ABD693CAED06290A /* Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.debug.xcconfig */, + 9D68681CFE7A89CD717A87F8 /* Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -164,6 +165,15 @@ name = "Core Data"; sourceTree = ""; }; + 93B5C7661CE2308D002820B3 /* Private */ = { + isa = PBXGroup; + children = ( + 93B5C7671CE230AD002820B3 /* Logging.h */, + 93B5C7681CE230AD002820B3 /* Logging.m */, + ); + path = Private; + sourceTree = ""; + }; 93C021101AB0A6330014096A = { isa = PBXGroup; children = ( @@ -178,8 +188,8 @@ 93C0211A1AB0A6330014096A /* Products */ = { isa = PBXGroup; children = ( - 93C021191AB0A6330014096A /* libAutomattic-Tracks-iOS.a */, - 93C021241AB0A6330014096A /* Automattic-Tracks-iOSTests.xctest */, + 93B5C7AB1CE25D40002820B3 /* AutomatticTracks.framework */, + 93B5C7B41CE25D40002820B3 /* Automattic-Tracks-iOSTests.xctest */, ); name = Products; sourceTree = ""; @@ -187,11 +197,14 @@ 93C0211B1AB0A6330014096A /* Automattic-Tracks-iOS */ = { isa = PBXGroup; children = ( + 93B5C7661CE2308D002820B3 /* Private */, 93C021331AB0BAF50014096A /* Model */, 93C021371AB1BFA40014096A /* Services */, + 93D77A541CE26C9C009EDB38 /* Supporting Files */, 9339E70A1ADE98B800AEAB68 /* TracksConstants.h */, 9339E70B1ADE98B800AEAB68 /* TracksConstants.m */, E1DBEA181C07071300FF2F73 /* TracksLogging.h */, + 93B5C7641CE2303D002820B3 /* TracksLogging.m */, ); path = "Automattic-Tracks-iOS"; sourceTree = ""; @@ -209,7 +222,7 @@ 93C021291AB0A6330014096A /* Supporting Files */ = { isa = PBXGroup; children = ( - 93C0212A1AB0A6330014096A /* Info.plist */, + 93B5C7BB1CE25D40002820B3 /* Info.plist */, ); name = "Supporting Files"; sourceTree = ""; @@ -252,18 +265,51 @@ name = Tests; sourceTree = ""; }; + 93D77A541CE26C9C009EDB38 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 93B5C7AD1CE25D40002820B3 /* Automattic-Tracks-iOS.h */, + 93B5C7AF1CE25D40002820B3 /* Info.plist */, + 93D77A521CE26C43009EDB38 /* Tracks.swift */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 93B5C7A81CE25D40002820B3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 93B5C7AE1CE25D40002820B3 /* Automattic-Tracks-iOS.h in Headers */, + 93B5C7CD1CE25D7D002820B3 /* Logging.h in Headers */, + 93B5C7CE1CE25D7D002820B3 /* TracksContextManager.h in Headers */, + 93B5C7CF1CE25D7D002820B3 /* TracksEventCoreData.h in Headers */, + 93B5C7D01CE25D7D002820B3 /* TracksEvent.h in Headers */, + 93B5C7D11CE25D7D002820B3 /* TracksDeviceInformation.h in Headers */, + 93B5C7D21CE25D7D002820B3 /* TracksEventPersistenceService.h in Headers */, + 93B5C7D31CE25D7D002820B3 /* TracksEventService.h in Headers */, + 93B5C7D41CE25D7D002820B3 /* TracksService.h in Headers */, + 93B5C7D51CE25D7D002820B3 /* TracksServiceRemote.h in Headers */, + 93B5C7D61CE25D7D002820B3 /* TracksConstants.h in Headers */, + 93B5C7D71CE25D7D002820B3 /* TracksLogging.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ - 93C021181AB0A6330014096A /* Automattic-Tracks-iOS */ = { + 93B5C7AA1CE25D40002820B3 /* Automattic-Tracks-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 93C0212D1AB0A6330014096A /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOS" */; + buildConfigurationList = 93B5C7BC1CE25D40002820B3 /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOS" */; buildPhases = ( - 92795131D3590049CAA284E5 /* Check Pods Manifest.lock */, - 93C021151AB0A6330014096A /* Sources */, - 93C021161AB0A6330014096A /* Frameworks */, - 93C021171AB0A6330014096A /* CopyFiles */, - D8922934E747D3825FE5E769 /* Copy Pods Resources */, + 03285C5F6DE693B49C7B8A5C /* 📦 Check Pods Manifest.lock */, + 93B5C7A61CE25D40002820B3 /* Sources */, + 93B5C7A71CE25D40002820B3 /* Frameworks */, + 93B5C7A81CE25D40002820B3 /* Headers */, + 93B5C7A91CE25D40002820B3 /* Resources */, + 6BA4389C4A42A9E74BF1D871 /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -271,28 +317,28 @@ ); name = "Automattic-Tracks-iOS"; productName = "Automattic-Tracks-iOS"; - productReference = 93C021191AB0A6330014096A /* libAutomattic-Tracks-iOS.a */; - productType = "com.apple.product-type.library.static"; + productReference = 93B5C7AB1CE25D40002820B3 /* AutomatticTracks.framework */; + productType = "com.apple.product-type.framework"; }; - 93C021231AB0A6330014096A /* Automattic-Tracks-iOSTests */ = { + 93B5C7B31CE25D40002820B3 /* Automattic-Tracks-iOSTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 93C021301AB0A6330014096A /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOSTests" */; + buildConfigurationList = 93B5C7BF1CE25D40002820B3 /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOSTests" */; buildPhases = ( - ADEE6380E7CC2049DCFF2336 /* Check Pods Manifest.lock */, - 93C021201AB0A6330014096A /* Sources */, - 93C021211AB0A6330014096A /* Frameworks */, - 93C021221AB0A6330014096A /* Resources */, - 3D3E7F416113192F886D8EBD /* Copy Pods Resources */, - AAF9578663D24F98C30D5D9E /* Embed Pods Frameworks */, + 61BED20AB4A33F1EEE1C49A4 /* 📦 Check Pods Manifest.lock */, + 93B5C7B01CE25D40002820B3 /* Sources */, + 93B5C7B11CE25D40002820B3 /* Frameworks */, + 93B5C7B21CE25D40002820B3 /* Resources */, + B5AA90B9C0803BE39E1185A9 /* 📦 Embed Pods Frameworks */, + F129251F3ADFB63E03CDE9A2 /* 📦 Copy Pods Resources */, ); buildRules = ( ); dependencies = ( - 93C021271AB0A6330014096A /* PBXTargetDependency */, + 93B5C7B71CE25D40002820B3 /* PBXTargetDependency */, ); name = "Automattic-Tracks-iOSTests"; productName = "Automattic-Tracks-iOSTests"; - productReference = 93C021241AB0A6330014096A /* Automattic-Tracks-iOSTests.xctest */; + productReference = 93B5C7B41CE25D40002820B3 /* Automattic-Tracks-iOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -301,14 +347,15 @@ 93C021111AB0A6330014096A /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 0730; LastUpgradeCheck = 0700; ORGANIZATIONNAME = "Automattic Inc."; TargetAttributes = { - 93C021181AB0A6330014096A = { - CreatedOnToolsVersion = 6.2; + 93B5C7AA1CE25D40002820B3 = { + CreatedOnToolsVersion = 7.3.1; }; - 93C021231AB0A6330014096A = { - CreatedOnToolsVersion = 6.2; + 93B5C7B31CE25D40002820B3 = { + CreatedOnToolsVersion = 7.3.1; }; }; }; @@ -324,47 +371,53 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 93C021181AB0A6330014096A /* Automattic-Tracks-iOS */, - 93C021231AB0A6330014096A /* Automattic-Tracks-iOSTests */, + 93B5C7AA1CE25D40002820B3 /* Automattic-Tracks-iOS */, + 93B5C7B31CE25D40002820B3 /* Automattic-Tracks-iOSTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 93C021221AB0A6330014096A /* Resources */ = { + 93B5C7A91CE25D40002820B3 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 93B5C7B21CE25D40002820B3 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 931EE6B31ACEEA7C00E8711C /* Tracks.xcdatamodeld in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3D3E7F416113192F886D8EBD /* Copy Pods Resources */ = { + 03285C5F6DE693B49C7B8A5C /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOSTests-resources.sh\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 92795131D3590049CAA284E5 /* Check Pods Manifest.lock */ = { + 61BED20AB4A33F1EEE1C49A4 /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -372,94 +425,186 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - AAF9578663D24F98C30D5D9E /* Embed Pods Frameworks */ = { + 6BA4389C4A42A9E74BF1D871 /* 📦 Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "📦 Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOSTests-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Automattic-Tracks-iOS/Pods-Automattic-Tracks-iOS-resources.sh\"\n"; showEnvVarsInLog = 0; }; - ADEE6380E7CC2049DCFF2336 /* Check Pods Manifest.lock */ = { + B5AA90B9C0803BE39E1185A9 /* 📦 Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "📦 Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - D8922934E747D3825FE5E769 /* Copy Pods Resources */ = { + F129251F3ADFB63E03CDE9A2 /* 📦 Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "📦 Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Automattic-Tracks-iOS/Pods-Automattic-Tracks-iOS-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests/Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 93C021151AB0A6330014096A /* Sources */ = { + 93B5C7A61CE25D40002820B3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 93C021361AB0BB100014096A /* TracksEvent.m in Sources */, - 9339E70C1ADE98B800AEAB68 /* TracksConstants.m in Sources */, - 93C0213A1AB1BFF30014096A /* TracksServiceRemote.m in Sources */, - 93AD39A41ACADA650069344D /* TracksEventPersistenceService.m in Sources */, - 93AD39971AC713F20069344D /* Tracks.xcdatamodeld in Sources */, - 937632841AC1F45600086BC6 /* TracksEventService.m in Sources */, - 93771E381ACC58AC00B1E5FF /* TracksDeviceInformation.m in Sources */, - 9333CA9E1ACB22D300ACE506 /* TracksEventCoreData.m in Sources */, - 93F595511AB9B7A800280F9E /* TracksService.m in Sources */, - 93AD399A1AC714A80069344D /* TracksContextManager.m in Sources */, + 93B5C7CA1CE25D66002820B3 /* TracksServiceRemote.m in Sources */, + 93B5C7CB1CE25D66002820B3 /* TracksConstants.m in Sources */, + 93B5C7C21CE25D66002820B3 /* Logging.m in Sources */, + 93B5C7C31CE25D66002820B3 /* TracksContextManager.m in Sources */, + 93D77A531CE26C43009EDB38 /* Tracks.swift in Sources */, + 93B5C7C71CE25D66002820B3 /* TracksEventPersistenceService.m in Sources */, + 93B5C7C91CE25D66002820B3 /* TracksService.m in Sources */, + 93B5C7C51CE25D66002820B3 /* TracksEvent.m in Sources */, + 93B5C7C41CE25D66002820B3 /* TracksEventCoreData.m in Sources */, + 93B5C7CC1CE25D66002820B3 /* TracksLogging.m in Sources */, + 93D77A511CE2640C009EDB38 /* Tracks.xcdatamodeld in Sources */, + 93B5C7C81CE25D66002820B3 /* TracksEventService.m in Sources */, + 93B5C7C61CE25D66002820B3 /* TracksDeviceInformation.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 93C021201AB0A6330014096A /* Sources */ = { + 93B5C7B01CE25D40002820B3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 93C0213D1AB32BFA0014096A /* TracksServiceRemoteIntegrationTests.m in Sources */, - 931EE6D01AD5A58D00E8711C /* TestTracksContextManager.m in Sources */, - 937632B81AC30F8700086BC6 /* TracksEventServiceTests.m in Sources */, - 931EE6CC1AD404D000E8711C /* TracksEventTests.m in Sources */, - 93F595531ABA01AE00280F9E /* TracksServiceTests.m in Sources */, + 93B5C7D91CE25D8E002820B3 /* TracksEventServiceTests.m in Sources */, + 93B5C7DA1CE25D8E002820B3 /* TracksEventTests.m in Sources */, + 93B5C7D81CE25D8E002820B3 /* TestTracksContextManager.m in Sources */, + 93B5C7DB1CE25D8E002820B3 /* TracksServiceRemoteIntegrationTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 93C021271AB0A6330014096A /* PBXTargetDependency */ = { + 93B5C7B71CE25D40002820B3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 93C021181AB0A6330014096A /* Automattic-Tracks-iOS */; - targetProxy = 93C021261AB0A6330014096A /* PBXContainerItemProxy */; + target = 93B5C7AA1CE25D40002820B3 /* Automattic-Tracks-iOS */; + targetProxy = 93B5C7B61CE25D40002820B3 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 93B5C7BD1CE25D40002820B3 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 530BAF6F02DA9721EA743DCC /* Pods-Automattic-Tracks-iOS.debug.xcconfig */; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = "Automattic-Tracks-iOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.Automattic-Tracks-iOS"; + PRODUCT_NAME = AutomatticTracks; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 93B5C7BE1CE25D40002820B3 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = F9DF6A99F99A34C92777F30D /* Pods-Automattic-Tracks-iOS.release.xcconfig */; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = "Automattic-Tracks-iOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.Automattic-Tracks-iOS"; + PRODUCT_NAME = AutomatticTracks; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 93B5C7C01CE25D40002820B3 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = F4CDF4E3ABD693CAED06290A /* Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.debug.xcconfig */; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEBUG_INFORMATION_FORMAT = dwarf; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = "Automattic-Tracks-iOSTests/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.Automattic-Tracks-iOSTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 93B5C7C11CE25D40002820B3 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9D68681CFE7A89CD717A87F8 /* Pods-Automattic-Tracks-iOS-Automattic-Tracks-iOSTests.release.xcconfig */; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = "Automattic-Tracks-iOSTests/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.Automattic-Tracks-iOSTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 93C0212B1AB0A6330014096A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -494,7 +639,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -528,103 +673,39 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; name = Release; }; - 93C0212E1AB0A6330014096A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 792B829D0A23395238AF6CAB /* Pods-Automattic-Tracks-iOS.debug.xcconfig */; - buildSettings = { - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_UNUSED_LABEL = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - 93C0212F1AB0A6330014096A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7C14B632CA74A30467DE3176 /* Pods-Automattic-Tracks-iOS.release.xcconfig */; - buildSettings = { - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_UNUSED_LABEL = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Release; - }; - 93C021311AB0A6330014096A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = AEBCF3262C67E03BDCA66153 /* Pods-Automattic-Tracks-iOSTests.debug.xcconfig */; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "Automattic-Tracks-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 93C021321AB0A6330014096A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E6ED7D1786D23CF511D84A90 /* Pods-Automattic-Tracks-iOSTests.release.xcconfig */; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "Automattic-Tracks-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 93C021141AB0A6330014096A /* Build configuration list for PBXProject "Automattic-Tracks-iOS" */ = { + 93B5C7BC1CE25D40002820B3 /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( - 93C0212B1AB0A6330014096A /* Debug */, - 93C0212C1AB0A6330014096A /* Release */, + 93B5C7BD1CE25D40002820B3 /* Debug */, + 93B5C7BE1CE25D40002820B3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 93C0212D1AB0A6330014096A /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOS" */ = { + 93B5C7BF1CE25D40002820B3 /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 93C0212E1AB0A6330014096A /* Debug */, - 93C0212F1AB0A6330014096A /* Release */, + 93B5C7C01CE25D40002820B3 /* Debug */, + 93B5C7C11CE25D40002820B3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 93C021301AB0A6330014096A /* Build configuration list for PBXNativeTarget "Automattic-Tracks-iOSTests" */ = { + 93C021141AB0A6330014096A /* Build configuration list for PBXProject "Automattic-Tracks-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( - 93C021311AB0A6330014096A /* Debug */, - 93C021321AB0A6330014096A /* Release */, + 93C0212B1AB0A6330014096A /* Debug */, + 93C0212C1AB0A6330014096A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Automattic-Tracks-iOS.xcodeproj/xcshareddata/xcschemes/Automattic-Tracks-iOS.xcscheme b/Automattic-Tracks-iOS.xcodeproj/xcshareddata/xcschemes/Automattic-Tracks-iOS.xcscheme index ecf7ac9e..93bfc561 100644 --- a/Automattic-Tracks-iOS.xcodeproj/xcshareddata/xcschemes/Automattic-Tracks-iOS.xcscheme +++ b/Automattic-Tracks-iOS.xcodeproj/xcshareddata/xcschemes/Automattic-Tracks-iOS.xcscheme @@ -14,8 +14,8 @@ buildForAnalyzing = "YES"> @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -42,7 +42,7 @@ buildForAnalyzing = "YES"> @@ -60,7 +60,7 @@ skipped = "NO"> @@ -70,7 +70,7 @@ skipped = "NO"> @@ -80,8 +80,8 @@ @@ -102,8 +102,8 @@ @@ -120,8 +120,8 @@ diff --git a/Automattic-Tracks-iOS/Automattic-Tracks-iOS.h b/Automattic-Tracks-iOS/Automattic-Tracks-iOS.h new file mode 100644 index 00000000..ea0c83e4 --- /dev/null +++ b/Automattic-Tracks-iOS/Automattic-Tracks-iOS.h @@ -0,0 +1,12 @@ +#import + +//! 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 +#import + + diff --git a/Automattic-Tracks-iOS/Info.plist b/Automattic-Tracks-iOS/Info.plist new file mode 100644 index 00000000..d3de8eef --- /dev/null +++ b/Automattic-Tracks-iOS/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/Automattic-Tracks-iOS/Private/Logging.h b/Automattic-Tracks-iOS/Private/Logging.h new file mode 100644 index 00000000..88f3382e --- /dev/null +++ b/Automattic-Tracks-iOS/Private/Logging.h @@ -0,0 +1,2 @@ +@import CocoaLumberjack; +extern int ddLogLevel; diff --git a/Automattic-Tracks-iOS/Private/Logging.m b/Automattic-Tracks-iOS/Private/Logging.m new file mode 100644 index 00000000..c4003ddd --- /dev/null +++ b/Automattic-Tracks-iOS/Private/Logging.m @@ -0,0 +1,2 @@ +#import "Logging.h" +int ddLogLevel = DDLogLevelWarning; diff --git a/Automattic-Tracks-iOS/Tracks.swift b/Automattic-Tracks-iOS/Tracks.swift new file mode 100644 index 00000000..c8ef11ce --- /dev/null +++ b/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 { + +} diff --git a/Automattic-Tracks-iOS/TracksConstants.m b/Automattic-Tracks-iOS/TracksConstants.m index f2798518..18354a3a 100644 --- a/Automattic-Tracks-iOS/TracksConstants.m +++ b/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"; diff --git a/Automattic-Tracks-iOS/TracksContextManager.m b/Automattic-Tracks-iOS/TracksContextManager.m index 8abab7c0..71276104 100644 --- a/Automattic-Tracks-iOS/TracksContextManager.m +++ b/Automattic-Tracks-iOS/TracksContextManager.m @@ -1,5 +1,5 @@ #import "TracksContextManager.h" -#import "TracksLogging.h" +#import "Logging.h" @interface TracksContextManager () diff --git a/Automattic-Tracks-iOS/TracksEventPersistenceService.m b/Automattic-Tracks-iOS/TracksEventPersistenceService.m index 30e3ba94..76d621c1 100644 --- a/Automattic-Tracks-iOS/TracksEventPersistenceService.m +++ b/Automattic-Tracks-iOS/TracksEventPersistenceService.m @@ -1,6 +1,6 @@ #import "TracksEventPersistenceService.h" #import "TracksEventCoreData.h" -#import "TracksLogging.h" +#import "Logging.h" @interface TracksEventPersistenceService () diff --git a/Automattic-Tracks-iOS/TracksEventService.m b/Automattic-Tracks-iOS/TracksEventService.m index 2d59df90..ba87e965 100644 --- a/Automattic-Tracks-iOS/TracksEventService.m +++ b/Automattic-Tracks-iOS/TracksEventService.m @@ -1,6 +1,6 @@ #import "TracksEventService.h" #import "TracksEventPersistenceService.h" -#import "TracksLogging.h" +#import "Logging.h" @interface TracksEventService () diff --git a/Automattic-Tracks-iOS/TracksLogging.h b/Automattic-Tracks-iOS/TracksLogging.h index 8711f199..99c02004 100644 --- a/Automattic-Tracks-iOS/TracksLogging.h +++ b/Automattic-Tracks-iOS/TracksLogging.h @@ -1,3 +1,2 @@ -#define LOG_LEVEL_DEF AutomatticTracksLogLevel -#import -static const DDLogLevel AutomatticTracksLogLevel = DDLogLevelWarning; +int TracksGetLoggingLevel(); +void TracksSetLoggingLevel(int level); diff --git a/Automattic-Tracks-iOS/TracksLogging.m b/Automattic-Tracks-iOS/TracksLogging.m new file mode 100644 index 00000000..43972313 --- /dev/null +++ b/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; +} diff --git a/Automattic-Tracks-iOS/TracksService.m b/Automattic-Tracks-iOS/TracksService.m index ab07798a..35361c72 100644 --- a/Automattic-Tracks-iOS/TracksService.m +++ b/Automattic-Tracks-iOS/TracksService.m @@ -1,6 +1,6 @@ #import "TracksService.h" #import "TracksDeviceInformation.h" -#import "TracksLogging.h" +#import "Logging.h" #import #if TARGET_OS_IPHONE diff --git a/Podfile b/Podfile index 0df56bed..5ff7d841 100644 --- a/Podfile +++ b/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 diff --git a/Podfile.lock b/Podfile.lock index eb392d3a..569e0a83 100644 --- a/Podfile.lock +++ b/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 diff --git a/TracksDemo/Podfile b/TracksDemo/Podfile index ef183ecc..d94f94e6 100644 --- a/TracksDemo/Podfile +++ b/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 diff --git a/TracksDemo/Podfile.lock b/TracksDemo/Podfile.lock index cd4804b5..06d5db11 100644 --- a/TracksDemo/Podfile.lock +++ b/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 diff --git a/TracksDemo/TracksDemo.xcodeproj/project.pbxproj b/TracksDemo/TracksDemo.xcodeproj/project.pbxproj index ca11e4cc..3fb9738d 100644 --- a/TracksDemo/TracksDemo.xcodeproj/project.pbxproj +++ b/TracksDemo/TracksDemo.xcodeproj/project.pbxproj @@ -7,7 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 264696B089481DCE382369AF /* libPods-TracksDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D765CFC40F7A334C93C770 /* libPods-TracksDemo.a */; }; + 06E8F8A6533F299F1C44CA1D /* Pods_TracksDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E55A8E41794A67B215C3B579 /* Pods_TracksDemo.framework */; }; + 183CFEFAF72B47409BDC38D2 /* Pods_TracksDemoTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BE44F91AC3D2BAA5FFB1009 /* Pods_TracksDemoTests.framework */; }; 937632941AC2026900086BC6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 937632931AC2026900086BC6 /* main.m */; }; 937632971AC2026900086BC6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 937632961AC2026900086BC6 /* AppDelegate.m */; }; 9376329A1AC2026900086BC6 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 937632991AC2026900086BC6 /* ViewController.m */; }; @@ -28,7 +29,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 01D765CFC40F7A334C93C770 /* libPods-TracksDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TracksDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0BE44F91AC3D2BAA5FFB1009 /* Pods_TracksDemoTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TracksDemoTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5C7EA6A8E0D85262749E781E /* Pods-TracksDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TracksDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo.release.xcconfig"; sourceTree = ""; }; + 75106A9FBDD3B9C2BF811D8C /* Pods-TracksDemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TracksDemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TracksDemoTests/Pods-TracksDemoTests.debug.xcconfig"; sourceTree = ""; }; 937539871AFA8A9000B94B2A /* TracksDemo_Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TracksDemo_Prefix.pch; sourceTree = ""; }; 9376328E1AC2026900086BC6 /* TracksDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TracksDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 937632921AC2026900086BC6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -43,8 +46,9 @@ 937632A71AC2026900086BC6 /* TracksDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TracksDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 937632AC1AC2026900086BC6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 937632AD1AC2026900086BC6 /* TracksDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TracksDemoTests.m; sourceTree = ""; }; - A00AA600D374237A250173BD /* Pods-TracksDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TracksDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo.debug.xcconfig"; sourceTree = ""; }; - BE8A818C436955651627D306 /* Pods-TracksDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TracksDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo.release.xcconfig"; sourceTree = ""; }; + D5FE43A8226750DFBD26C5DE /* Pods-TracksDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TracksDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo.debug.xcconfig"; sourceTree = ""; }; + E55A8E41794A67B215C3B579 /* Pods_TracksDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TracksDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E7758E41CE095D5FB8E1DC60 /* Pods-TracksDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TracksDemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-TracksDemoTests/Pods-TracksDemoTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -52,7 +56,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 264696B089481DCE382369AF /* libPods-TracksDemo.a in Frameworks */, + 06E8F8A6533F299F1C44CA1D /* Pods_TracksDemo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -60,28 +64,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 183CFEFAF72B47409BDC38D2 /* Pods_TracksDemoTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 67BD2DC3581D3A9727A17EDF /* Frameworks */ = { - isa = PBXGroup; - children = ( - 01D765CFC40F7A334C93C770 /* libPods-TracksDemo.a */, - ); - name = Frameworks; - sourceTree = ""; - }; 937632851AC2026900086BC6 = { isa = PBXGroup; children = ( 937632901AC2026900086BC6 /* TracksDemo */, 937632AA1AC2026900086BC6 /* TracksDemoTests */, 9376328F1AC2026900086BC6 /* Products */, - DCEEA2D86C20CF83F1BBEF59 /* Pods */, - 67BD2DC3581D3A9727A17EDF /* Frameworks */, + FEE68EC96CCE2CD6A537C4DD /* Pods */, + EB7313FB3B3136F1D049ACE3 /* Frameworks */, ); sourceTree = ""; }; @@ -136,11 +133,22 @@ name = "Supporting Files"; sourceTree = ""; }; - DCEEA2D86C20CF83F1BBEF59 /* Pods */ = { + EB7313FB3B3136F1D049ACE3 /* Frameworks */ = { + isa = PBXGroup; + children = ( + E55A8E41794A67B215C3B579 /* Pods_TracksDemo.framework */, + 0BE44F91AC3D2BAA5FFB1009 /* Pods_TracksDemoTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + FEE68EC96CCE2CD6A537C4DD /* Pods */ = { isa = PBXGroup; children = ( - A00AA600D374237A250173BD /* Pods-TracksDemo.debug.xcconfig */, - BE8A818C436955651627D306 /* Pods-TracksDemo.release.xcconfig */, + D5FE43A8226750DFBD26C5DE /* Pods-TracksDemo.debug.xcconfig */, + 5C7EA6A8E0D85262749E781E /* Pods-TracksDemo.release.xcconfig */, + 75106A9FBDD3B9C2BF811D8C /* Pods-TracksDemoTests.debug.xcconfig */, + E7758E41CE095D5FB8E1DC60 /* Pods-TracksDemoTests.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -152,12 +160,12 @@ isa = PBXNativeTarget; buildConfigurationList = 937632B11AC2026900086BC6 /* Build configuration list for PBXNativeTarget "TracksDemo" */; buildPhases = ( - 5CB9B61CB8292998EB0DCF80 /* Check Pods Manifest.lock */, + 6A0666ECB5D9284A8D615D0F /* 📦 Check Pods Manifest.lock */, 9376328A1AC2026900086BC6 /* Sources */, 9376328B1AC2026900086BC6 /* Frameworks */, 9376328C1AC2026900086BC6 /* Resources */, - 3919A3B267C3FE837042193F /* Copy Pods Resources */, - 07CFBA082679BB192C56758C /* Embed Pods Frameworks */, + 701708021B708486195EA195 /* 📦 Embed Pods Frameworks */, + 811CAB924620040357A359C0 /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -172,9 +180,12 @@ isa = PBXNativeTarget; buildConfigurationList = 937632B41AC2026900086BC6 /* Build configuration list for PBXNativeTarget "TracksDemoTests" */; buildPhases = ( + 1F2500395A188C4BD83DC8FE /* 📦 Check Pods Manifest.lock */, 937632A31AC2026900086BC6 /* Sources */, 937632A41AC2026900086BC6 /* Frameworks */, 937632A51AC2026900086BC6 /* Resources */, + 4942F7300F338215736D999E /* 📦 Embed Pods Frameworks */, + 07E54FF21829AF3920D2BA09 /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -192,7 +203,7 @@ 937632861AC2026900086BC6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0620; + LastUpgradeCheck = 0730; ORGANIZATIONNAME = "Automattic Inc."; TargetAttributes = { 9376328D1AC2026900086BC6 = { @@ -245,44 +256,59 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 07CFBA082679BB192C56758C /* Embed Pods Frameworks */ = { + 07E54FF21829AF3920D2BA09 /* 📦 Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "📦 Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TracksDemoTests/Pods-TracksDemoTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 3919A3B267C3FE837042193F /* Copy Pods Resources */ = { + 1F2500395A188C4BD83DC8FE /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo-resources.sh\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + 4942F7300F338215736D999E /* 📦 Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "📦 Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TracksDemoTests/Pods-TracksDemoTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 5CB9B61CB8292998EB0DCF80 /* Check Pods Manifest.lock */ = { + 6A0666ECB5D9284A8D615D0F /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -290,6 +316,36 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; + 701708021B708486195EA195 /* 📦 Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "📦 Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 811CAB924620040357A359C0 /* 📦 Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "📦 Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TracksDemo/Pods-TracksDemo-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -361,6 +417,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -421,7 +478,7 @@ }; 937632B21AC2026900086BC6 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A00AA600D374237A250173BD /* Pods-TracksDemo.debug.xcconfig */; + baseConfigurationReference = D5FE43A8226750DFBD26C5DE /* Pods-TracksDemo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -429,6 +486,7 @@ INFOPLIST_FILE = TracksDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; }; @@ -436,7 +494,7 @@ }; 937632B31AC2026900086BC6 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BE8A818C436955651627D306 /* Pods-TracksDemo.release.xcconfig */; + baseConfigurationReference = 5C7EA6A8E0D85262749E781E /* Pods-TracksDemo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -444,6 +502,7 @@ INFOPLIST_FILE = TracksDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; }; @@ -451,6 +510,7 @@ }; 937632B51AC2026900086BC6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 75106A9FBDD3B9C2BF811D8C /* Pods-TracksDemoTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -463,6 +523,7 @@ ); INFOPLIST_FILE = TracksDemoTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TracksDemo.app/TracksDemo"; }; @@ -470,6 +531,7 @@ }; 937632B61AC2026900086BC6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = E7758E41CE095D5FB8E1DC60 /* Pods-TracksDemoTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -478,6 +540,7 @@ ); INFOPLIST_FILE = TracksDemoTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TracksDemo.app/TracksDemo"; }; diff --git a/TracksDemo/TracksDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/TracksDemo/TracksDemo/Images.xcassets/AppIcon.appiconset/Contents.json index 72875c48..a7fe4fc4 100644 --- a/TracksDemo/TracksDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/TracksDemo/TracksDemo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -71,6 +71,11 @@ "idiom" : "ipad", "filename" : "Icon-76@2x.png", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { diff --git a/TracksDemo/TracksDemo/Info.plist b/TracksDemo/TracksDemo/Info.plist index cd48fd7b..40c6215d 100644 --- a/TracksDemo/TracksDemo/Info.plist +++ b/TracksDemo/TracksDemo/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.automattic.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/TracksDemo/TracksDemo/ViewController.m b/TracksDemo/TracksDemo/ViewController.m index ce1613db..048e0120 100644 --- a/TracksDemo/TracksDemo/ViewController.m +++ b/TracksDemo/TracksDemo/ViewController.m @@ -1,5 +1,5 @@ #import "ViewController.h" -#import +@import AutomatticTracks; @interface ViewController () diff --git a/TracksDemo/TracksDemoTests/Info.plist b/TracksDemo/TracksDemoTests/Info.plist index efa65aa0..ba72822e 100644 --- a/TracksDemo/TracksDemoTests/Info.plist +++ b/TracksDemo/TracksDemoTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.automattic.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName