Merge pull request #348 from wordpress-mobile/release/1.6.1

Release/1.6.1

Author: loremattei

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

.circleci/config.yml

@@ -9,22 +9,22 @@ workflows:
     jobs:
       - ios/test:
           name: Test
-          xcode-version: "11.0"
+          xcode-version: "11.2.1"
           cocoapods-working-directory: Example
           workspace: Example/WPMediaPicker.xcworkspace
           scheme: WPMediaPicker-Example
           device: iPhone 11
-          ios-version: "13.0"
+          ios-version: "13.2.2"
           bundle-install: true
           pod-install: true
       - ios/validate-podspec:
           name: Validate Podspec
-          xcode-version: "11.0"
+          xcode-version: "11.2.1"
           podspec-path: WPMediaPicker.podspec
           bundle-install: true
       - ios/publish-podspec:
           name: Publish to Trunk
-          xcode-version: "11.0"
+          xcode-version: "11.2.1"
           podspec-path: WPMediaPicker.podspec
           bundle-install: true
           post-to-slack: true

.gitignore

@@ -19,9 +19,6 @@ DerivedData
 *.hmap
 *.ipa
 
-# Bundler
-.bundle
-
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control

.ruby-version

@@ -0,0 +1 @@
+2.6.4

CHANGELOG.md

@@ -3,9 +3,9 @@ All notable changes to this project will be documented in this file.
 `WPMediaPicker` adheres to [Semantic Versioning](http://semver.org/).
 
 #### Releases
-- `1.6.0` Release  - [1.5](#1.6.0)
+- `1.6.0` Release  - [1.6](#1.6.0)
 - `1.5.0` Release  - [1.5](#1.5.0)
-- `1.4.2` Release  - [1.4](#1.4.2)
+- `1.4.2` Release  - [1.4.2](#1.4.2)
 - `1.4` Release  - [1.4](#1.4)
 - `1.3.4` Release  - [1.3.4](#1.3.4)
 - `1.3` Release  - [1.3](#1.3)

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (1.6.0)
+  - WPMediaPicker (1.6.1-beta.1)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WPMediaPicker: e5d28197da6b467d4e5975d64a49255977e39455
+  WPMediaPicker: 370b1c1597afc0dd3664c361748fdfd13530d4c6
 
 PODFILE CHECKSUM: 6b0e391139d3864c72fde997a1418dbfe9bf5126
 

Example/WPMediaPicker.xcodeproj/project.pbxproj

@@ -24,8 +24,8 @@
 		702AD5F17F8916AABC105A1B /* libPods-WPMediaPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C1CDA09FDF3F25E866D8A4D /* libPods-WPMediaPicker.a */; };
 		AE22BBE03B862A6657E6B66E /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E1E578A5967DE531E1AC701 /* libPods-Tests.a */; };
 		B5FF3BEA1CAD8AB100C1D597 /* PostProcessingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FF3BE91CAD8AB100C1D597 /* PostProcessingViewController.m */; };
+		CEDE0D8F2419808A00CB3345 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CEDE0D8E2419808A00CB3345 /* Launch Screen.storyboard */; };
 		FF355D9E1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.m in Sources */ = {isa = PBXBuildFile; fileRef = FF355D9D1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.m */; };
-		FFC3F6F31B0D9BB100EFC359 /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */; };
 		FFE69A1D1B14AB840073C2EB /* OptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */; };
 		FFFFD8811A447E67000FC184 /* DemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFFFD8801A447E67000FC184 /* DemoViewController.m */; };
 /* End PBXBuildFile section */
@@ -71,13 +71,13 @@
 		ABF10F16DB0AA9A8008C72C7 /* Pods-WPMediaPicker.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WPMediaPicker.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker.debug.xcconfig"; sourceTree = "<group>"; };
 		B5FF3BE81CAD8AB100C1D597 /* PostProcessingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostProcessingViewController.h; sourceTree = "<group>"; };
 		B5FF3BE91CAD8AB100C1D597 /* PostProcessingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PostProcessingViewController.m; sourceTree = "<group>"; };
+		CEDE0D8E2419808A00CB3345 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		CEF4FB57530C0C9D7C09607C /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		F0D09511821A352B062D5699 /* WPMediaPicker.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = WPMediaPicker.podspec; path = ../WPMediaPicker.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		FF355D9C1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WPPHAssetDataSource+Search.h"; sourceTree = "<group>"; };
 		FF355D9D1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WPPHAssetDataSource+Search.m"; sourceTree = "<group>"; };
 		FF41CBE31E8B0F5B001B8235 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
 		FF7DCB451E7C494D00AB77CB /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CONTRIBUTING.md; path = ../CONTRIBUTING.md; sourceTree = "<group>"; };
-		FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = "<group>"; };
 		FFE69A1B1B14AB840073C2EB /* OptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsViewController.h; sourceTree = "<group>"; };
 		FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OptionsViewController.m; sourceTree = "<group>"; };
 		FFFFD87F1A447E67000FC184 /* DemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoViewController.h; sourceTree = "<group>"; };
@@ -158,8 +158,8 @@
 				6003F59C195388D20070C39A /* AppDelegate.h */,
 				6003F59D195388D20070C39A /* AppDelegate.m */,
 				6003F5A8195388D20070C39A /* Images.xcassets */,
+				CEDE0D8E2419808A00CB3345 /* Launch Screen.storyboard */,
 				6003F594195388D20070C39A /* Supporting Files */,
-				FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */,
 				FFE69A1B1B14AB840073C2EB /* OptionsViewController.h */,
 				FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */,
 				FF355D9C1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.h */,
@@ -307,7 +307,7 @@
 			files = (
 				6003F5A9195388D20070C39A /* Images.xcassets in Resources */,
 				6003F598195388D20070C39A /* InfoPlist.strings in Resources */,
-				FFC3F6F31B0D9BB100EFC359 /* Launch Screen.xib in Resources */,
+				CEDE0D8F2419808A00CB3345 /* Launch Screen.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -538,7 +538,6 @@
 			baseConfigurationReference = ABF10F16DB0AA9A8008C72C7 /* Pods-WPMediaPicker.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -563,7 +562,6 @@
 			baseConfigurationReference = 1120051BDDDC8A558883872E /* Pods-WPMediaPicker.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;

Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6003F589195388D20070C39A"
+            BuildableName = "WPMediaPicker.app"
+            BlueprintName = "WPMediaPicker"
+            ReferencedContainer = "container:WPMediaPicker.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6003F589195388D20070C39A"
-            BuildableName = "WPMediaPicker.app"
-            BlueprintName = "WPMediaPicker"
-            ReferencedContainer = "container:WPMediaPicker.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:WPMediaPicker.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Example/WPMediaPicker/DemoViewController.m

@@ -240,6 +240,10 @@ - (void)mediaPickerController:(WPMediaPickerViewController *)picker willShowOver
     }
 }
 
+- (BOOL)mediaPickerController:(nonnull WPMediaPickerViewController *)picker handleError:(nonnull NSError *)error {
+    return error.domain != WPMediaPickerErrorDomain;    
+}
+
 #pragma - Actions
 
 - (void) clearSelection:(id) sender

Example/WPMediaPicker/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -131,8 +131,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-App-1024x1024-1.png",
       "scale" : "1x"
     },
     {
@@ -204,16 +205,10 @@
       "subtype" : "44mm"
     },
     {
-      "idiom" : "watch-marketing",
       "size" : "1024x1024",
+      "idiom" : "watch-marketing",
+      "filename" : "Icon-App-1024x1024.png",
       "scale" : "1x"
-    },
-    {
-      "size" : "44x44",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "longLook",
-      "subtype" : "42mm"
     }
   ],
   "info" : {