Skip to content

Commit 05e7125

Browse files
andreamazzandreamazz
committed
Bump to version 3.0.0
1 parent 343ee92 commit 05e7125

28 files changed

+804
-595
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

‎BubbleTransition.podspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'BubbleTransition'
3-
s.version = '2.0.2'
3+
s.version = '3.0.0'
44
s.license = 'MIT'
55
s.summary = 'A custom modal transition that presents and dismiss a controller with a bubble effect'
66
s.description = <<-DESC
@@ -13,6 +13,7 @@ Pod::Spec.new do |s|
1313
s.source = { :git => 'https://github.com/andreamazz/BubbleTransition.git', :tag => s.version }
1414

1515
s.ios.deployment_target = '8.0'
16+
s.swift_version = '4.0'
1617

1718
s.source_files = 'Source/*.swift'
1819

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
All notable changes to this project will be documented in this file.
33
`BubbleTransition` adheres to [Semantic Versioning](http://semver.org/).
44

5+
- `3.0.x` Releases - [3.0.0](#300)
56
- `2.0.x` Releases - [2.0.0](#200) | [2.0.1](#201) | [2.0.2](#202)
67
- `1.0.x` Releases - [1.0.0](#100) | [1.0.1](#101) | [1.0.2](#102) | [1.0.3](#103)
78
- `0.2.x` Releases - [0.2](#02)
89

910
---
1011

12+
## [3.0.0](https://github.com/andreamazz/BubbleTransition/releases/tag/3.0.0)
13+
14+
- Swift version 4
15+
1116
## [2.0.2](https://github.com/andreamazz/BubbleTransition/releases/tag/2.0.2)
1217

1318
- Merged #36

‎Demo/Demo.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
659891441B032E3B00BF6CD9 /* Frameworks */,
168168
659891451B032E3B00BF6CD9 /* Resources */,
169169
079A5B5CEE74AECAE0CEE9B9 /* [CP] Embed Pods Frameworks */,
170-
20A4B72369E93833BBF9485A /* [CP] Copy Pods Resources */,
171170
);
172171
buildRules = (
173172
);
@@ -186,8 +185,6 @@
186185
659891581B032E3B00BF6CD9 /* Sources */,
187186
659891591B032E3B00BF6CD9 /* Frameworks */,
188187
6598915A1B032E3B00BF6CD9 /* Resources */,
189-
9BAA9D8C813EB1D31863D6A9 /* [CP] Embed Pods Frameworks */,
190-
D8CCB61E2F8773FA6EA780FC /* [CP] Copy Pods Resources */,
191188
);
192189
buildRules = (
193190
);
@@ -268,58 +265,34 @@
268265
files = (
269266
);
270267
inputPaths = (
268+
"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh",
269+
"${BUILT_PRODUCTS_DIR}/BubbleTransition/BubbleTransition.framework",
271270
);
272271
name = "[CP] Embed Pods Frameworks";
273272
outputPaths = (
273+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BubbleTransition.framework",
274274
);
275275
runOnlyForDeploymentPostprocessing = 0;
276276
shellPath = /bin/sh;
277277
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
278278
showEnvVarsInLog = 0;
279279
};
280-
20A4B72369E93833BBF9485A /* [CP] Copy Pods Resources */ = {
281-
isa = PBXShellScriptBuildPhase;
282-
buildActionMask = 2147483647;
283-
files = (
284-
);
285-
inputPaths = (
286-
);
287-
name = "[CP] Copy Pods Resources";
288-
outputPaths = (
289-
);
290-
runOnlyForDeploymentPostprocessing = 0;
291-
shellPath = /bin/sh;
292-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n";
293-
showEnvVarsInLog = 0;
294-
};
295280
75D0565A8F3388D487941891 /* [CP] Check Pods Manifest.lock */ = {
296281
isa = PBXShellScriptBuildPhase;
297282
buildActionMask = 2147483647;
298283
files = (
299284
);
300285
inputPaths = (
286+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
287+
"${PODS_ROOT}/Manifest.lock",
301288
);
302289
name = "[CP] Check Pods Manifest.lock";
303290
outputPaths = (
291+
"$(DERIVED_FILE_DIR)/Pods-Demo-checkManifestLockResult.txt",
304292
);
305293
runOnlyForDeploymentPostprocessing = 0;
306294
shellPath = /bin/sh;
307-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
308-
showEnvVarsInLog = 0;
309-
};
310-
9BAA9D8C813EB1D31863D6A9 /* [CP] Embed Pods Frameworks */ = {
311-
isa = PBXShellScriptBuildPhase;
312-
buildActionMask = 2147483647;
313-
files = (
314-
);
315-
inputPaths = (
316-
);
317-
name = "[CP] Embed Pods Frameworks";
318-
outputPaths = (
319-
);
320-
runOnlyForDeploymentPostprocessing = 0;
321-
shellPath = /bin/sh;
322-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n";
295+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
323296
showEnvVarsInLog = 0;
324297
};
325298
A722F743BEDCF10D812B911A /* [CP] Check Pods Manifest.lock */ = {
@@ -328,28 +301,16 @@
328301
files = (
329302
);
330303
inputPaths = (
304+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
305+
"${PODS_ROOT}/Manifest.lock",
331306
);
332307
name = "[CP] Check Pods Manifest.lock";
333308
outputPaths = (
309+
"$(DERIVED_FILE_DIR)/Pods-DemoTests-checkManifestLockResult.txt",
334310
);
335311
runOnlyForDeploymentPostprocessing = 0;
336312
shellPath = /bin/sh;
337-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
338-
showEnvVarsInLog = 0;
339-
};
340-
D8CCB61E2F8773FA6EA780FC /* [CP] Copy Pods Resources */ = {
341-
isa = PBXShellScriptBuildPhase;
342-
buildActionMask = 2147483647;
343-
files = (
344-
);
345-
inputPaths = (
346-
);
347-
name = "[CP] Copy Pods Resources";
348-
outputPaths = (
349-
);
350-
runOnlyForDeploymentPostprocessing = 0;
351-
shellPath = /bin/sh;
352-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-resources.sh\"\n";
313+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
353314
showEnvVarsInLog = 0;
354315
};
355316
/* End PBXShellScriptBuildPhase section */
@@ -447,6 +408,7 @@
447408
ONLY_ACTIVE_ARCH = YES;
448409
SDKROOT = iphoneos;
449410
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
411+
SWIFT_VERSION = 4.0;
450412
};
451413
name = Debug;
452414
};
@@ -486,6 +448,7 @@
486448
MTL_ENABLE_DEBUG_INFO = NO;
487449
SDKROOT = iphoneos;
488450
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
451+
SWIFT_VERSION = 4.0;
489452
VALIDATE_PRODUCT = YES;
490453
};
491454
name = Release;
@@ -503,7 +466,7 @@
503466
PRODUCT_NAME = "$(TARGET_NAME)";
504467
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
505468
PROVISIONING_PROFILE_SPECIFIER = Development;
506-
SWIFT_VERSION = 3.0;
469+
SWIFT_VERSION = 4.0;
507470
};
508471
name = Debug;
509472
};
@@ -520,7 +483,7 @@
520483
PRODUCT_NAME = "$(TARGET_NAME)";
521484
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
522485
PROVISIONING_PROFILE_SPECIFIER = Development;
523-
SWIFT_VERSION = 3.0;
486+
SWIFT_VERSION = 4.0;
524487
};
525488
name = Release;
526489
};

‎Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Demo/Demo/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ import UIKit
1010

1111
@UIApplicationMain
1212
class AppDelegate: UIResponder, UIApplicationDelegate {
13-
var window: UIWindow?
13+
var window: UIWindow?
1414
}
1515

‎Demo/Demo/ModalViewController.swift‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,21 @@
99
import UIKit
1010

1111
class ModalViewController: UIViewController {
12-
13-
@IBOutlet weak var closeButton: UIButton!
14-
15-
override func viewDidLoad() {
16-
closeButton.transform = CGAffineTransform(rotationAngle: CGFloat(M_PI_4))
17-
}
18-
19-
@IBAction func closeAction(_ sender: AnyObject) {
20-
self.dismiss(animated: true, completion: nil)
21-
}
22-
23-
override func viewWillAppear(_ animated: Bool) {
24-
UIApplication.shared.setStatusBarStyle(.lightContent, animated: true)
25-
}
26-
27-
override func viewWillDisappear(_ animated: Bool) {
28-
UIApplication.shared.setStatusBarStyle(.default, animated: true)
29-
}
12+
@IBOutlet weak var closeButton: UIButton!
13+
14+
override func viewDidLoad() {
15+
closeButton.transform = CGAffineTransform(rotationAngle: CGFloat.pi / 4)
16+
}
17+
18+
@IBAction func closeAction(_ sender: AnyObject) {
19+
self.dismiss(animated: true, completion: nil)
20+
}
21+
22+
override func viewWillAppear(_ animated: Bool) {
23+
UIApplication.shared.setStatusBarStyle(.lightContent, animated: true)
24+
}
25+
26+
override func viewWillDisappear(_ animated: Bool) {
27+
UIApplication.shared.setStatusBarStyle(.default, animated: true)
28+
}
3029
}

‎Demo/Demo/ViewController.swift‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,31 @@ import UIKit
1010
import BubbleTransition
1111

1212
class ViewController: UIViewController, UIViewControllerTransitioningDelegate {
13-
14-
@IBOutlet weak var transitionButton: UIButton!
15-
16-
let transition = BubbleTransition()
17-
18-
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
19-
let controller = segue.destination
20-
controller.transitioningDelegate = self
21-
controller.modalPresentationStyle = .custom
22-
}
23-
24-
// MARK: UIViewControllerTransitioningDelegate
25-
26-
func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
27-
transition.transitionMode = .present
28-
transition.startingPoint = transitionButton.center
29-
transition.bubbleColor = transitionButton.backgroundColor!
30-
return transition
31-
}
32-
33-
func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
34-
transition.transitionMode = .dismiss
35-
transition.startingPoint = transitionButton.center
36-
transition.bubbleColor = transitionButton.backgroundColor!
37-
return transition
38-
}
39-
13+
@IBOutlet weak var transitionButton: UIButton!
14+
15+
let transition = BubbleTransition()
16+
17+
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
18+
let controller = segue.destination
19+
controller.transitioningDelegate = self
20+
controller.modalPresentationStyle = .custom
21+
}
22+
23+
// MARK: UIViewControllerTransitioningDelegate
24+
25+
func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
26+
transition.transitionMode = .present
27+
transition.startingPoint = transitionButton.center
28+
transition.bubbleColor = transitionButton.backgroundColor!
29+
return transition
30+
}
31+
32+
func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
33+
transition.transitionMode = .dismiss
34+
transition.startingPoint = transitionButton.center
35+
transition.bubbleColor = transitionButton.backgroundColor!
36+
return transition
37+
}
38+
4039
}
4140

‎Demo/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- BubbleTransition (2.0.0)
2+
- BubbleTransition (3.0.0)
33

44
DEPENDENCIES:
55
- BubbleTransition (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
BubbleTransition: bdb9d71993b8d3513008e2dda6bada1ddad25d4f
12+
BubbleTransition: 61f0b5dfbd13c27d734bbd80b680e7d8c29657ba
1313

1414
PODFILE CHECKSUM: 509266e47632f639195bfac1deb46ad87c1fc5f6
1515

16-
COCOAPODS: 1.1.0.rc.2
16+
COCOAPODS: 1.5.0

‎Demo/Pods/Local Podspecs/BubbleTransition.podspec.json‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)