Skip to content

Commit 37649c1

Browse files
authored
Merge pull request #12 from gscalzo/develop
Updated To Swift 4
2 parents a808371 + 04003c5 commit 37649c1

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

ChainedAnimation.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = "ChainedAnimation"
4-
s.version = "3.0.0"
4+
s.version = "3.0.1"
55
s.summary = "ChainedAnimation is a small Swift library to chain multiple animations with different delays."
66
s.homepage = "https://github.com/daehn/ChainedAnimation"
77
s.license = 'MIT'
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111

1212
s.platform = :ios, '8.0'
1313
s.requires_arc = true
14-
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3' }
14+
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4' }
1515

1616
s.source_files = "ChainedAnimation", "ChainedAnimation/**/*.{h,m,swift}"
1717
end

ChainedAnimation.xcodeproj/project.pbxproj

+26-7
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,12 @@
247247
isa = PBXProject;
248248
attributes = {
249249
LastSwiftUpdateCheck = 0800;
250-
LastUpgradeCheck = 0800;
250+
LastUpgradeCheck = 0900;
251251
ORGANIZATIONNAME = "Silvan Dähn";
252252
TargetAttributes = {
253253
AF6A02451D84204900F89BD9 = {
254254
CreatedOnToolsVersion = 8.0;
255-
LastSwiftMigration = 0800;
255+
LastSwiftMigration = 0900;
256256
ProvisioningStyle = Automatic;
257257
};
258258
AF6A024E1D84204900F89BD9 = {
@@ -262,7 +262,7 @@
262262
};
263263
AF79A3CF1D843C0E0060857F = {
264264
CreatedOnToolsVersion = 8.0;
265-
LastSwiftMigration = 0800;
265+
LastSwiftMigration = 0900;
266266
ProvisioningStyle = Automatic;
267267
};
268268
};
@@ -392,15 +392,22 @@
392392
CLANG_CXX_LIBRARY = "libc++";
393393
CLANG_ENABLE_MODULES = YES;
394394
CLANG_ENABLE_OBJC_ARC = YES;
395+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
395396
CLANG_WARN_BOOL_CONVERSION = YES;
397+
CLANG_WARN_COMMA = YES;
396398
CLANG_WARN_CONSTANT_CONVERSION = YES;
397399
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
398400
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
399401
CLANG_WARN_EMPTY_BODY = YES;
400402
CLANG_WARN_ENUM_CONVERSION = YES;
401403
CLANG_WARN_INFINITE_RECURSION = YES;
402404
CLANG_WARN_INT_CONVERSION = YES;
405+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
406+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
403407
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
408+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
409+
CLANG_WARN_STRICT_PROTOTYPES = YES;
410+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
404411
CLANG_WARN_SUSPICIOUS_MOVES = YES;
405412
CLANG_WARN_UNREACHABLE_CODE = YES;
406413
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -445,15 +452,22 @@
445452
CLANG_CXX_LIBRARY = "libc++";
446453
CLANG_ENABLE_MODULES = YES;
447454
CLANG_ENABLE_OBJC_ARC = YES;
455+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
448456
CLANG_WARN_BOOL_CONVERSION = YES;
457+
CLANG_WARN_COMMA = YES;
449458
CLANG_WARN_CONSTANT_CONVERSION = YES;
450459
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
451460
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
452461
CLANG_WARN_EMPTY_BODY = YES;
453462
CLANG_WARN_ENUM_CONVERSION = YES;
454463
CLANG_WARN_INFINITE_RECURSION = YES;
455464
CLANG_WARN_INT_CONVERSION = YES;
465+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
466+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
456467
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
468+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
469+
CLANG_WARN_STRICT_PROTOTYPES = YES;
470+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
457471
CLANG_WARN_SUSPICIOUS_MOVES = YES;
458472
CLANG_WARN_UNREACHABLE_CODE = YES;
459473
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -498,7 +512,8 @@
498512
PRODUCT_NAME = "$(TARGET_NAME)";
499513
SKIP_INSTALL = YES;
500514
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
501-
SWIFT_VERSION = 3.0;
515+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
516+
SWIFT_VERSION = 4.0;
502517
};
503518
name = Debug;
504519
};
@@ -517,7 +532,8 @@
517532
PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimation;
518533
PRODUCT_NAME = "$(TARGET_NAME)";
519534
SKIP_INSTALL = YES;
520-
SWIFT_VERSION = 3.0;
535+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
536+
SWIFT_VERSION = 4.0;
521537
};
522538
name = Release;
523539
};
@@ -554,7 +570,8 @@
554570
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
555571
PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationExample;
556572
PRODUCT_NAME = "$(TARGET_NAME)";
557-
SWIFT_VERSION = 3.0;
573+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
574+
SWIFT_VERSION = 4.0;
558575
};
559576
name = Debug;
560577
};
@@ -567,7 +584,8 @@
567584
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
568585
PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationExample;
569586
PRODUCT_NAME = "$(TARGET_NAME)";
570-
SWIFT_VERSION = 3.0;
587+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
588+
SWIFT_VERSION = 4.0;
571589
};
572590
name = Release;
573591
};
@@ -608,6 +626,7 @@
608626
AF79A3E01D843C0E0060857F /* Release */,
609627
);
610628
defaultConfigurationIsVisible = 0;
629+
defaultConfigurationName = Release;
611630
};
612631
/* End XCConfigurationList section */
613632
};

ChainedAnimation.xcodeproj/xcshareddata/xcschemes/ChainedAnimation.xcscheme

+3-1
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
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)