Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
danlozano committed Oct 12, 2016
2 parents e32c00c + 28448aa commit 410c53a
Show file tree
Hide file tree
Showing 17 changed files with 372 additions and 1,468 deletions.
4 changes: 2 additions & 2 deletions Presentr.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Presentr"
s.version = "1.0.0"
s.version = "1.0.1"
s.summary = "A simple Swift wrapper for typical custom view controller presentations."
s.description = <<-DESC
A micro framework created in Swift. Simplifies creating custom view controller presentations. Specially the typical ones we use which are a popup, an alert, or a any non-full-screen modal. Abstracts having to deal with custom presentation controllers and transitioning delegates
Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.author = { "Daniel Lozano" => "[email protected]" }
s.social_media_url = "http://twitter.com/danlozanov"
s.platform = :ios, "9.0"
s.source = { :git => "https://github.com/icalialabs/Presentr.git", :tag => "1.0.0" }
s.source = { :git => "https://github.com/icalialabs/Presentr.git", :tag => "1.0.1" }
s.source_files = "Presentr/**/*.{swift}"
s.resources = "Presentr/**/*.{xib,ttf}"
end
4 changes: 4 additions & 0 deletions Presentr.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
06B5855F1D2D6FE20045C8DA /* ModalCenterPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B5855E1D2D6FE20045C8DA /* ModalCenterPosition.swift */; };
06BE3E4C1CED58DB0052424E /* SourceSansPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 06BE3E4B1CED58DB0052424E /* SourceSansPro-Regular.ttf */; };
06BE3E4E1CED58EA0052424E /* Montserrat-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 06BE3E4D1CED58EA0052424E /* Montserrat-Regular.ttf */; };
28E70FD41D5E8AD600B0B885 /* KeyboardTranslation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28E70FD31D5E8AD600B0B885 /* KeyboardTranslation.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -57,6 +58,7 @@
06B5855E1D2D6FE20045C8DA /* ModalCenterPosition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ModalCenterPosition.swift; sourceTree = "<group>"; };
06BE3E4B1CED58DB0052424E /* SourceSansPro-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceSansPro-Regular.ttf"; sourceTree = "<group>"; };
06BE3E4D1CED58EA0052424E /* Montserrat-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Montserrat-Regular.ttf"; sourceTree = "<group>"; };
28E70FD31D5E8AD600B0B885 /* KeyboardTranslation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardTranslation.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -111,6 +113,7 @@
children = (
0680CC321CE3EFA900CBAE4F /* Presentr.h */,
0680CC491CE3EFC500CBAE4F /* Presentr.swift */,
28E70FD31D5E8AD600B0B885 /* KeyboardTranslation.swift */,
0680CC4B1CE3EFC500CBAE4F /* PresentrController.swift */,
06B585571D2D6F4B0045C8DA /* PresentationType.swift */,
06B5855A1D2D6F8B0045C8DA /* TransitionType.swift */,
Expand Down Expand Up @@ -277,6 +280,7 @@
06B5855B1D2D6F8B0045C8DA /* TransitionType.swift in Sources */,
06B5855F1D2D6FE20045C8DA /* ModalCenterPosition.swift in Sources */,
06686C9D1CE947E200F88216 /* CoverHorizontalAnimation.swift in Sources */,
28E70FD41D5E8AD600B0B885 /* KeyboardTranslation.swift in Sources */,
0680CC4D1CE3EFC500CBAE4F /* Presentr.swift in Sources */,
0680CC541CE3EFFA00CBAE4F /* AlertViewController.swift in Sources */,
0680CC4F1CE3EFC500CBAE4F /* PresentrController.swift in Sources */,
Expand Down
517 changes: 0 additions & 517 deletions Presentr.xcodeproj/project.pbxproj.orig

This file was deleted.

264 changes: 0 additions & 264 deletions Presentr/AlertViewController.swift.orig

This file was deleted.

2 changes: 1 addition & 1 deletion Presentr/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<string>1.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
35 changes: 0 additions & 35 deletions Presentr/Info.plist.orig

This file was deleted.

0 comments on commit 410c53a

Please sign in to comment.