Skip to content

Commit

Permalink
Merge pull request #54 from shaps80/release/5.1.0
Browse files Browse the repository at this point in the history 
Release/5.1.0
  • Loading branch information
@shaps80
shaps80 committed Apr 3, 2018
2 parents b2c8c87 + cd1d069 commit dffde65
Show file tree
Hide file tree
Showing 68 changed files with 1,426 additions and 1,304 deletions.
22 changes: 21 additions & 1 deletion CHANGELOG.md
View file
@@ -1,5 +1,25 @@
# Changelog

5.1.0

Note: This will be the last release targetting Swift 4.0

**[Added]**

Peek now supports a Light theme
Peek now recommends alternate values for enum types
Peek now provides a Static Library variant via Cocoapods: `pod 'PeekStatic'`
Peek now supports Carthage

**[Removed]**

Classes and functions that should never have been public have been removed

**[Fixed]**

Fixing branch name in CONTRIBUTING.md and pull_request_template.md
Lots of small refactors and optimizations thanks to @valeriyvan

5.0 (Major Release)
-

Expand Down Expand Up @@ -48,4 +68,4 @@ Please use the Swift 4 version instead.
* Absolute layout overlay
* Multiple inspectors
* Swift Support
* iOS 8.3 Support
* iOS 8.3 Support
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Expand Up @@ -8,7 +8,7 @@

## Pull Requests

Pull requests must always use the upcoming release branch as its base. This is currently `feature/5.1.0`. No requests made to `master` will be allowed.
Pull requests must always use the upcoming release branch as its base. This is currently `release/5.1.0`. No requests made to `master` will be allowed.

All changes, no matter how trivial, must be done via pull request. Commits should never be made directly on the master branch.

Expand All @@ -34,4 +34,4 @@ The project has already been configured to use SwiftLint, so ensure you have thi

## README

Where applicable, you should ensure the README is also maintained. A typical example is where a new feature is introduced that warrants some explanation, or perhaps an update to the changelog.
Where applicable, you should ensure the README is also maintained. A typical example is where a new feature is introduced that warrants some explanation, or perhaps an update to the changelog.
2 changes: 1 addition & 1 deletion ...le/NotTwitter/TimlineViewController.swift → ...e/NotTwitter/TimelineViewController.swift
View file
@@ -1,5 +1,5 @@
//
// ViewController.swift
// TimelineViewController.swift
// NotTwitter
//
// Created by Shaps Benkau on 10/03/2018.
Expand Down
26 changes: 18 additions & 8 deletions Example/Peek.xcodeproj/project.pbxproj
View file
Expand Up @@ -8,7 +8,7 @@

/* Begin PBXBuildFile section */
540B99E22053FCAF0086FF61 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540B99E12053FCAF0086FF61 /* AppDelegate.swift */; };
540B99E42053FCAF0086FF61 /* TimlineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540B99E32053FCAF0086FF61 /* TimlineViewController.swift */; };
540B99E42053FCAF0086FF61 /* TimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540B99E32053FCAF0086FF61 /* TimelineViewController.swift */; };
540B99E72053FCAF0086FF61 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 540B99E52053FCAF0086FF61 /* Main.storyboard */; };
540B99E92053FCAF0086FF61 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 540B99E82053FCAF0086FF61 /* Assets.xcassets */; };
540B99EC2053FCAF0086FF61 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 540B99EA2053FCAF0086FF61 /* LaunchScreen.storyboard */; };
Expand All @@ -24,14 +24,19 @@
25235662A734B5CC098E5A5F /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
540B99DF2053FCAF0086FF61 /* NotTwitter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NotTwitter.app; sourceTree = BUILT_PRODUCTS_DIR; };
540B99E12053FCAF0086FF61 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
540B99E32053FCAF0086FF61 /* TimlineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimlineViewController.swift; sourceTree = "<group>"; };
540B99E32053FCAF0086FF61 /* TimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineViewController.swift; sourceTree = "<group>"; };
540B99E62053FCAF0086FF61 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
540B99E82053FCAF0086FF61 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
540B99EB2053FCAF0086FF61 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
540B99ED2053FCAF0086FF61 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
542668D92054064500F6B016 /* TextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextView.swift; sourceTree = "<group>"; };
54533DEB1C66D1DB00527626 /* PhotosUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhotosUI.framework; path = System/Library/Frameworks/PhotosUI.framework; sourceTree = SDKROOT; };
54533DED1C66D1DB00527626 /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = System/Library/Frameworks/Photos.framework; sourceTree = SDKROOT; };
5472753920695D9100F1A975 /* PeekStatic.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = PeekStatic.podspec; path = ../PeekStatic.podspec; sourceTree = "<group>"; };
5472753A20695E7300F1A975 /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CONTRIBUTING.md; path = ../CONTRIBUTING.md; sourceTree = "<group>"; };
5472753B20695E7300F1A975 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
5472753C20695E7300F1A975 /* CODE_OF_CONDUCT.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CODE_OF_CONDUCT.md; path = ../CODE_OF_CONDUCT.md; sourceTree = "<group>"; };
5472753D20695E7B00F1A975 /* pull_request_template.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = pull_request_template.md; path = ../pull_request_template.md; sourceTree = "<group>"; };
54A1D79A206859920088079D /* Peek.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Peek.framework; sourceTree = BUILT_PRODUCTS_DIR; };
54E8B9A32054085000CEEFA3 /* Theming.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theming.swift; sourceTree = "<group>"; };
54E8B9A520540A0C00CEEFA3 /* Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -60,7 +65,7 @@
children = (
54E8B9A32054085000CEEFA3 /* Theming.swift */,
540B99E12053FCAF0086FF61 /* AppDelegate.swift */,
540B99E32053FCAF0086FF61 /* TimlineViewController.swift */,
540B99E32053FCAF0086FF61 /* TimelineViewController.swift */,
542668D92054064500F6B016 /* TextView.swift */,
54E8B9A520540A0C00CEEFA3 /* Cell.swift */,
540B99E52053FCAF0086FF61 /* Main.storyboard */,
Expand All @@ -75,7 +80,7 @@
isa = PBXGroup;
children = (
540B99E02053FCAF0086FF61 /* NotTwitter */,
607FACF51AFB993E008FA782 /* Podspec Metadata */,
607FACF51AFB993E008FA782 /* Metadata */,
607FACD11AFB9204008FA782 /* Products */,
E2E8F8A85E45DCC5960CA27A /* Frameworks */,
D4D18AA6335E7D0726702C3B /* Pods */,
Expand All @@ -92,14 +97,19 @@
name = Products;
sourceTree = "<group>";
};
607FACF51AFB993E008FA782 /* Podspec Metadata */ = {
607FACF51AFB993E008FA782 /* Metadata */ = {
isa = PBXGroup;
children = (
2294D63777F3A53CCD6C4977 /* Peek.podspec */,
25235662A734B5CC098E5A5F /* README.md */,
5472753920695D9100F1A975 /* PeekStatic.podspec */,
97CF41E9D825DEAA39984224 /* LICENSE */,
25235662A734B5CC098E5A5F /* README.md */,
5472753B20695E7300F1A975 /* CHANGELOG.md */,
5472753C20695E7300F1A975 /* CODE_OF_CONDUCT.md */,
5472753A20695E7300F1A975 /* CONTRIBUTING.md */,
5472753D20695E7B00F1A975 /* pull_request_template.md */,
);
name = "Podspec Metadata";
name = Metadata;
sourceTree = "<group>";
};
D4D18AA6335E7D0726702C3B /* Pods */ = {
Expand Down Expand Up @@ -254,7 +264,7 @@
buildActionMask = 2147483647;
files = (
542668DA2054064500F6B016 /* TextView.swift in Sources */,
540B99E42053FCAF0086FF61 /* TimlineViewController.swift in Sources */,
540B99E42053FCAF0086FF61 /* TimelineViewController.swift in Sources */,
54E8B9A42054085000CEEFA3 /* Theming.swift in Sources */,
540B99E22053FCAF0086FF61 /* AppDelegate.swift in Sources */,
54E8B9A620540A0C00CEEFA3 /* Cell.swift in Sources */,
Expand Down

0 comments on commit dffde65

Please sign in to comment.