Skip to content

Commit

Permalink
Merge pull request #348 from wordpress-mobile/release/1.6.1
Browse files Browse the repository at this point in the history
Release/1.6.1
  • Loading branch information
loremattei authored Mar 23, 2020
2 parents f433fe9 + d80eb59 commit 3391a69
Show file tree
Hide file tree
Showing 24 changed files with 162 additions and 157 deletions.
2 changes: 2 additions & 0 deletions .bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_PATH: "vendor/bundle"
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.4
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- WPMediaPicker (1.6.0)
- WPMediaPicker (1.6.1-beta.1)

DEPENDENCIES:
- WPMediaPicker (from `../`)
Expand All @@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
WPMediaPicker: e5d28197da6b467d4e5975d64a49255977e39455
WPMediaPicker: 370b1c1597afc0dd3664c361748fdfd13530d4c6

PODFILE CHECKSUM: 6b0e391139d3864c72fde997a1418dbfe9bf5126

Expand Down
10 changes: 4 additions & 6 deletions Example/WPMediaPicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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>"; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1030"
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -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">
Expand All @@ -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"
Expand All @@ -71,8 +69,6 @@
ReferencedContainer = "container:WPMediaPicker.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
4 changes: 4 additions & 0 deletions Example/WPMediaPicker/DemoViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "Icon-App-1024x1024-1.png",
"scale" : "1x"
},
{
Expand Down Expand Up @@ -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" : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

61 changes: 61 additions & 0 deletions Example/WPMediaPicker/Launch Screen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Aw0-b4-zFp">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="ZL2-M8-r95">
<rect key="frame" x="20" y="876" width="374" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
<variation key="widthClass=compact">
<fontDescription key="fontDescription" type="system" pointSize="11"/>
</variation>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WPMediaPicker" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="sCd-Qw-gdo">
<rect key="frame" x="19" y="492" width="376" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="MsR-lF-HG5">
<rect key="frame" x="169" y="410" width="76" height="76"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
</subviews>
<color key="backgroundColor" red="0.2964418828" green="0.65486317869999999" blue="0.84320759769999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstItem="sCd-Qw-gdo" firstAttribute="top" secondItem="MsR-lF-HG5" secondAttribute="bottom" constant="6" id="148-o7-XCq"/>
<constraint firstItem="MsR-lF-HG5" firstAttribute="centerX" secondItem="Aw0-b4-zFp" secondAttribute="centerX" id="9ex-vf-pO5"/>
<constraint firstItem="ZL2-M8-r95" firstAttribute="leading" secondItem="Aw0-b4-zFp" secondAttribute="leading" constant="20" symbolic="YES" id="HrO-8i-HLi"/>
<constraint firstAttribute="centerX" secondItem="ZL2-M8-r95" secondAttribute="centerX" id="LUf-3c-BdJ"/>
<constraint firstItem="sCd-Qw-gdo" firstAttribute="leading" secondItem="Aw0-b4-zFp" secondAttribute="leading" constant="19" id="bv7-Lf-6fG"/>
<constraint firstItem="MsR-lF-HG5" firstAttribute="centerY" secondItem="Aw0-b4-zFp" secondAttribute="centerY" id="fVB-xE-X1E"/>
<constraint firstAttribute="centerX" secondItem="sCd-Qw-gdo" secondAttribute="centerX" id="o4l-Mc-9OO"/>
<constraint firstAttribute="bottom" secondItem="ZL2-M8-r95" secondAttribute="bottom" constant="20" id="vFF-dZ-ZxS"/>
</constraints>
<viewLayoutGuide key="safeArea" id="5P0-d2-3Kj"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="icon" width="76" height="76"/>
</resources>
</document>
Loading

0 comments on commit 3391a69

Please sign in to comment.