Skip to content

Commit 8ba2eb2

Browse files
0ber0ber
authored
Merge pull request #22 from hammadzz/swift_4
Swift 4 Support
2 parents 8de3e78 + 8c14dc8 commit 8ba2eb2

File tree

4 files changed

+36
-16
lines changed

4 files changed

+36
-16
lines changed

‎PaperSwitch/RAMPaperSwitch.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ open class RAMPaperSwitch: UISwitch, CAAnimationDelegate {
130130
shape.transform = isOn ? CATransform3DMakeScale(1.0, 1.0, 1.0) : CATransform3DMakeScale(0.0001, 0.0001, 0.0001)
131131
}
132132

133-
internal func switchChanged() {
133+
@objc internal func switchChanged() {
134134
switchChangeWithAnimation(true)
135135
}
136136

‎PaperSwitchDemo/PaperSwitchDemo.xcodeproj/project.pbxproj

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -260,22 +260,22 @@
260260
attributes = {
261261
LastSwiftMigration = 0700;
262262
LastSwiftUpdateCheck = 0700;
263-
LastUpgradeCheck = 0800;
263+
LastUpgradeCheck = 0900;
264264
ORGANIZATIONNAME = Ramotion;
265265
TargetAttributes = {
266266
84BE57D11CFF03ED0073C92B = {
267267
CreatedOnToolsVersion = 7.3.1;
268268
DevelopmentTeam = 34MUF9YXTA;
269-
LastSwiftMigration = 0800;
269+
LastSwiftMigration = 0900;
270270
};
271271
9C6889F91A274993008BFF1E = {
272272
CreatedOnToolsVersion = 6.1;
273-
LastSwiftMigration = 0800;
273+
LastSwiftMigration = 0900;
274274
ProvisioningStyle = Manual;
275275
};
276276
9C688A0E1A274993008BFF1E = {
277277
CreatedOnToolsVersion = 6.1;
278-
LastSwiftMigration = 0800;
278+
LastSwiftMigration = 0900;
279279
TestTargetID = 9C6889F91A274993008BFF1E;
280280
};
281281
};
@@ -374,7 +374,7 @@
374374
isa = XCBuildConfiguration;
375375
buildSettings = {
376376
CLANG_ANALYZER_NONNULL = YES;
377-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
377+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
378378
CURRENT_PROJECT_VERSION = 1;
379379
DEBUG_INFORMATION_FORMAT = dwarf;
380380
DEFINES_MODULE = YES;
@@ -390,7 +390,8 @@
390390
PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.PaperSwitch;
391391
PRODUCT_NAME = "$(TARGET_NAME)";
392392
SKIP_INSTALL = YES;
393-
SWIFT_VERSION = 3.0;
393+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
394+
SWIFT_VERSION = 4.0;
394395
VERSIONING_SYSTEM = "apple-generic";
395396
VERSION_INFO_PREFIX = "";
396397
};
@@ -416,7 +417,8 @@
416417
PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.PaperSwitch;
417418
PRODUCT_NAME = "$(TARGET_NAME)";
418419
SKIP_INSTALL = YES;
419-
SWIFT_VERSION = 3.0;
420+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
421+
SWIFT_VERSION = 4.0;
420422
VERSIONING_SYSTEM = "apple-generic";
421423
VERSION_INFO_PREFIX = "";
422424
};
@@ -430,14 +432,20 @@
430432
CLANG_CXX_LIBRARY = "libc++";
431433
CLANG_ENABLE_MODULES = YES;
432434
CLANG_ENABLE_OBJC_ARC = YES;
435+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
433436
CLANG_WARN_BOOL_CONVERSION = YES;
437+
CLANG_WARN_COMMA = YES;
434438
CLANG_WARN_CONSTANT_CONVERSION = YES;
435439
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
436440
CLANG_WARN_EMPTY_BODY = YES;
437441
CLANG_WARN_ENUM_CONVERSION = YES;
438442
CLANG_WARN_INFINITE_RECURSION = YES;
439443
CLANG_WARN_INT_CONVERSION = YES;
444+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
445+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
440446
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
447+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
448+
CLANG_WARN_STRICT_PROTOTYPES = YES;
441449
CLANG_WARN_SUSPICIOUS_MOVE = YES;
442450
CLANG_WARN_UNREACHABLE_CODE = YES;
443451
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -465,7 +473,7 @@
465473
ONLY_ACTIVE_ARCH = YES;
466474
SDKROOT = iphoneos;
467475
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
468-
SWIFT_VERSION = 3.0;
476+
SWIFT_VERSION = 4.0;
469477
TARGETED_DEVICE_FAMILY = "1,2";
470478
};
471479
name = Debug;
@@ -478,14 +486,20 @@
478486
CLANG_CXX_LIBRARY = "libc++";
479487
CLANG_ENABLE_MODULES = YES;
480488
CLANG_ENABLE_OBJC_ARC = YES;
489+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
481490
CLANG_WARN_BOOL_CONVERSION = YES;
491+
CLANG_WARN_COMMA = YES;
482492
CLANG_WARN_CONSTANT_CONVERSION = YES;
483493
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
484494
CLANG_WARN_EMPTY_BODY = YES;
485495
CLANG_WARN_ENUM_CONVERSION = YES;
486496
CLANG_WARN_INFINITE_RECURSION = YES;
487497
CLANG_WARN_INT_CONVERSION = YES;
498+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
499+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
488500
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
501+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
502+
CLANG_WARN_STRICT_PROTOTYPES = YES;
489503
CLANG_WARN_SUSPICIOUS_MOVE = YES;
490504
CLANG_WARN_UNREACHABLE_CODE = YES;
491505
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -505,7 +519,7 @@
505519
MTL_ENABLE_DEBUG_INFO = NO;
506520
SDKROOT = iphoneos;
507521
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
508-
SWIFT_VERSION = 3.0;
522+
SWIFT_VERSION = 4.0;
509523
TARGETED_DEVICE_FAMILY = "1,2";
510524
VALIDATE_PRODUCT = YES;
511525
};
@@ -522,7 +536,8 @@
522536
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
523537
PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
524538
PRODUCT_NAME = "$(TARGET_NAME)";
525-
SWIFT_VERSION = 3.0;
539+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
540+
SWIFT_VERSION = 4.0;
526541
};
527542
name = Debug;
528543
};
@@ -537,7 +552,8 @@
537552
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
538553
PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
539554
PRODUCT_NAME = "$(TARGET_NAME)";
540-
SWIFT_VERSION = 3.0;
555+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
556+
SWIFT_VERSION = 4.0;
541557
};
542558
name = Release;
543559
};
@@ -557,7 +573,8 @@
557573
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
558574
PRODUCT_BUNDLE_IDENTIFIER = "ramotion.$(PRODUCT_NAME:rfc1034identifier)";
559575
PRODUCT_NAME = "$(TARGET_NAME)";
560-
SWIFT_VERSION = 3.0;
576+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
577+
SWIFT_VERSION = 4.0;
561578
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PaperSwitchDemo.app/PaperSwitchDemo";
562579
};
563580
name = Debug;
@@ -574,7 +591,8 @@
574591
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
575592
PRODUCT_BUNDLE_IDENTIFIER = "ramotion.$(PRODUCT_NAME:rfc1034identifier)";
576593
PRODUCT_NAME = "$(TARGET_NAME)";
577-
SWIFT_VERSION = 3.0;
594+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
595+
SWIFT_VERSION = 4.0;
578596
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PaperSwitchDemo.app/PaperSwitchDemo";
579597
};
580598
name = Release;

‎PaperSwitchDemo/PaperSwitchDemo.xcodeproj/xcshareddata/xcschemes/PaperSwitch.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎RAMPaperSwitch.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = 'RAMPaperSwitch'
4-
s.version = '2.0.4'
4+
s.version = '2.1.0'
55
s.summary = 'Swift subclass of the UISwitch which paints over the parent view'
66
s.homepage = 'https://github.com/Ramotion/paper-switch'
77
s.license = 'MIT'

0 commit comments

Comments
 (0)