Skip to content

Commit dbbae66

Browse files
bbriattebbriatte
committed
Merge branch 'release/1.0.1'
2 parents 8c590ac + 2b17af8 commit dbbae66

File tree

10 files changed

+18
-12
lines changed

10 files changed

+18
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22

33
All notable changes to this project will be documented in this file.
44
`side-navigation-swift` adheres to [Semantic Versioning](http://semver.org/).
5+
---
6+
7+
## [1.0.1](https://github.com/Digipolitan/side-navigation-swift/releases/tag/v1.0.1)
8+
9+
move the addChildViewController to call viewWillAppear with the side set

‎DGSideNavigation.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "DGSideNavigation"
3-
s.version = "1.0.0"
3+
s.version = "1.0.1"
44
s.summary = "Side menu navigation written in swift"
55
s.homepage = "https://github.com/Digipolitan/side-navigation-swift"
66
s.authors = "Digipolitan"

‎DGSideNavigation.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@
393393
);
394394
runOnlyForDeploymentPostprocessing = 0;
395395
shellPath = /bin/sh;
396-
shellScript = "diff \"${PODS_ROOT}/../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";
396+
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";
397397
showEnvVarsInLog = 0;
398398
};
399399
25B3B749DF62C8D4C44672BB /* [CP] Copy Pods Resources */ = {
@@ -468,7 +468,7 @@
468468
);
469469
runOnlyForDeploymentPostprocessing = 0;
470470
shellPath = /bin/sh;
471-
shellScript = "diff \"${PODS_ROOT}/../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";
471+
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";
472472
showEnvVarsInLog = 0;
473473
};
474474
6BE62C142BE784A263C3A1FA /* [CP] Check Pods Manifest.lock */ = {
@@ -483,7 +483,7 @@
483483
);
484484
runOnlyForDeploymentPostprocessing = 0;
485485
shellPath = /bin/sh;
486-
shellScript = "diff \"${PODS_ROOT}/../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";
486+
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";
487487
showEnvVarsInLog = 0;
488488
};
489489
A3169DD81DE0654400BABAFD /* Swiftlint */ = {
@@ -526,7 +526,7 @@
526526
);
527527
runOnlyForDeploymentPostprocessing = 0;
528528
shellPath = /bin/sh;
529-
shellScript = "diff \"${PODS_ROOT}/../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";
529+
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";
530530
showEnvVarsInLog = 0;
531531
};
532532
C85ED419C5B5AA8FA5BA8F58 /* [CP] Embed Pods Frameworks */ = {

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PODFILE CHECKSUM: 110b615900cee7b87ed92528a2ce50e8b9ac272d
22

3-
COCOAPODS: 1.2.0
3+
COCOAPODS: 1.2.1

‎Samples/DGSideNavigationSample-iOS/DGSideNavigationSample-iOS.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
);
250250
runOnlyForDeploymentPostprocessing = 0;
251251
shellPath = /bin/sh;
252-
shellScript = "diff \"${PODS_ROOT}/../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";
252+
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";
253253
showEnvVarsInLog = 0;
254254
};
255255
/* End PBXShellScriptBuildPhase section */

‎Samples/DGSideNavigationSample-tvOS/DGSideNavigationSample-tvOS.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
);
245245
runOnlyForDeploymentPostprocessing = 0;
246246
shellPath = /bin/sh;
247-
shellScript = "diff \"${PODS_ROOT}/../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";
247+
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";
248248
showEnvVarsInLog = 0;
249249
};
250250
/* End PBXShellScriptBuildPhase section */

‎Sources/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.0</string>
18+
<string>1.0.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>NSPrincipalClass</key>

‎Sources/SideNavigationController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ open class SideNavigationController: UIViewController {
138138
private func link(viewController: UIViewController, in view: UIView? = nil, at position: Int = -1) {
139139
viewController.view.autoresizingMask = UIViewAutoresizing(rawValue: 0b111111)
140140
let container: UIView = view != nil ? view! : self.view
141+
self.addChildViewController(viewController)
141142
if position < 0 {
142143
container.addSubview(viewController.view)
143144
} else {
144145
container.insertSubview(viewController.view, at: position)
145146
}
146-
self.addChildViewController(viewController)
147147
}
148148

149149
private func unlink(viewController: UIViewController?) {

‎Tests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.0</string>
18+
<string>1.0.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

‎fastlane/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ xcode-select --install
2323
</tr>
2424
<tr>
2525
<td width="33%"><code>brew cask install fastlane</code></td>
26-
<td width="33%"><a href="https://download.fastlane.tools/fastlane.zip">Download the zip file</a>. Then double click on the <code>install</code> script (or run it in a terminal window).</td>
26+
<td width="33%"><a href="https://download.fastlane.tools">Download the zip file</a>. Then double click on the <code>install</code> script (or run it in a terminal window).</td>
2727
<td width="33%"><code>sudo gem install fastlane -NV</code></td>
2828
</tr>
2929
</table>
30+
3031
# Available Actions
3132
### appfile_init
3233
```

0 commit comments

Comments
 (0)