Skip to content

Commit 9c4f8ce

Browse files
committed
Update minimum deployment target.
1 parent 2486dbe commit 9c4f8ce

File tree

145 files changed

+1974
-7140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+1974
-7140
lines changed

Example/M2DWebViewController.xcodeproj/project.pbxproj

+69-69
Large diffs are not rendered by default.

Example/M2DWebViewController.xcodeproj/xcshareddata/xcschemes/M2DWebViewController.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1150"
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 = "M2DWebViewController.app"
35+
BlueprintName = "M2DWebViewController"
36+
ReferencedContainer = "container:M2DWebViewController.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 = "M2DWebViewController.app"
47-
BlueprintName = "M2DWebViewController"
48-
ReferencedContainer = "container:M2DWebViewController.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:M2DWebViewController.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

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

+42-37
Original file line numberDiff line numberDiff line change
@@ -2,92 +2,97 @@
22
"images" : [
33
{
44
"idiom" : "iphone",
5-
"size" : "20x20",
6-
"scale" : "2x"
5+
"scale" : "2x",
6+
"size" : "20x20"
77
},
88
{
99
"idiom" : "iphone",
10-
"size" : "20x20",
11-
"scale" : "3x"
10+
"scale" : "3x",
11+
"size" : "20x20"
1212
},
1313
{
1414
"idiom" : "iphone",
15-
"size" : "29x29",
16-
"scale" : "2x"
15+
"scale" : "2x",
16+
"size" : "29x29"
1717
},
1818
{
1919
"idiom" : "iphone",
20-
"size" : "29x29",
21-
"scale" : "3x"
20+
"scale" : "3x",
21+
"size" : "29x29"
2222
},
2323
{
2424
"idiom" : "iphone",
25-
"size" : "40x40",
26-
"scale" : "2x"
25+
"scale" : "2x",
26+
"size" : "40x40"
2727
},
2828
{
2929
"idiom" : "iphone",
30-
"size" : "40x40",
31-
"scale" : "3x"
30+
"scale" : "3x",
31+
"size" : "40x40"
3232
},
3333
{
3434
"idiom" : "iphone",
35-
"size" : "60x60",
36-
"scale" : "2x"
35+
"scale" : "2x",
36+
"size" : "60x60"
3737
},
3838
{
3939
"idiom" : "iphone",
40-
"size" : "60x60",
41-
"scale" : "3x"
40+
"scale" : "3x",
41+
"size" : "60x60"
4242
},
4343
{
4444
"idiom" : "ipad",
45-
"size" : "20x20",
46-
"scale" : "1x"
45+
"scale" : "1x",
46+
"size" : "20x20"
4747
},
4848
{
4949
"idiom" : "ipad",
50-
"size" : "20x20",
51-
"scale" : "2x"
50+
"scale" : "2x",
51+
"size" : "20x20"
5252
},
5353
{
5454
"idiom" : "ipad",
55-
"size" : "29x29",
56-
"scale" : "1x"
55+
"scale" : "1x",
56+
"size" : "29x29"
5757
},
5858
{
5959
"idiom" : "ipad",
60-
"size" : "29x29",
61-
"scale" : "2x"
60+
"scale" : "2x",
61+
"size" : "29x29"
6262
},
6363
{
6464
"idiom" : "ipad",
65-
"size" : "40x40",
66-
"scale" : "1x"
65+
"scale" : "1x",
66+
"size" : "40x40"
6767
},
6868
{
6969
"idiom" : "ipad",
70-
"size" : "40x40",
71-
"scale" : "2x"
70+
"scale" : "2x",
71+
"size" : "40x40"
7272
},
7373
{
7474
"idiom" : "ipad",
75-
"size" : "76x76",
76-
"scale" : "1x"
75+
"scale" : "1x",
76+
"size" : "76x76"
7777
},
7878
{
7979
"idiom" : "ipad",
80-
"size" : "76x76",
81-
"scale" : "2x"
80+
"scale" : "2x",
81+
"size" : "76x76"
8282
},
8383
{
8484
"idiom" : "ipad",
85-
"size" : "83.5x83.5",
86-
"scale" : "2x"
85+
"scale" : "2x",
86+
"size" : "83.5x83.5"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"scale" : "1x",
91+
"size" : "1024x1024"
8792
}
8893
],
8994
"info" : {
90-
"version" : 1,
91-
"author" : "xcode"
95+
"author" : "xcode",
96+
"version" : 1
9297
}
93-
}
98+
}

Example/M2DWebViewController/M2DViewController.m

-5
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,4 @@ - (void)m2d_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavi
113113
decisionHandler(WKNavigationActionPolicyAllow);
114114
}
115115

116-
- (void)m2d_webViewDidStartLoad:(UIWebView *)webView
117-
{
118-
NSLog(@"hoge");
119-
}
120-
121116
@end

Example/Podfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

3-
target 'M2DWebViewController', :exclusive => true do
3+
target 'M2DWebViewController' do
44
pod "M2DWebViewController", :path => "../"
5-
end
6-
7-
target 'Tests', :exclusive => true do
8-
pod "M2DWebViewController", :path => "../"
9-
10-
pod 'Kiwi'
11-
end
5+
6+
target 'Tests' do
7+
pod "M2DWebViewController", :path => "../"
8+
9+
pod 'Kiwi'
10+
end
11+
end

Example/Podfile.lock

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
PODS:
22
- Kiwi (2.3.1)
3-
- M2DWebViewController (0.1.5)
3+
- M2DWebViewController (2.0.0)
44

55
DEPENDENCIES:
66
- Kiwi
77
- M2DWebViewController (from `../`)
88

9+
SPEC REPOS:
10+
https://github.com/CocoaPods/Specs.git:
11+
- Kiwi
12+
913
EXTERNAL SOURCES:
1014
M2DWebViewController:
11-
:path: ../
15+
:path: "../"
1216

1317
SPEC CHECKSUMS:
14-
Kiwi: 73e1400209055ee9c8ba78c6012b6b642d0fb9f7
15-
M2DWebViewController: b6b3d7acfbf758fd94288cf8c37cfe68196afb21
18+
Kiwi: f038a6c61f7a9e4d7766bff5717aa3b3fdb75f55
19+
M2DWebViewController: 86769c678269beb89f3da889638497ed37436fbc
20+
21+
PODFILE CHECKSUM: 9904dd9a6cc16ef0e04b67ff74c5ec447aa1deee
1622

17-
COCOAPODS: 0.35.0
23+
COCOAPODS: 1.9.3

Example/Pods/Headers/Private/Kiwi/KWAfterAllNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWAfterEachNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWAny.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWAsyncVerifier.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeBetweenMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeEmptyMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeIdenticalToMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeKindOfClassMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeMemberOfClassMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeSubclassOfClassMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeTrueMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeWithinMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeZeroMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeforeAllNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBeforeEachNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBlock.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBlockNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWBlockRaiseMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWCallSite.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWCaptureSpy.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWChangeMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWConformToProtocolMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWContainMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWContainStringMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWContextNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWCountType.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWDeviceInfo.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWEqualMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExample.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExampleDelegate.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExampleNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExampleNodeVisitor.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExampleSuite.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExampleSuiteBuilder.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExistVerifier.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWExpectationType.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWFailure.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWFormatter.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWFutureObject.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWGenericMatchEvaluator.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWGenericMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWGenericMatchingAdditions.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWHaveMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWHaveValueMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWInequalityMatcher.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWIntercept.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWInvocationCapturer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWItNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWLet.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWLetNode.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Headers/Private/Kiwi/KWMatchVerifier.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)