Skip to content

Commit cc9d650

Browse files
authored
Merge pull request #48 from asam139/feature/swift4
Feature/swift4
2 parents 2f79424 + fca8082 commit cc9d650

File tree

3 files changed

+44
-29
lines changed

3 files changed

+44
-29
lines changed

Demo/Demo.xcodeproj/project.pbxproj

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,13 @@
208208
TargetAttributes = {
209209
659891461B032E3B00BF6CD9 = {
210210
CreatedOnToolsVersion = 6.3.1;
211-
DevelopmentTeam = H72GR44F4M;
212-
LastSwiftMigration = 0800;
213-
ProvisioningStyle = Manual;
211+
LastSwiftMigration = 1000;
212+
ProvisioningStyle = Automatic;
214213
};
215214
6598915B1B032E3B00BF6CD9 = {
216215
CreatedOnToolsVersion = 6.3.1;
217-
LastSwiftMigration = 0940;
216+
LastSwiftMigration = 1000;
217+
ProvisioningStyle = Automatic;
218218
TestTargetID = 659891461B032E3B00BF6CD9;
219219
};
220220
};
@@ -475,14 +475,16 @@
475475
buildSettings = {
476476
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
477477
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
478-
DEVELOPMENT_TEAM = H72GR44F4M;
478+
CODE_SIGN_IDENTITY = "iPhone Developer";
479+
CODE_SIGN_STYLE = Automatic;
480+
DEVELOPMENT_TEAM = "";
479481
INFOPLIST_FILE = Demo/Info.plist;
480482
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
481483
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
482484
PRODUCT_NAME = "$(TARGET_NAME)";
483-
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
484-
PROVISIONING_PROFILE_SPECIFIER = Development;
485-
SWIFT_VERSION = 4.0;
485+
PROVISIONING_PROFILE = "";
486+
PROVISIONING_PROFILE_SPECIFIER = "";
487+
SWIFT_VERSION = 4.2;
486488
};
487489
name = Debug;
488490
};
@@ -492,14 +494,16 @@
492494
buildSettings = {
493495
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
494496
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
495-
DEVELOPMENT_TEAM = H72GR44F4M;
497+
CODE_SIGN_IDENTITY = "iPhone Developer";
498+
CODE_SIGN_STYLE = Automatic;
499+
DEVELOPMENT_TEAM = "";
496500
INFOPLIST_FILE = Demo/Info.plist;
497501
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
498502
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
499503
PRODUCT_NAME = "$(TARGET_NAME)";
500-
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
501-
PROVISIONING_PROFILE_SPECIFIER = Development;
502-
SWIFT_VERSION = 4.0;
504+
PROVISIONING_PROFILE = "";
505+
PROVISIONING_PROFILE_SPECIFIER = "";
506+
SWIFT_VERSION = 4.2;
503507
};
504508
name = Release;
505509
};
@@ -508,6 +512,9 @@
508512
baseConfigurationReference = 83D20289FFB4800E6E55A49E /* Pods-DemoTests.debug.xcconfig */;
509513
buildSettings = {
510514
BUNDLE_LOADER = "$(TEST_HOST)";
515+
CODE_SIGN_IDENTITY = "iPhone Developer";
516+
CODE_SIGN_STYLE = Automatic;
517+
DEVELOPMENT_TEAM = "";
511518
FRAMEWORK_SEARCH_PATHS = (
512519
"$(SDKROOT)/Developer/Library/Frameworks",
513520
"$(inherited)",
@@ -520,8 +527,8 @@
520527
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
521528
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
522529
PRODUCT_NAME = "$(TARGET_NAME)";
523-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
524-
SWIFT_VERSION = 4.0;
530+
PROVISIONING_PROFILE_SPECIFIER = "";
531+
SWIFT_VERSION = 4.2;
525532
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
526533
};
527534
name = Debug;
@@ -531,6 +538,9 @@
531538
baseConfigurationReference = C61579D3F63699F33DBFC1D8 /* Pods-DemoTests.release.xcconfig */;
532539
buildSettings = {
533540
BUNDLE_LOADER = "$(TEST_HOST)";
541+
CODE_SIGN_IDENTITY = "iPhone Developer";
542+
CODE_SIGN_STYLE = Automatic;
543+
DEVELOPMENT_TEAM = "";
534544
FRAMEWORK_SEARCH_PATHS = (
535545
"$(SDKROOT)/Developer/Library/Frameworks",
536546
"$(inherited)",
@@ -539,8 +549,8 @@
539549
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
540550
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
541551
PRODUCT_NAME = "$(TARGET_NAME)";
542-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
543-
SWIFT_VERSION = 4.0;
552+
PROVISIONING_PROFILE_SPECIFIER = "";
553+
SWIFT_VERSION = 4.2;
544554
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
545555
};
546556
name = Release;

Demo/Pods/Pods.xcodeproj/project.pbxproj

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

Source/BubbleTransition.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ open class BubbleTransition: NSObject {
4242
The point that originates the bubble. The bubble starts from this point
4343
and shrinks to it on dismiss
4444
*/
45-
open var startingPoint = CGPoint.zero {
45+
@objc open var startingPoint = CGPoint.zero {
4646
didSet {
4747
bubble.center = startingPoint
4848
}
@@ -52,18 +52,18 @@ open class BubbleTransition: NSObject {
5252
The transition duration. The same value is used in both the Present or Dismiss actions
5353
Defaults to `0.5`
5454
*/
55-
open var duration = 0.5
55+
@objc open var duration = 0.5
5656

5757
/**
5858
The transition direction. Possible values `.present`, `.dismiss` or `.pop`
5959
Defaults to `.Present`
6060
*/
61-
open var transitionMode: BubbleTransitionMode = .present
61+
@objc open var transitionMode: BubbleTransitionMode = .present
6262

6363
/**
6464
The color of the bubble. Make sure that it matches the destination controller's background color.
6565
*/
66-
open var bubbleColor: UIColor = .white
66+
@objc open var bubbleColor: UIColor = .white
6767

6868
open fileprivate(set) var bubble = UIView()
6969

0 commit comments

Comments
 (0)