Merge pull request #8 from hyperoslo/swift4

Update to Swift 4

.swift-version

@@ -1 +1 @@
-3.0
+4.0

Cheers.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
  s.name = "Cheers"
  s.summary = "Fancy confetti effects in Swift"
- s.version = "1.2.0"
+ s.version = "2.0.0"
  s.homepage = "https://github.com/hyperoslo/Cheers"
  s.license = 'MIT'
  s.author = { "Hyper Interaktiv AS" => "ios@hyper.no" }
@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
  s.requires_arc = true
  s.source_files = 'Sources/**/*'
 
- s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' }
+ s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
 end

Cheers.xcodeproj/project.pbxproj

@@ -161,7 +161,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0720;
- LastUpgradeCheck = 0720;
+ LastUpgradeCheck = 0900;
  ORGANIZATIONNAME = "Hyper Interaktiv AS";
  TargetAttributes = {
  D5B2E89E1C3A780C00C0327D = {
@@ -248,13 +248,21 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
  CLANG_WARN_CONSTANT_CONVERSION = YES;
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -282,7 +290,7 @@
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = iphoneos;
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.0;
  TARGETED_DEVICE_FAMILY = "1,2";
  VERSIONING_SYSTEM = "apple-generic";
  VERSION_INFO_PREFIX = "";
@@ -297,13 +305,21 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
  CLANG_WARN_CONSTANT_CONVERSION = YES;
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -323,7 +339,8 @@
  IPHONEOS_DEPLOYMENT_TARGET = 9.2;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
- SWIFT_VERSION = 3.0;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 4.0;
  TARGETED_DEVICE_FAMILY = "1,2";
  VALIDATE_PRODUCT = YES;
  VERSIONING_SYSTEM = "apple-generic";
@@ -335,6 +352,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  CLANG_ENABLE_MODULES = YES;
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
@@ -347,14 +365,14 @@
  PRODUCT_NAME = Cheers;
  SKIP_INSTALL = YES;
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 3.0;
  };
  name = Debug;
  };
  D5B2E8B51C3A780C00C0327D /* Release */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
  CLANG_ENABLE_MODULES = YES;
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
@@ -366,7 +384,6 @@
  PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Cheers-iOS";
  PRODUCT_NAME = Cheers;
  SKIP_INSTALL = YES;
- SWIFT_VERSION = 3.0;
  };
  name = Release;
  };
@@ -375,10 +392,7 @@
  buildSettings = {
  ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
  CLANG_ENABLE_MODULES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/Carthage/Build/iOS",
- );
+ FRAMEWORK_SEARCH_PATHS = "$(inherited)";
  INFOPLIST_FILE = "$(SRCROOT)/CheersTests/Info-iOS.plist";
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = no.hyper.CheersTests;
@@ -393,10 +407,7 @@
  buildSettings = {
  ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
  CLANG_ENABLE_MODULES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/Carthage/Build/iOS",
- );
+ FRAMEWORK_SEARCH_PATHS = "$(inherited)";
  INFOPLIST_FILE = "$(SRCROOT)/CheersTests/Info-iOS.plist";
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = no.hyper.CheersTests;

Cheers.xcodeproj/xcshareddata/xcschemes/Cheers-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0720"
+ LastUpgradeVersion = "0900"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  <TestableReference
@@ -55,6 +56,7 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

README.md

@@ -1,11 +1,10 @@
 # Cheers
 
-[![CI Status](http://img.shields.io/travis/hyperoslo/Cheers.svg?style=flat)](https://travis-ci.org/hyperoslo/Cheers)
 [![Version](https://img.shields.io/cocoapods/v/Cheers.svg?style=flat)](http://cocoadocs.org/docsets/Cheers)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![License](https://img.shields.io/cocoapods/l/Cheers.svg?style=flat)](http://cocoadocs.org/docsets/Cheers)
 [![Platform](https://img.shields.io/cocoapods/p/Cheers.svg?style=flat)](http://cocoadocs.org/docsets/Cheers)
-![Swift](https://img.shields.io/badge/%20in-swift%203.0-orange.svg)
+![Swift](https://img.shields.io/badge/%20in-swift%204.0-orange.svg)
 
 <div align = "center">
 <img src="demo.gif" width="300" height="510" />

circle.yml

@@ -0,0 +1,7 @@
+machine:
+ xcode:
+ version: "9.0"
+
+test:
+ override:
+ - set -o pipefail && xcodebuild -project Cheers.xcodeproj -scheme "Cheers-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.0' -enableCodeCoverage YES test