Skip to content
This repository was archived by the owner on Jun 19, 2025. It is now read-only.

Commit d4702d7

Browse files
mindgraffitimindgraffiti
authored
Merge pull request #343 from wordpress-mobile/issue/342-update-pod
Update MediaPicker-iOS pod
2 parents 021df88 + 86b34dd commit d4702d7

File tree

12 files changed

+91
-149
lines changed

12 files changed

+91
-149
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ All notable changes to this project will be documented in this file.
33
`WPMediaPicker` adheres to [Semantic Versioning](http://semver.org/).
44

55
#### Releases
6-
- `1.6.0` Release - [1.5](#1.6.0)
6+
- `1.6.0` Release - [1.6](#1.6.0)
77
- `1.5.0` Release - [1.5](#1.5.0)
8-
- `1.4.2` Release - [1.4](#1.4.2)
8+
- `1.4.2` Release - [1.4.2](#1.4.2)
99
- `1.4` Release - [1.4](#1.4)
1010
- `1.3.4` Release - [1.3.4](#1.3.4)
1111
- `1.3` Release - [1.3](#1.3)

‎Example/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- WPMediaPicker (1.6.0)
2+
- WPMediaPicker (1.6.1-beta.1)
33

44
DEPENDENCIES:
55
- WPMediaPicker (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
WPMediaPicker: e5d28197da6b467d4e5975d64a49255977e39455
12+
WPMediaPicker: 370b1c1597afc0dd3664c361748fdfd13530d4c6
1313

1414
PODFILE CHECKSUM: 6b0e391139d3864c72fde997a1418dbfe9bf5126
1515

‎Example/WPMediaPicker.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
702AD5F17F8916AABC105A1B /* libPods-WPMediaPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C1CDA09FDF3F25E866D8A4D /* libPods-WPMediaPicker.a */; };
2525
AE22BBE03B862A6657E6B66E /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E1E578A5967DE531E1AC701 /* libPods-Tests.a */; };
2626
B5FF3BEA1CAD8AB100C1D597 /* PostProcessingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FF3BE91CAD8AB100C1D597 /* PostProcessingViewController.m */; };
27+
CEDE0D8F2419808A00CB3345 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CEDE0D8E2419808A00CB3345 /* Launch Screen.storyboard */; };
2728
FF355D9E1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.m in Sources */ = {isa = PBXBuildFile; fileRef = FF355D9D1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.m */; };
28-
FFC3F6F31B0D9BB100EFC359 /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */; };
2929
FFE69A1D1B14AB840073C2EB /* OptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */; };
3030
FFFFD8811A447E67000FC184 /* DemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFFFD8801A447E67000FC184 /* DemoViewController.m */; };
3131
/* End PBXBuildFile section */
@@ -71,13 +71,13 @@
7171
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>"; };
7272
B5FF3BE81CAD8AB100C1D597 /* PostProcessingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostProcessingViewController.h; sourceTree = "<group>"; };
7373
B5FF3BE91CAD8AB100C1D597 /* PostProcessingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PostProcessingViewController.m; sourceTree = "<group>"; };
74+
CEDE0D8E2419808A00CB3345 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
7475
CEF4FB57530C0C9D7C09607C /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
7576
F0D09511821A352B062D5699 /* WPMediaPicker.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = WPMediaPicker.podspec; path = ../WPMediaPicker.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
7677
FF355D9C1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WPPHAssetDataSource+Search.h"; sourceTree = "<group>"; };
7778
FF355D9D1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WPPHAssetDataSource+Search.m"; sourceTree = "<group>"; };
7879
FF41CBE31E8B0F5B001B8235 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
7980
FF7DCB451E7C494D00AB77CB /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CONTRIBUTING.md; path = ../CONTRIBUTING.md; sourceTree = "<group>"; };
80-
FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = "<group>"; };
8181
FFE69A1B1B14AB840073C2EB /* OptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsViewController.h; sourceTree = "<group>"; };
8282
FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OptionsViewController.m; sourceTree = "<group>"; };
8383
FFFFD87F1A447E67000FC184 /* DemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoViewController.h; sourceTree = "<group>"; };
@@ -158,8 +158,8 @@
158158
6003F59C195388D20070C39A /* AppDelegate.h */,
159159
6003F59D195388D20070C39A /* AppDelegate.m */,
160160
6003F5A8195388D20070C39A /* Images.xcassets */,
161+
CEDE0D8E2419808A00CB3345 /* Launch Screen.storyboard */,
161162
6003F594195388D20070C39A /* Supporting Files */,
162-
FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */,
163163
FFE69A1B1B14AB840073C2EB /* OptionsViewController.h */,
164164
FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */,
165165
FF355D9C1FB5EB4A00244E6D /* WPPHAssetDataSource+Search.h */,
@@ -307,7 +307,7 @@
307307
files = (
308308
6003F5A9195388D20070C39A /* Images.xcassets in Resources */,
309309
6003F598195388D20070C39A /* InfoPlist.strings in Resources */,
310-
FFC3F6F31B0D9BB100EFC359 /* Launch Screen.xib in Resources */,
310+
CEDE0D8F2419808A00CB3345 /* Launch Screen.storyboard in Resources */,
311311
);
312312
runOnlyForDeploymentPostprocessing = 0;
313313
};
@@ -538,7 +538,6 @@
538538
baseConfigurationReference = ABF10F16DB0AA9A8008C72C7 /* Pods-WPMediaPicker.debug.xcconfig */;
539539
buildSettings = {
540540
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
541-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
542541
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
543542
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
544543
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -563,7 +562,6 @@
563562
baseConfigurationReference = 1120051BDDDC8A558883872E /* Pods-WPMediaPicker.release.xcconfig */;
564563
buildSettings = {
565564
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
566-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
567565
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
568566
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
569567
CLANG_WARN_UNREACHABLE_CODE = YES;

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "6003F589195388D20070C39A"
34+
BuildableName = "WPMediaPicker.app"
35+
BlueprintName = "WPMediaPicker"
36+
ReferencedContainer = "container:WPMediaPicker.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "6003F589195388D20070C39A"
46-
BuildableName = "WPMediaPicker.app"
47-
BlueprintName = "WPMediaPicker"
48-
ReferencedContainer = "container:WPMediaPicker.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:WPMediaPicker.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@
131131
"scale" : "2x"
132132
},
133133
{
134-
"idiom" : "ios-marketing",
135134
"size" : "1024x1024",
135+
"idiom" : "ios-marketing",
136+
"filename" : "Icon-App-1024x1024-1.png",
136137
"scale" : "1x"
137138
},
138139
{
@@ -204,16 +205,10 @@
204205
"subtype" : "44mm"
205206
},
206207
{
207-
"idiom" : "watch-marketing",
208208
"size" : "1024x1024",
209+
"idiom" : "watch-marketing",
210+
"filename" : "Icon-App-1024x1024.png",
209211
"scale" : "1x"
210-
},
211-
{
212-
"size" : "44x44",
213-
"idiom" : "watch",
214-
"scale" : "2x",
215-
"role" : "longLook",
216-
"subtype" : "42mm"
217212
}
218213
],
219214
"info" : {

‎Example/WPMediaPicker/Images.xcassets/AppIcon.appiconset/Icon-App-1024x1024-1.png‎

31.7 KB
Loading

‎Example/WPMediaPicker/Images.xcassets/AppIcon.appiconset/Icon-App-1024x1024.png‎

31.7 KB
Loading

‎Example/WPMediaPicker/Images.xcassets/LaunchImage.launchimage/Contents.json‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎Example/WPMediaPicker/Launch Screen.storyboard‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<device id="retina6_1" orientation="portrait" appearance="light"/>
4+
<dependencies>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
7+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
8+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
9+
</dependencies>
10+
<scenes>
11+
<!--View Controller-->
12+
<scene sceneID="EHf-IW-A2E">
13+
<objects>
14+
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
15+
<view key="view" contentMode="scaleToFill" id="Aw0-b4-zFp">
16+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
17+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18+
<subviews>
19+
<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">
20+
<rect key="frame" x="20" y="876" width="374" height="0.0"/>
21+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
22+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
23+
<nil key="highlightedColor"/>
24+
<variation key="widthClass=compact">
25+
<fontDescription key="fontDescription" type="system" pointSize="11"/>
26+
</variation>
27+
</label>
28+
<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">
29+
<rect key="frame" x="19" y="492" width="376" height="43"/>
30+
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
31+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
32+
<nil key="highlightedColor"/>
33+
</label>
34+
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="MsR-lF-HG5">
35+
<rect key="frame" x="169" y="410" width="76" height="76"/>
36+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
37+
</imageView>
38+
</subviews>
39+
<color key="backgroundColor" red="0.2964418828" green="0.65486317869999999" blue="0.84320759769999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
40+
<constraints>
41+
<constraint firstItem="sCd-Qw-gdo" firstAttribute="top" secondItem="MsR-lF-HG5" secondAttribute="bottom" constant="6" id="148-o7-XCq"/>
42+
<constraint firstItem="MsR-lF-HG5" firstAttribute="centerX" secondItem="Aw0-b4-zFp" secondAttribute="centerX" id="9ex-vf-pO5"/>
43+
<constraint firstItem="ZL2-M8-r95" firstAttribute="leading" secondItem="Aw0-b4-zFp" secondAttribute="leading" constant="20" symbolic="YES" id="HrO-8i-HLi"/>
44+
<constraint firstAttribute="centerX" secondItem="ZL2-M8-r95" secondAttribute="centerX" id="LUf-3c-BdJ"/>
45+
<constraint firstItem="sCd-Qw-gdo" firstAttribute="leading" secondItem="Aw0-b4-zFp" secondAttribute="leading" constant="19" id="bv7-Lf-6fG"/>
46+
<constraint firstItem="MsR-lF-HG5" firstAttribute="centerY" secondItem="Aw0-b4-zFp" secondAttribute="centerY" id="fVB-xE-X1E"/>
47+
<constraint firstAttribute="centerX" secondItem="sCd-Qw-gdo" secondAttribute="centerX" id="o4l-Mc-9OO"/>
48+
<constraint firstAttribute="bottom" secondItem="ZL2-M8-r95" secondAttribute="bottom" constant="20" id="vFF-dZ-ZxS"/>
49+
</constraints>
50+
<viewLayoutGuide key="safeArea" id="5P0-d2-3Kj"/>
51+
</view>
52+
</viewController>
53+
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
54+
</objects>
55+
<point key="canvasLocation" x="53" y="375"/>
56+
</scene>
57+
</scenes>
58+
<resources>
59+
<image name="icon" width="76" height="76"/>
60+
</resources>
61+
</document>

0 commit comments

Comments
 (0)