Merge branch 'feature/xcode8' into release/0.27.1

.ruby-version

@@ -1 +1 @@
-2.2.4
+2.4.1

.travis.yml

@@ -1,17 +1,16 @@
-osx_image: xcode7.3
+osx_image: xcode8.3
 language: objective-c
-rvm: 2.2.4
+rvm: 2.4.1
 cache:
   - bundler
   - cocoapods
-before_install:
-  - gem install bundler
 install:
-  - bundle install
+  - bundle install --jobs=3 --retry=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
   - travis_wait 30 bundle exec pod repo update --silent
   - travis_wait 30 bundle exec pod install
 script:
-  - travis_wait 50 bundle exec rake ci
+  - travis_retry bundle exec rake ci
+  - travis_wait 50 bundle exec rake lint
 branches:
   only:
     - master

Code/Network/RKObjectRequestOperationSubclass.h

@@ -32,8 +32,7 @@
 
  The `RKObjectRequestOperation` superclass is responsible for the invocation of this method and the subsequent handling of the mapping result or error.
 
- @param error A pointer to an `NSError` object to be set in the event that the object mapping process has failed.
- @return A mapping result or `nil` if an error has occurred.
+ @param completionBlock A mapping result or `nil` if an error has occurred.
  */
 - (void)performMappingOnResponseWithCompletionBlock:(void(^)(RKMappingResult *mappingResult, NSError *error))completionBlock;
 

Code/ObjectMapping/RKMappingOperationDataSource.h

@@ -57,8 +57,8 @@
  as obtaining that value is somewhat expensive.
  
  @param mappingOperation The mapping operation requesting the target object.
- @param representation A dictionary representation of the properties to be mapped onto the retrieved target object.
  @param mapping The object mapping to be used to perform a mapping from the representation to the target object.
+ @param relationshipMapping A dictionary representation of the properties to be mapped onto the retrieved target object.
  @return A key-value coding compliant object to perform the mapping on to.
  */
 - (id)mappingOperation:(RKMappingOperation *)mappingOperation targetObjectForMapping:(RKObjectMapping *)mapping inRelationship:(RKRelationshipMapping *)relationshipMapping;

Code/ObjectMapping/RKObjectMappingMatcher.h

@@ -52,8 +52,7 @@
  Creates and returns a key path matcher object with a given key path, and a map of expected values to associated RKObjectMapping objects that applies in the event of a positive match with its associated value.  This method can evaluate the keyPath once
  
  @param keyPath The key path to obtain the comparison value from the object being matched via `valueForKeyPath:`.
- @param expectedValue The value that is expected to be read from `keyPath` if there is a match.
- @param objectMapping The object mapping object that applies if the comparison value is equal to the expected value.
+ @param valueToObjectMapping The value that is expected to be read from `keyPath` if there is a match.
  @return The receiver, initialized with the given key path and expected value map.
  */
 + (instancetype)matcherWithKeyPath:(NSString *)keyPath expectedValueMap:(NSDictionary *)valueToObjectMapping;
@@ -75,7 +74,7 @@
 /**
  Creates and returns a matcher object with a given block which returns the RKObjectMapping instance to use, and an optional array of possible object mappings which could be returned.
  
- @param possibleMappings The list of known possible RKObjectMapping instances which could be returned.  This is used to aid RKDynamicMapping's -objectMappings method which is used in some instances, but is not required for mapping.  The block could return a new instance if needed.
+ @param mappings The list of known possible RKObjectMapping instances which could be returned.  This is used to aid RKDynamicMapping's -objectMappings method which is used in some instances, but is not required for mapping.  The block could return a new instance if needed.
  @param block The block with which to evaluate the matched object, and return the object mapping to use.  Return nil if no match (i.e. a `NO` return from the `-matches:` method).
  @return The receiver, initialized with the given block ans possible mappings.
  */

Code/Testing/RKTestFactory.m

@@ -74,7 +74,7 @@ - (instancetype)init
 {
     self = [super init];
     if (self) {
-        self.baseURL = [NSURL URLWithString:@"http://127.0.0.1:4567"];
+        self.baseURL = [NSURL URLWithString:@"http://localhost:4567"];
         self.factoryBlocks = [NSMutableDictionary new];
         self.sharedObjectsByFactoryName = [NSMutableDictionary new];
         [self defineDefaultFactories];

Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj

@@ -99,7 +99,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
+		29B97314FDCFA39411CA2CEA = {
 			isa = PBXGroup;
 			children = (
 				25063C9016021B16007CAC2B /* Default-568h@2x.png */,
@@ -204,7 +204,8 @@
 				French,
 				German,
 			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
+			mainGroup = 29B97314FDCFA39411CA2CEA;
+			productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
@@ -243,7 +244,7 @@
 			);
 			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 = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		B73887517504A74F7323976B /* [CP] Embed Pods Frameworks */ = {

Gemfile

@@ -1,9 +1,10 @@
 source "https://rubygems.org"
 
+gem 'bundler'
 gem 'rakeup', '~> 1.2.0'
-gem 'sinatra', '~> 1.4.0'
-gem 'sinatra-contrib', '~> 1.4.0'
-gem 'thin', '~> 1.5.0'
-gem 'cocoapods', '1.1.0.rc3'
-gem 'xctasks', '~> 0.5.0'
-gem 'xcpretty', '~> 0.1.6'
+gem 'sinatra', '~> 1.4.8'
+gem 'sinatra-contrib', '~> 1.4.7'
+gem 'thin', '~> 1.7.1'
+gem 'cocoapods', '1.2.1'
+gem 'xctasks', '~> 0.6.0'
+gem 'xcpretty', '~> 0.2.8'

Gemfile.lock

@@ -1,63 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    CFPropertyList (2.3.5)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    backports (3.6.5)
-    claide (1.0.1)
-    cocoapods (1.1.0.rc.3)
+    backports (3.8.0)
+    claide (1.0.2)
+    cocoapods (1.2.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.0.rc.3)
+      cocoapods-core (= 1.2.1)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.1, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (= 1.1.0.beta.1)
+      cocoapods-trunk (>= 1.2.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0)
+      fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.5.7)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.2, < 2.0)
-    cocoapods-core (1.1.0.rc.3)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.4.4, < 2.0)
+    cocoapods-core (1.2.1)
       activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.1)
+    cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.0.beta.1)
+    cocoapods-trunk (1.2.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
-    colored (1.2)
-    daemons (1.2.3)
+    colored2 (3.1.2)
+    daemons (1.2.4)
     escape (0.0.4)
-    eventmachine (1.0.7)
+    eventmachine (1.2.3)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
-    i18n (0.7.0)
-    json (1.8.3)
-    mini_portile (0.6.2)
-    minitest (5.9.1)
-    molinillo (0.5.1)
-    multi_json (1.11.2)
+    gh_inspector (1.0.3)
+    i18n (0.8.4)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
+    molinillo (0.5.7)
+    multi_json (1.12.1)
+    nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     rack (1.5.5)
     rack-protection (1.5.3)
       rack
@@ -67,45 +68,50 @@ GEM
     rakeup (1.2.0)
       rack (~> 1.5.0)
       rake (~> 10.3.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    rouge (2.0.7)
+    ruby-macho (1.1.0)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.6)
+    sinatra-contrib (1.4.7)
       backports (>= 2.0)
       multi_json
       rack-protection
       rack-test
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thread_safe (0.3.5)
-    tilt (2.0.1)
-    tzinfo (1.2.2)
+    thin (1.7.1)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    xcodeproj (1.3.2)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
-    xcpretty (0.1.10)
-    xctasks (0.5.0)
+    xcodeproj (1.5.0)
+      CFPropertyList (~> 2.3.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.3)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
+    xctasks (0.6.0)
       nokogiri (~> 1.6, >= 1.6.3.1)
       rake (~> 10.0, >= 10.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.1.0.rc3)
+  bundler
+  cocoapods (= 1.2.1)
   rakeup (~> 1.2.0)
-  sinatra (~> 1.4.0)
-  sinatra-contrib (~> 1.4.0)
-  thin (~> 1.5.0)
-  xcpretty (~> 0.1.6)
-  xctasks (~> 0.5.0)
+  sinatra (~> 1.4.8)
+  sinatra-contrib (~> 1.4.7)
+  thin (~> 1.7.1)
+  xcpretty (~> 0.2.8)
+  xctasks (~> 0.6.0)
 
 BUNDLED WITH
-   1.12.5
+   1.15.1

Podfile

@@ -9,7 +9,7 @@ def import_pods
   pod 'RestKit/Testing', :path => '.'
   pod 'RestKit/Search', :path => '.'
 
-  pod 'Specta', '1.0.5'
+  pod 'Specta', '1.0.6'
   pod 'OCMock', '2.2.4'
   pod 'OCHamcrest', '3.0.1'
   pod 'Expecta', '1.0.5'

Podfile.lock

@@ -32,7 +32,7 @@ PODS:
     - RKValueTransformers (~> 1.1.0)
   - RKValueTransformers (1.1.3)
   - SOCKit (1.1)
-  - Specta (1.0.5)
+  - Specta (1.0.6)
   - TransitionKit (2.2.1)
 
 DEPENDENCIES:
@@ -46,7 +46,7 @@ DEPENDENCIES:
   - RKCLLocationValueTransformer (~> 1.1.0)
   - RKValueTransformers (~> 1.1.0)
   - SOCKit
-  - Specta (= 1.0.5)
+  - Specta (= 1.0.6)
   - TransitionKit (~> 2.2)
 
 EXTERNAL SOURCES:
@@ -63,9 +63,9 @@ SPEC CHECKSUMS:
   RKCLLocationValueTransformer: 2cf0ea0fb7cd4bc70c56834fb92abc717c66f982
   RKValueTransformers: e5ed67e3811229b616fe01bddeeafe3bb337b1b9
   SOCKit: c7376ac262bea9115b8f749358f762522a47d392
-  Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
+  Specta: f506f3a8361de16bc0dcf3b17b75e269072ba465
   TransitionKit: 9ceccda4cd0cdc0a05ef85eb235e5a3292c3c250
 
-PODFILE CHECKSUM: 2fcdadbabd8d5e734e1a95ec3ca7e2ef9fa9a3f9
+PODFILE CHECKSUM: b8958dcfe595d2829cf28ef5cb76c4da13eb2ed0
 
-COCOAPODS: 1.1.0.rc.3
+COCOAPODS: 1.2.1

Rakefile

@@ -19,15 +19,12 @@ XCTasks::TestTask.new(:test) do |t|
 
   t.subtask(ios: 'RestKitTests') do |s|
     s.sdk = :iphonesimulator
-    s.destination('platform=iOS Simulator,OS=9.3,name=iPhone 6')
+    s.destination('platform=iOS Simulator,OS=10.3.1,name=iPhone 5s')
   end
-# OS X Tests disabled as part of https://github.com/RestKit/RestKit/pull/2434
-# because of the following Cocoapods issue https://github.com/CocoaPods/CocoaPods/issues/4752
-=begin
+
   t.subtask(osx: 'RestKitFrameworkTests') do |s|
     s.sdk = :macosx
   end
-=end
 end
 
 task default: 'test'
@@ -36,8 +33,8 @@ namespace :test do
   # Provides validation that RestKit continues to build without Core Data. This requires conditional compilation that is error prone
   task :building_without_core_data do
     title 'Testing without Core Data'
-    run('cd Examples/RKTwitter && pod install')
-    run('xctool -workspace Examples/RKTwitter/RKTwitter.xcworkspace -scheme RKTwitter -sdk iphonesimulator clean build ONLY_ACTIVE_ARCH=NO')
+    run('cd Examples/RKTwitter && bundle exec pod install')
+    run('xcodebuild -workspace Examples/RKTwitter/RKTwitter.xcworkspace -scheme RKTwitter -sdk iphonesimulator clean build ONLY_ACTIVE_ARCH=NO | xcpretty && exit ${PIPESTATUS[0]}')
   end
 end
 
@@ -66,9 +63,9 @@ end
 desc 'Build RestKit for iOS and Mac OS X'
 task :build do
   title 'Building RestKit'
-  run('xcodebuild -workspace RestKit.xcworkspace -scheme RestKit -sdk iphonesimulator clean build')
-  run('xcodebuild -workspace RestKit.xcworkspace -scheme RestKit -sdk iphoneos clean build')
-  run('xcodebuild -workspace RestKit.xcworkspace -scheme RestKit -sdk macosx clean build')
+  run('xcodebuild -workspace RestKit.xcworkspace -scheme RestKit -sdk iphonesimulator clean build | xcpretty && exit ${PIPESTATUS[0]}')
+  run('xcodebuild -workspace RestKit.xcworkspace -scheme RestKit -sdk iphoneos clean build | xcpretty && exit ${PIPESTATUS[0]}')
+  run('xcodebuild -workspace RestKit.xcworkspace -scheme RestKit -sdk macosx clean build | xcpretty && exit ${PIPESTATUS[0]}')
 end
 
 desc 'Generate documentation via appledoc'
@@ -157,8 +154,8 @@ namespace :build do
       sdks.each do |sdk|
         puts "Building '#{example_project}' with SDK #{sdk}..."
         scheme = project_name
-        run("cd #{project_path} && pod install")
-        run("xctool -workspace #{project_workspace} -scheme #{scheme} -sdk #{sdk} clean build")
+        run("cd #{project_path} && bundle exec pod install")
+        run("xcodebuild -workspace #{project_workspace} -scheme #{scheme} -sdk #{sdk} clean build | xcpretty && exit ${PIPESTATUS[0]}")
       end
     end
   end
@@ -176,7 +173,7 @@ task :lint do
 end
 
 desc 'Runs the CI suite'
-task ci: ['server:autostart', :test, 'test:building_without_core_data', :lint]
+task ci: ['server:autostart', :test, 'test:building_without_core_data']
 
 desc 'Make a new release of RestKit'
 task :release do