Unverified Commit e14323dc authored by Aral Balkan's avatar Aral Balkan
Browse files

Merge branch 'feature/Swift_3.0' of https://github.com/duemunk/Async into feature/Swift_3.0

parents 62427328 7251f43b
language: objective-c
osx_image: xcode8
language: objective-c
env:
- "DESTINATION='platform=watchOS Simulator,name=Apple Watch - 38mm' ACTION=build"
- "DESTINATION='platform=tvOS Simulator,name=Apple TV 1080p' ACTION=build"
- "DESTINATION='platform=OS X' ACTION=test"
script:
- set -o pipefail && xcodebuild -project AsyncTest/Async.xcodeproj -scheme Async -destination "$DESTINATION" $ACTION | xcpretty
# - set -o pipefail && xcodebuild -project AsyncTest/Async.xcodeproj -scheme Async -destination 'platform=OS X' test | xcpretty
# - set -o pipefail && xcodebuild -project AsyncTest/Async.xcodeproj -scheme Async -destination 'platform=watchOS Simulator,name=Apple Watch - 38mm' build | xcpretty
# - set -o pipefail && xcodebuild -project AsyncTest/Async.xcodeproj -scheme Async -destination 'platform=tvOS Simulator,name=Apple TV 1080p' test | xcpretty
# osx_image: xcode8
# language: objective-c
#
# script:
# Carthage
- xcodebuild -project Async.xcodeproj -scheme "Async iOS" | xcpretty
- xcodebuild -project Async.xcodeproj -scheme "Async OSX" | xcpretty
- xcodebuild -project Async.xcodeproj -scheme "Async tvOS" | xcpretty
- xcodebuild -project Async.xcodeproj -scheme "Async watchOS" | xcpretty
# - xcodebuild -project Async.xcodeproj -scheme "Async iOS" | xcpretty
# - xcodebuild -project Async.xcodeproj -scheme "Async OSX" | xcpretty
# - xcodebuild -project Async.xcodeproj -scheme "Async tvOS" | xcpretty
# - xcodebuild -project Async.xcodeproj -scheme "Async watchOS" | xcpretty
# CocoaPods
- xcodebuild clean -workspace AsyncPodsExample/AsyncPodsExample.xcworkspace -scheme "AsyncExample iOS" -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
- xcodebuild clean -workspace AsyncPodsExample/AsyncPodsExample.xcworkspace -scheme "AsyncExample OS X" -sdk macosx ONLY_ACTIVE_ARCH=NO | xcpretty
# - xcodebuild clean -workspace AsyncPodsExample/AsyncPodsExample.xcworkspace -scheme "AsyncExample iOS" -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
# - xcodebuild clean -workspace AsyncPodsExample/AsyncPodsExample.xcworkspace -scheme "AsyncExample OS X" -sdk macosx ONLY_ACTIVE_ARCH=NO | xcpretty
# tvOS target has issues with signing
# - xcodebuild clean build -workspace AsyncPodsExample/AsyncPodsExample.xcworkspace -scheme "AsyncExample tvOS" -sdk appletvos ONLY_ACTIVE_ARCH=NO
# Tests (OS X only, since simulator doesn't play nice with GCD)
- xcodebuild test -project AsyncTest/Async.xcodeproj -scheme "AsyncOSX" | xcpretty
# - set -o pipefail && xcodebuild clean build test -project AsyncTest/Async.xcodeproj -scheme "AsyncOSX" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=NO | xcpretty
# - set -o pipefail && xcodebuild test -project AsyncTest/Async.xcodeproj -scheme "AsyncOSX" | xcpretty
after_success:
- bash <(curl -s https://codecov.io/bash) -J 'AsyncTest/Async'
PODS:
- AsyncSwift (1.7.2)
- AsyncSwift (2.0.0)
DEPENDENCIES:
- AsyncSwift (from `../`)
......@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: ../
SPEC CHECKSUMS:
AsyncSwift: 15c496983f752a3ab8d1be17e64dd4c6f2a31239
AsyncSwift: d5b7e10134039732f1d28964ea42b75e530023da
PODFILE CHECKSUM: 61aef6fe4fbf3033ceb96abd125979ee9526d645
......
{
"name": "AsyncSwift",
"version": "1.7.2",
"version": "2.0.0",
"summary": "Syntactic sugar in Swift for asynchronous dispatches in Grand Central Dispatch",
"homepage": "https://github.com/duemunk/Async",
"license": {
......@@ -17,7 +17,7 @@
},
"source": {
"git": "https://github.com/duemunk/Async.git",
"tag": "1.7.2"
"tag": "2.0.0"
},
"source_files": "Source/*.swift",
"requires_arc": true,
......
PODS:
- AsyncSwift (1.7.2)
- AsyncSwift (2.0.0)
DEPENDENCIES:
- AsyncSwift (from `../`)
......@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: ../
SPEC CHECKSUMS:
AsyncSwift: 15c496983f752a3ab8d1be17e64dd4c6f2a31239
AsyncSwift: d5b7e10134039732f1d28964ea42b75e530023da
PODFILE CHECKSUM: 61aef6fe4fbf3033ceb96abd125979ee9526d645
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.7.2</string>
<string>2.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.7.2</string>
<string>2.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.7.2</string>
<string>2.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
Pod::Spec.new do |s|
s.name = "AsyncSwift"
s.version = "1.7.2"
s.version = "2.0.0"
s.summary = "Syntactic sugar in Swift for asynchronous dispatches in Grand Central Dispatch"
s.homepage = "https://github.com/duemunk/Async"
s.license = { :type => "MIT" }
......@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.ios.deployment_target = "8.0"
s.tvos.deployment_target = "9.0"
s.watchos.deployment_target = "2.0"
s.source = { :git => "https://github.com/duemunk/Async.git", :tag => "1.7.2"}
s.source = { :git => "https://github.com/duemunk/Async.git", :tag => "2.0.0"}
s.source_files = "Source/*.swift"
s.requires_arc = true
s.module_name = 'Async'
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......@@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A2331BDE417600C957BA"
BuildableName = "AsyncOSX.app"
BlueprintName = "AsyncOSX"
BlueprintIdentifier = "4EFF42021D5E8762006E32BD"
BuildableName = "Async.framework"
BlueprintName = "Async"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</BuildActionEntry>
......@@ -33,9 +33,9 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A2411BDE417700C957BA"
BuildableName = "AsyncOSXTests.xctest"
BlueprintName = "AsyncOSXTests"
BlueprintIdentifier = "4EFF420A1D5E8762006E32BD"
BuildableName = "AsyncTests.xctest"
BlueprintName = "AsyncTests"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</TestableReference>
......@@ -43,9 +43,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A2331BDE417600C957BA"
BuildableName = "AsyncOSX.app"
BlueprintName = "AsyncOSX"
BlueprintIdentifier = "4EFF42021D5E8762006E32BD"
BuildableName = "Async.framework"
BlueprintName = "Async"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</MacroExpansion>
......@@ -66,9 +66,9 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A2331BDE417600C957BA"
BuildableName = "AsyncOSX.app"
BlueprintName = "AsyncOSX"
BlueprintIdentifier = "4EFF42021D5E8762006E32BD"
BuildableName = "Async.framework"
BlueprintName = "Async"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
......@@ -85,9 +85,9 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A2331BDE417600C957BA"
BuildableName = "AsyncOSX.app"
BlueprintName = "AsyncOSX"
BlueprintIdentifier = "4EFF42021D5E8762006E32BD"
BuildableName = "Async.framework"
BlueprintName = "Async"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
......
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A25D1BDE466A00C957BA"
BuildableName = "AsynciOS.app"
BlueprintName = "AsynciOS"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A2701BDE466A00C957BA"
BuildableName = "AsynciOSTests.xctest"
BlueprintName = "AsynciOSTests"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A25D1BDE466A00C957BA"
BuildableName = "AsynciOS.app"
BlueprintName = "AsynciOS"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A25D1BDE466A00C957BA"
BuildableName = "AsynciOS.app"
BlueprintName = "AsynciOS"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4EE7A25D1BDE466A00C957BA"
BuildableName = "AsynciOS.app"
BlueprintName = "AsynciOS"
ReferencedContainer = "container:Async.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
//
// AppDelegate.swift
// AsyncOSX
//
// Created by Tobias Due Munk on 26/10/15.
// Copyright © 2015 developmunk. All rights reserved.
//
import Cocoa
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
@IBOutlet weak var window: NSWindow!
func applicationDidFinishLaunching(_ notification: Notification) {
// Insert code here to initialize your application
}
func applicationWillTerminate(_ notification: Notification) {
// Insert code here to tear down your application
}
}
{
"images" : [
{
"idiom" : "mac",
"size" : "16x16",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "16x16",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "32x32",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "32x32",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "128x128",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "128x128",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "256x256",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "256x256",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 developmunk. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
//
// AppDelegate.swift
// AsynciOS
//
// Created by Tobias Due Munk on 26/10/15.
// Copyright © 2015 developmunk. All rights reserved.
//
import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
// Override point for customization after application launch.
return true
}
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
}
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
</dependencies>
<scenes>
<!--View Controller-->