Skip to content

Commit 8f8d721

Browse files
committed
Merge branch 'release/2.0.0'
2 parents dbbae66 + 448c423 commit 8f8d721

File tree

68 files changed

+540
-593
lines changed

Some content is hidden

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

68 files changed

+540
-593
lines changed

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5.0

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode8.2
1+
osx_image: xcode10.2
22
language: objective-c
33
cache:
44
- bundler
@@ -13,8 +13,6 @@ before_install:
1313
- gem install bundler
1414
- brew update
1515
- bundle install && brew bundle
16-
- bundle exec pod repo update --silent
17-
script:
18-
- bundle exec fastlane run_tests
19-
after_success:
20-
- bundle exec fastlane ci_framework_deploy
16+
install: bundle exec pod install --repo-update --silent
17+
script: bundle exec fastlane tests
18+
after_success: bundle exec fastlane ci_framework_deploy

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
# Change Log
22

33
All notable changes to this project will be documented in this file.
4-
`side-navigation-swift` adheres to [Semantic Versioning](http://semver.org/).
4+
`side-navigation-controller` adheres to [Semantic Versioning](http://semver.org/).
55
---
66

7-
## [1.0.1](https://github.com/Digipolitan/side-navigation-swift/releases/tag/v1.0.1)
7+
## [2.0.0](https://github.com/Digipolitan/side-navigation/releases/tag/v2.0.0)
8+
9+
swift 5.0 support & renaming side-navigation-controller
10+
11+
---
12+
13+
## [1.0.1](https://github.com/Digipolitan/side-navigation-controller/releases/tag/v1.0.1)
814

915
move the addChildViewController to call viewWillAppear with the side set

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to side-navigation-swift
1+
# Contributing to side-navigation-controller
22

33
First off, thanks for taking the time to contribute! :tada::+1:
44

DGSideNavigation.podspec

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

DGSideNavigation.xcworkspace/contents.xcworkspacedata

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

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2017, Digipolitan
3+
Copyright (c) 2019, Digipolitan
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

Package.swift

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

Podfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
workspace 'DGSideNavigation.xcworkspace'
1+
workspace 'SideNavigationController.xcworkspace'
22

33
## Frameworks targets
44
abstract_target 'Frameworks' do
55
use_frameworks!
6-
target 'DGSideNavigation-iOS' do
7-
platform :ios, '8.0'
6+
target 'SideNavigationController-iOS' do
7+
platform :ios, '9.0'
88
end
99

10-
target 'DGSideNavigation-tvOS' do
10+
target 'SideNavigationController-tvOS' do
1111
platform :tvos, '9.0'
1212
end
1313
end
1414

1515
## Tests targets
1616
abstract_target 'Tests' do
1717
use_frameworks!
18-
target 'DGSideNavigationTests-iOS' do
18+
target 'SideNavigationControllerTests-iOS' do
1919
platform :ios, '8.0'
2020
end
2121

22-
target 'DGSideNavigationTests-tvOS' do
22+
target 'SideNavigationControllerTests-tvOS' do
2323
platform :tvos, '9.0'
2424
end
2525
end
2626

2727
## Samples targets
2828
abstract_target 'Samples' do
2929
use_frameworks!
30-
target 'DGSideNavigationSample-iOS' do
31-
project 'Samples/DGSideNavigationSample-iOS/DGSideNavigationSample-iOS'
30+
target 'SideNavigationControllerSample-iOS' do
31+
project 'Samples/SideNavigationControllerSample-iOS/SideNavigationControllerSample-iOS'
3232
platform :ios, '8.0'
3333
end
3434

35-
target 'DGSideNavigationSample-tvOS' do
36-
project 'Samples/DGSideNavigationSample-tvOS/DGSideNavigationSample-tvOS'
35+
target 'SideNavigationControllerSample-tvOS' do
36+
project 'Samples/SideNavigationControllerSample-tvOS/SideNavigationControllerSample-tvOS'
3737
platform :tvos, '9.0'
3838
end
3939
end

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
PODFILE CHECKSUM: 110b615900cee7b87ed92528a2ce50e8b9ac272d
1+
PODFILE CHECKSUM: e6fb4f0774793c8c0cb0d53cb6140d46f84d99f5
22

3-
COCOAPODS: 1.2.1
3+
COCOAPODS: 1.6.1

0 commit comments

Comments
 (0)