Skip to content

Commit

Permalink
Merge pull request #35 from BottleRocketStudios/release/1.3.2
Browse files Browse the repository at this point in the history
Release/1.3.2
  • Loading branch information
tylermilner committed Sep 19, 2018
2 parents 2564a1a + 188b512 commit 7d472a7
Show file tree
Hide file tree
Showing 9 changed files with 171 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# * http://www.objc.io/issue-6/travis-ci.html
# * https://github.com/supermarin/xcpretty#usage

osx_image: xcode9.4
osx_image: xcode10
language: swift
env:
global:
Expand Down
150 changes: 150 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
## Master

##### Enhancements

* None.

##### Bug Fixes

* None.


## 1.3.2 (2018-09-19)

##### Enhancements

* Updated project for Xcode 10.
[Tyler Milner](https://github.com/tylermilner)
[#35](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/35)

* Updated Travis-CI image to Xcode 9.4.
[Tyler Milner](https://github.com/tylermilner)
[#33](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/33)

##### Bug Fixes

* None.


## 1.3.1 (2018-08-17)

##### Enhancements

* Add out-of-box support for Swift 4.2.
[Tyler Milner](https://github.com/tylermilner)
[#30](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/30)

* Abstract Child into ManagedChild protocol to be adopted by custom child types.
[Cuong Leo Ngo](https://github.com/ngocholo)
[#29](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/29)

* Add some small but useful features to the container.
[Will McGinty](https://github.com/wmcginty)
[#28](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/28)

##### Bug Fixes

* None.


## 1.3.0 (2018-07-18)

##### Enhancements

* Add some API to effectively search through the children of the container (for example, when wanting to move to the 'next' child).
[Will McGinty](https://github.com/wmcginty)
[#25](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/25)

##### Bug Fixes

* None.


## 1.2.3 (2018-06-28)

##### Enhancements

* Double-bump podspec version number.
[Russell Mirabelli](https://github.com/rmirabelli)
[#24](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/24)

##### Bug Fixes

* None.


## 1.2.2 (2018-06-28)

##### Enhancements

* None.

##### Bug Fixes

* Fix namespace collision with "children", renamed from "childviewcontrollers" in Xcode 10.
[Russell Mirabelli](https://github.com/rmirabelli)
[#22](https://github.com/BottleRocketStudios/iOS-UtiliKit/issues/22)
[#23](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/23)


## 1.2.1 (2018-05-08)

##### Enhancements

* Add Configurable protocol (and UIStoryboard extension).
[Will McGinty](https://github.com/wmcginty)
[#18](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/18)

* Update CLA URL.
[Will McGinty](https://github.com/wmcginty)
[#16](https://github.com/BottleRocketStudios/iOS-UtiliKit/issues/16)
[#17](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/17)

##### Bug Fixes

* None.


## 1.2.0 (2018-04-02)

##### Enhancements

* Reorganized project structure.
[Wilson Turner](https://github.com/WSTurner)
[#11](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/11)
[#12](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/12)

* Slight naming tweaks to be more in line with standard library.
[Will McGinty](https://github.com/wmcginty)
[#9](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/9)

##### Bug Fixes

* Fixed some Obj-C interoperability issues.
[Will McGinty](https://github.com/wmcginty)
[#14](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/14)


## 1.1.0 (2018-02-14)

##### Enhancements

* Add codecov and codebeat.
[Amanda Chappell](https://github.com/achappell)
[#3](https://github.com/BottleRocketStudios/iOS-UtiliKit/issues/3)
[#5](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/5)

* Add a ContainerViewController subspec.
[Will McGinty](https://github.com/wmcginty)
[#2](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/2)

##### Bug Fixes

* None.


## 1.0.0 (2017-12-28)

##### Initial Release

This is our initial release of UtiliKit. Enjoy!
2 changes: 1 addition & 1 deletion Examples/UtiliKit-iOSExample/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extension ProgrammaticViewsCollectionController: UICollectionViewDataSource {
// The same scheme used to dequeue the "ProgrammaticCell" is used to dequeue header and footer views.
// You need only provide the desired type and SupplementaryElementKind to receive a typed UICollectionReusableView
switch kind {
case UICollectionElementKindSectionHeader:
case UICollectionView.elementKindSectionHeader:
let header: ProgrammaticHeaderFooterView = collectionView.dequeueReusableSupplementaryView(of: .sectionHeader, for: indexPath)
return header
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ class BaseContainerViewController: UIViewController {
containerViewController.managedChildren = [Child(identifier: "A", viewController: controllerA),
Child(identifier: "B", viewController: controllerB)]

containerViewController.willMove(toParentViewController: self)
addChildViewController(containerViewController)
containerViewController.willMove(toParent: self)
addChild(containerViewController)
containerView.addSubview(containerViewController.view)
containerViewController.view.frame = containerView.bounds
containerViewController.didMove(toParentViewController: self)
containerViewController.didMove(toParent: self)
}

@IBAction func transitionToA() {
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ A solution for managing multiple child view controllers, the ContainerViewContro
``` swift
containerViewController.managedChildren = [Child(identifier: "A", viewController: controllerA), Child(identifier: "B", viewController: controllerB)]

containerViewController.willMove(toParentViewController: self)
containerViewController.willMove(toParent: self)

addChildViewController(containerViewController)
addChild(containerViewController)
containerView.addSubview(containerViewController.view)
containerViewController.view.frame = containerView.bounds

containerViewController.didMove(toParentViewController: self)
containerViewController.didMove(toParent: self)
```

At this point, transitioning between the children of the container is incredibly simple.
Expand Down
2 changes: 1 addition & 1 deletion UtiliKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'UtiliKit'
s.version = '1.3.1'
s.version = '1.3.2'
s.summary = 'All the things you are tired of writing.'

# This description is used to generate tags and improve search results.
Expand Down
18 changes: 10 additions & 8 deletions UtiliKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,12 @@
TargetAttributes = {
8677313820601BB400C54343 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
8677314020601BB400C54343 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
8698CFCF2061A19D0065AE20 = {
Expand Down Expand Up @@ -680,7 +682,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
VERSION = 1.3.1;
VERSION = 1.3.2;
};
name = Debug;
};
Expand Down Expand Up @@ -729,7 +731,7 @@
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
VALIDATE_PRODUCT = YES;
VERSION = 1.3.1;
VERSION = 1.3.2;
};
name = Release;
};
Expand Down Expand Up @@ -759,7 +761,7 @@
PRODUCT_NAME = UtiliKit;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -790,7 +792,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "bottlerocketstudios.UtiliKit-iOS";
PRODUCT_NAME = UtiliKit;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -816,7 +818,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "bottlerocketstudios.UtiliKit-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -838,7 +840,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "bottlerocketstudios.UtiliKit-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -863,7 +865,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "bottlerocketstudios.UtiliKit-iOSExample";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -886,7 +888,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "bottlerocketstudios.UtiliKit-iOSExample";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down

0 comments on commit 7d472a7

Please sign in to comment.