Updated for cocoaPods 1.x + (#64)

- Updated podfile
- Updated cocoapods to 1.1.1
- Updated circle.yml —  use latest ios SDK; updated device ID for instruments

Author: kevnm67

Example/ExampleSSDataSources.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -48,17 +48,21 @@
             ReferencedContainer = "container:ExampleSSDataSources.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "492A5D07179B29B600A137CC"
@@ -71,12 +75,13 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "492A5D07179B29B600A137CC"

Example/ExampleSSDataSources.xcodeproj/xcshareddata/xcschemes/ExampleSSDataSources.xcscheme

@@ -68,7 +68,7 @@ - (void)viewDidLoad {
                                                       target:self
                                                       action:@selector(addItem)],
         [[UIBarButtonItem alloc] initWithTitle:@"Remove Cell"
-                                         style:UIBarButtonItemStyleBordered
+                                         style:UIBarButtonItemStylePlain
                                         target:self
                                         action:@selector(removeItem)],
 

Example/ExampleSSDataSources/Controllers/SSCollectionViewController.m

@@ -13,7 +13,7 @@
 	<key>CFBundleIcons~ipad</key>
 	<dict/>
 	<key>CFBundleIdentifier</key>
-	<string>net.splinesoft.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Example/ExampleSSDataSources/Supporting Files/ExampleSSDataSources-Info.plist

@@ -71,8 +71,11 @@ - (void)testOutOfBoundsIndexPathAccess
 
 - (void)testSingleTableSectionForItems
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
     SSArrayDataSource *ds = [[SSArrayDataSource alloc] initWithItems:@[@"foo", @"bar"]];
     expect([ds numberOfSectionsInTableView:nil]).to.equal(1);
+#pragma clang diagnostic pop
 }
 
 - (void)testMapsTableRowPerItem
@@ -105,8 +108,11 @@ - (void)testReturnsCellForTableView
 
 - (void)testSingleCollectionSectionForItems
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
     SSArrayDataSource *ds = [[SSArrayDataSource alloc] initWithItems:@[@"foo", @"bar"]];
     expect([ds numberOfSectionsInTableView:nil]).to.equal(1);
+#pragma clang diagnostic pop
 }
 
 - (void)testMapsCollectionItemPerItem
@@ -601,7 +607,7 @@ - (void)testFindingManagedObjectById
 
 - (void)testEmptyView
 {
-    UIView *emptyView = [UIView new];
+    UIView *emptyView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
 
     dataSource.tableView = (UITableView *)tableView;
     dataSource.emptyView = emptyView;

Example/ExampleSSDataSourcesTests/SSArrayDataSourceTests.m

@@ -196,12 +196,12 @@ - (void)testBasicEmptyViewVisibility
     // hidden empty view
     SSArrayDataSource *arrayDataSource = [[SSArrayDataSource alloc] initWithItems:@[ @"item" ]];
     arrayDataSource.tableView = tableView;
-    arrayDataSource.emptyView = [UIView new];
-    expect(arrayDataSource.emptyView.hidden).to.beTruthy();
+    arrayDataSource.emptyView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+    expect(arrayDataSource.emptyView.isHidden).to.beTruthy();
 
     // visible empty view
     [arrayDataSource removeAllItems];
-    expect(arrayDataSource.emptyView.hidden).to.beFalsy();
+    expect(arrayDataSource.emptyView.isHidden).to.beFalsy();
 }
 
 - (void)testEmptyViewSetUpIsNotDependentOnParentViewConfiguration
@@ -211,12 +211,12 @@ - (void)testEmptyViewSetUpIsNotDependentOnParentViewConfiguration
     SSArrayDataSource *arrayDataSource;
 
     arrayDataSource = [[SSArrayDataSource alloc] initWithItems:@[]];
-    arrayDataSource.emptyView = [UIView new];
+    arrayDataSource.emptyView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
     arrayDataSource.tableView = tableView;
     expect(arrayDataSource.emptyView.hidden).to.beFalsy();
 
     arrayDataSource = [[SSArrayDataSource alloc] initWithItems:@[]];
-    arrayDataSource.emptyView = [UIView new];
+    arrayDataSource.emptyView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
     arrayDataSource.collectionView = collectionView;
     expect(arrayDataSource.emptyView.hidden).to.beFalsy();
 }

Example/ExampleSSDataSourcesTests/SSBaseDataSourceTests.m

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.splinesoft.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

Example/ExampleSSDataSourcesTests/Supporting Files/ExampleSSDataSourcesTests-Info.plist

@@ -1,13 +1,18 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 platform :ios, '6.0'
+inhibit_all_warnings!
 
-xcodeproj 'ExampleSSDataSources'
-
-pod 'SSDataSources', :path => "../SSDataSources.podspec"
+target 'ExampleSSDataSources' do
+  pod 'SSDataSources', :path => '../'
+  pod 'MagicalRecord'
+  
+  target 'ExampleSSDataSourcesTests' do
+    inherit! :search_paths
 
-target :ExampleSSDataSourcesTests, :exclusive => true do
   pod 'Expecta'
   pod 'OCMock'
-  pod 'MagicalRecord'
+  
+  end
 end
+

Example/Podfile

@@ -1,25 +1,27 @@
 PODS:
-  - Expecta (0.4.0)
+  - Expecta (1.0.5)
   - MagicalRecord (2.2):
     - MagicalRecord/Core (= 2.2)
   - MagicalRecord/Core (2.2)
-  - OCMock (3.1.2)
+  - OCMock (3.3.1)
   - SSDataSources (0.8.5)
 
 DEPENDENCIES:
   - Expecta
   - MagicalRecord
   - OCMock
-  - SSDataSources (from `../SSDataSources.podspec`)
+  - SSDataSources (from `../`)
 
 EXTERNAL SOURCES:
   SSDataSources:
-    :path: "../SSDataSources.podspec"
+    :path: ../
 
 SPEC CHECKSUMS:
-  Expecta: 392a6b5bfb9f4097e47dd8064d9b732079490332
-  MagicalRecord: f8a56bb87ab6552f20c4bb8681a1958a197ea3cd
-  OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
+  Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
+  MagicalRecord: 2dc87179ae7c1f2a274442624ec65a07d4357a6f
+  OCMock: f3f61e6eaa16038c30caa5798c5e49d3307b6f22
   SSDataSources: b01170fb23b82acf0649194e9189b0bf5f702681
 
-COCOAPODS: 0.37.2
+PODFILE CHECKSUM: a825c470a277c6414e70013f6c8fb50387acf57d
+
+COCOAPODS: 1.1.1

Example/Podfile.lock

@@ -3,19 +3,26 @@ machine:
     LANG: en_US.UTF-8
     LC_CTYPE: en_US.UTF-8
   xcode:
-    version: "6.3.1"
+    version: "8.0"
 dependencies:
   pre:
-    - xcrun instruments -w "iPhone 6 (8.3 Simulator)" || exit 0
+    - xcrun instruments -w 'D0D2EBA2-A0DC-4710-87C5-79DFDBF7E123' || true
   override:    
     - sudo gem install cocoapods xcpretty obcd -N
     - pod install --project-directory=Example
 test:
   override:
-    - set -o pipefail && xcodebuild -workspace Example/ExampleSSDataSources.xcworkspace
-      -scheme ExampleSSDataSources -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" 
-      GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c 
-      --report junit --output ${CIRCLE_TEST_REPORTS}/junit.xml
+    - set -o pipefail &&
+      xcodebuild
+        GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES 
+        GCC_GENERATE_TEST_COVERAGE_FILES=YES
+        -sdk iphonesimulator
+        -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest'
+        -workspace Example/ExampleSSDataSources.xcworkspace
+        -scheme "ExampleSSDataSources"
+        clean build test |
+      tee $CIRCLE_ARTIFACTS/xcode_raw.log |
+      xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/junit.xml
     - pod lib lint --quick
     - obcd --path SSDataSources find HeaderStyle
 deployment: