Skip to content

Commit

Permalink
Merge branch 'release/2.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
msaps committed Jan 6, 2018
2 parents 643e121 + 759d4e0 commit 0dfe16d
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 36 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
`Pageboy` adheres to [Semantic Versioning](http://semver.org/).

#### 2.x Releases
- `2.3.x` Releases - [2.3.0](#230)
- `2.3.x` Releases - [2.3.0](#230) | [2.3.1](#231)
- `2.2.x` Releases - [2.2.0](#220)
- `2.1.x` Releases - [2.1.0](#210)
- `2.0.x` Releases - [2.0.0](#200) | [2.0.1](#201) | [2.0.2](#202) | [2.0.3](#203) | [2.0.4](#204)
Expand All @@ -20,6 +20,13 @@ All notable changes to this project will be documented in this file.

---

## [2.3.1](https://github.com/uias/Pageboy/releases/tag/2.3.1)
Released on 2018-01-06

#### Fixed
-[#133](https://github.com/uias/Pageboy/pull/133) Potential memory issues with UIApplication extension.
- by [msaps](https://github.com/msaps).

## [2.3.0](https://github.com/uias/Pageboy/releases/tag/2.3.0)
Released on 2018-01-05

Expand Down
2 changes: 1 addition & 1 deletion Pageboy.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Pod::Spec.new do |s|

s.requires_arc = true

s.version = "2.3.0"
s.version = "2.3.1"
s.summary = "A simple, highly informative page view controller."
s.description = <<-DESC
A page view controller that provides simplified data source management, enhanced delegation and other useful features.
Expand Down
64 changes: 32 additions & 32 deletions Sources/Pageboy.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
462A65DD2000FCAA0051C79C /* UIView+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65D92000FCAA0051C79C /* UIView+Localization.swift */; };
462A65DE2000FCAA0051C79C /* UIView+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65D92000FCAA0051C79C /* UIView+Localization.swift */; };
462A65DF2000FCAA0051C79C /* UIView+AutoLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65DA2000FCAA0051C79C /* UIView+AutoLayout.swift */; };
462A65E02000FCAA0051C79C /* UIView+AutoLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65DA2000FCAA0051C79C /* UIView+AutoLayout.swift */; };
462A65E12000FCAA0051C79C /* UIApplication+SafeShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65DB2000FCAA0051C79C /* UIApplication+SafeShared.swift */; };
462A65E22000FCAA0051C79C /* UIApplication+SafeShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65DB2000FCAA0051C79C /* UIApplication+SafeShared.swift */; };
462A65E32000FCAA0051C79C /* UIPageViewController+ScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65DC2000FCAA0051C79C /* UIPageViewController+ScrollView.swift */; };
462A65E42000FCAA0051C79C /* UIPageViewController+ScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462A65DC2000FCAA0051C79C /* UIPageViewController+ScrollView.swift */; };
4653DD551FC8333E00C4B758 /* PageboyViewControllerDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4653DD541FC8333E00C4B758 /* PageboyViewControllerDataSource.swift */; };
4653DD561FC8333E00C4B758 /* PageboyViewControllerDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4653DD541FC8333E00C4B758 /* PageboyViewControllerDataSource.swift */; };
4653DD581FC8335F00C4B758 /* PageboyViewControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4653DD571FC8335F00C4B758 /* PageboyViewControllerDelegate.swift */; };
Expand All @@ -20,13 +28,8 @@
466A76BC1FB38B32000B5C1C /* PageboyAutoScroller.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6CC557A1ECCC55300A7FBB4 /* PageboyAutoScroller.swift */; };
466A76BD1FB38B32000B5C1C /* TransitionOperation+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FD71F1E58EE0019AB74 /* TransitionOperation+Action.swift */; };
466A76BE1FB38B32000B5C1C /* TransitionOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FD81F1E58EE0019AB74 /* TransitionOperation.swift */; };
466A76BF1FB38B32000B5C1C /* UIView+AutoLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FDA1F1E58EE0019AB74 /* UIView+AutoLayout.swift */; };
466A76C01FB38B32000B5C1C /* UIView+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FDB1F1E58EE0019AB74 /* UIView+Localization.swift */; };
466A76C11FB38B32000B5C1C /* UIPageViewController+ScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FE01F1E58FE0019AB74 /* UIPageViewController+ScrollView.swift */; };
466A76C21FB38B32000B5C1C /* IndexedMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FE31F1E59160019AB74 /* IndexedMap.swift */; };
466A76C31FB38B32000B5C1C /* WeakWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FE41F1E59160019AB74 /* WeakWrapper.swift */; };
4684CF711FFFCA4B001FECAA /* UIApplication+SafeShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4684CF701FFFCA4B001FECAA /* UIApplication+SafeShared.swift */; };
4684CF721FFFCA4B001FECAA /* UIApplication+SafeShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4684CF701FFFCA4B001FECAA /* UIApplication+SafeShared.swift */; };
D623B1C11E1D0C6B00527F3D /* Pageboy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D623B1B71E1D0C6A00527F3D /* Pageboy.framework */; };
D623B1C61E1D0C6B00527F3D /* PageboyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623B1C51E1D0C6B00527F3D /* PageboyTests.swift */; };
D623B1C81E1D0C6B00527F3D /* Pageboy.h in Headers */ = {isa = PBXBuildFile; fileRef = D623B1BA1E1D0C6A00527F3D /* Pageboy.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -35,9 +38,6 @@
D63A21541F2758D700FEA92D /* Pageboy.h in Headers */ = {isa = PBXBuildFile; fileRef = D63A21521F2758D700FEA92D /* Pageboy.h */; settings = {ATTRIBUTES = (Public, ); }; };
D67E6FDC1F1E58EE0019AB74 /* TransitionOperation+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FD71F1E58EE0019AB74 /* TransitionOperation+Action.swift */; };
D67E6FDD1F1E58EE0019AB74 /* TransitionOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FD81F1E58EE0019AB74 /* TransitionOperation.swift */; };
D67E6FDE1F1E58EE0019AB74 /* UIView+AutoLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FDA1F1E58EE0019AB74 /* UIView+AutoLayout.swift */; };
D67E6FDF1F1E58EE0019AB74 /* UIView+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FDB1F1E58EE0019AB74 /* UIView+Localization.swift */; };
D67E6FE11F1E58FE0019AB74 /* UIPageViewController+ScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FE01F1E58FE0019AB74 /* UIPageViewController+ScrollView.swift */; };
D67E6FE51F1E59160019AB74 /* IndexedMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FE31F1E59160019AB74 /* IndexedMap.swift */; };
D67E6FE61F1E59160019AB74 /* WeakWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E6FE41F1E59160019AB74 /* WeakWrapper.swift */; };
D681E33F1E5477D3007C08F5 /* TestPageboyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D681E33E1E5477D3007C08F5 /* TestPageboyViewController.swift */; };
Expand Down Expand Up @@ -67,9 +67,12 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
462A65D92000FCAA0051C79C /* UIView+Localization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Localization.swift"; sourceTree = "<group>"; };
462A65DA2000FCAA0051C79C /* UIView+AutoLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+AutoLayout.swift"; sourceTree = "<group>"; };
462A65DB2000FCAA0051C79C /* UIApplication+SafeShared.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIApplication+SafeShared.swift"; sourceTree = "<group>"; };
462A65DC2000FCAA0051C79C /* UIPageViewController+ScrollView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIPageViewController+ScrollView.swift"; sourceTree = "<group>"; };
4653DD541FC8333E00C4B758 /* PageboyViewControllerDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageboyViewControllerDataSource.swift; sourceTree = "<group>"; };
4653DD571FC8335F00C4B758 /* PageboyViewControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageboyViewControllerDelegate.swift; sourceTree = "<group>"; };
4684CF701FFFCA4B001FECAA /* UIApplication+SafeShared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+SafeShared.swift"; sourceTree = "<group>"; };
D623B1B71E1D0C6A00527F3D /* Pageboy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pageboy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D623B1BA1E1D0C6A00527F3D /* Pageboy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Pageboy.h; sourceTree = "<group>"; };
D623B1BB1E1D0C6A00527F3D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -83,9 +86,6 @@
D63A21531F2758D700FEA92D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D67E6FD71F1E58EE0019AB74 /* TransitionOperation+Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TransitionOperation+Action.swift"; sourceTree = "<group>"; };
D67E6FD81F1E58EE0019AB74 /* TransitionOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionOperation.swift; sourceTree = "<group>"; };
D67E6FDA1F1E58EE0019AB74 /* UIView+AutoLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+AutoLayout.swift"; sourceTree = "<group>"; };
D67E6FDB1F1E58EE0019AB74 /* UIView+Localization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Localization.swift"; sourceTree = "<group>"; };
D67E6FE01F1E58FE0019AB74 /* UIPageViewController+ScrollView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIPageViewController+ScrollView.swift"; sourceTree = "<group>"; };
D67E6FE31F1E59160019AB74 /* IndexedMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndexedMap.swift; sourceTree = "<group>"; };
D67E6FE41F1E59160019AB74 /* WeakWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeakWrapper.swift; sourceTree = "<group>"; };
D681E33E1E5477D3007C08F5 /* TestPageboyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestPageboyViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -130,6 +130,17 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
462A65D82000FCAA0051C79C /* Extensions */ = {
isa = PBXGroup;
children = (
462A65D92000FCAA0051C79C /* UIView+Localization.swift */,
462A65DA2000FCAA0051C79C /* UIView+AutoLayout.swift */,
462A65DB2000FCAA0051C79C /* UIApplication+SafeShared.swift */,
462A65DC2000FCAA0051C79C /* UIPageViewController+ScrollView.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
D623B1AD1E1D0C6A00527F3D = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -198,16 +209,6 @@
path = Transitioning;
sourceTree = "<group>";
};
D67E6FD91F1E58EE0019AB74 /* ViewUtilities */ = {
isa = PBXGroup;
children = (
D67E6FDA1F1E58EE0019AB74 /* UIView+AutoLayout.swift */,
D67E6FDB1F1E58EE0019AB74 /* UIView+Localization.swift */,
D67E6FE01F1E58FE0019AB74 /* UIPageViewController+ScrollView.swift */,
);
path = ViewUtilities;
sourceTree = "<group>";
};
D67E6FE21F1E59160019AB74 /* DataStructures */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -259,9 +260,8 @@
D6ECCEC01E51AFDB00E9D5B3 /* Utilities */ = {
isa = PBXGroup;
children = (
4684CF701FFFCA4B001FECAA /* UIApplication+SafeShared.swift */,
462A65D82000FCAA0051C79C /* Extensions */,
D67E6FD61F1E58EE0019AB74 /* Transitioning */,
D67E6FD91F1E58EE0019AB74 /* ViewUtilities */,
D67E6FE21F1E59160019AB74 /* DataStructures */,
);
path = Utilities;
Expand Down Expand Up @@ -441,17 +441,17 @@
D6CC557E1ECCC55F00A7FBB4 /* PageboyViewController+Management.swift in Sources */,
D67E6FDD1F1E58EE0019AB74 /* TransitionOperation.swift in Sources */,
D623B1D21E1D2DF200527F3D /* PageboyViewController.swift in Sources */,
D67E6FDE1F1E58EE0019AB74 /* UIView+AutoLayout.swift in Sources */,
4684CF711FFFCA4B001FECAA /* UIApplication+SafeShared.swift in Sources */,
4653DD581FC8335F00C4B758 /* PageboyViewControllerDelegate.swift in Sources */,
D67E6FDC1F1E58EE0019AB74 /* TransitionOperation+Action.swift in Sources */,
462A65E32000FCAA0051C79C /* UIPageViewController+ScrollView.swift in Sources */,
D67E6FE61F1E59160019AB74 /* WeakWrapper.swift in Sources */,
D67E6FE11F1E58FE0019AB74 /* UIPageViewController+ScrollView.swift in Sources */,
D6CC557F1ECCC55F00A7FBB4 /* PageboyViewController+ScrollDetection.swift in Sources */,
462A65DF2000FCAA0051C79C /* UIView+AutoLayout.swift in Sources */,
D67E6FE51F1E59160019AB74 /* IndexedMap.swift in Sources */,
462A65E12000FCAA0051C79C /* UIApplication+SafeShared.swift in Sources */,
D6F561361EDCAD6D0033C654 /* PageboyViewController+Transitioning.swift in Sources */,
D6CC55811ECCC5BE00A7FBB4 /* PageboyViewController+Extras.swift in Sources */,
D67E6FDF1F1E58EE0019AB74 /* UIView+Localization.swift in Sources */,
462A65DD2000FCAA0051C79C /* UIView+Localization.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -480,19 +480,19 @@
466A76BD1FB38B32000B5C1C /* TransitionOperation+Action.swift in Sources */,
466A76B81FB38B32000B5C1C /* PageboyViewController+ScrollDetection.swift in Sources */,
466A76BB1FB38B32000B5C1C /* UIViewController+PageboyExtras.swift in Sources */,
466A76C01FB38B32000B5C1C /* UIView+Localization.swift in Sources */,
466A76BC1FB38B32000B5C1C /* PageboyAutoScroller.swift in Sources */,
466A76B61FB38B32000B5C1C /* PageboyViewController.swift in Sources */,
4684CF721FFFCA4B001FECAA /* UIApplication+SafeShared.swift in Sources */,
4653DD591FC8335F00C4B758 /* PageboyViewControllerDelegate.swift in Sources */,
466A76BF1FB38B32000B5C1C /* UIView+AutoLayout.swift in Sources */,
466A76C31FB38B32000B5C1C /* WeakWrapper.swift in Sources */,
462A65E42000FCAA0051C79C /* UIPageViewController+ScrollView.swift in Sources */,
466A76BA1FB38B32000B5C1C /* PageboyViewController+Extras.swift in Sources */,
466A76B91FB38B32000B5C1C /* PageboyViewController+Transitioning.swift in Sources */,
462A65E02000FCAA0051C79C /* UIView+AutoLayout.swift in Sources */,
466A76C21FB38B32000B5C1C /* IndexedMap.swift in Sources */,
462A65E22000FCAA0051C79C /* UIApplication+SafeShared.swift in Sources */,
466A76BE1FB38B32000B5C1C /* TransitionOperation.swift in Sources */,
466A76B71FB38B32000B5C1C /* PageboyViewController+Management.swift in Sources */,
466A76C11FB38B32000B5C1C /* UIPageViewController+ScrollView.swift in Sources */,
462A65DE2000FCAA0051C79C /* UIView+Localization.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion Sources/Pageboy/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>2.3.0</string>
<string>2.3.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ internal extension UIApplication {
return nil
}

return unmanagedSharedApplication.takeRetainedValue() as? UIApplication
return unmanagedSharedApplication.takeUnretainedValue() as? UIApplication
}
}

0 comments on commit 0dfe16d

Please sign in to comment.