Merge pull request #22 from CodaFi/scheme-a-little-scheme

Add watchOS and tvOS Schemes
typelift · Jan 4, 2016 · eca4aa0 · eca4aa0
2 parents e39ac8c + 3830381
commit eca4aa0
Show file tree

Hide file tree

Showing 8 changed files with 600 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,11 @@ language: objective-c
 osx_image: xcode7.2
 before_install: true
 install: true
-script: script/cibuild Focus Focus-iOS
+script:
+  - script/cibuild Focus Focus-iOS
+  - xcodebuild test -scheme Focus-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p'
+  - xcodebuild build -scheme Focus-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'
+
 notifications:
   webhooks:
     urls:

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
 github "typelift/Operadics" "0.1.4"
-github "typelift/SwiftCheck" "v0.3.1"
+github "typelift/SwiftCheck" "v0.4.4"
diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck
diff --git a/Focus.xcodeproj/project.pbxproj b/Focus.xcodeproj/project.pbxproj
diff --git a/Focus.xcodeproj/xcshareddata/xcschemes/Focus-tvOS.xcscheme b/Focus.xcodeproj/xcshareddata/xcschemes/Focus-tvOS.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8240CE381C3A47AC00EF4D29"
+               BuildableName = "Focus-tvOS.framework"
+               BlueprintName = "Focus-tvOS"
+               ReferencedContainer = "container:Focus.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8240CE411C3A47AC00EF4D29"
+               BuildableName = "Focus-tvOSTests.xctest"
+               BlueprintName = "Focus-tvOSTests"
+               ReferencedContainer = "container:Focus.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8240CE381C3A47AC00EF4D29"
+            BuildableName = "Focus-tvOS.framework"
+            BlueprintName = "Focus-tvOS"
+            ReferencedContainer = "container:Focus.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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8240CE381C3A47AC00EF4D29"
+            BuildableName = "Focus-tvOS.framework"
+            BlueprintName = "Focus-tvOS"
+            ReferencedContainer = "container:Focus.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8240CE381C3A47AC00EF4D29"
+            BuildableName = "Focus-tvOS.framework"
+            BlueprintName = "Focus-tvOS"
+            ReferencedContainer = "container:Focus.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Focus.xcodeproj/xcshareddata/xcschemes/Focus-watchOS.xcscheme b/Focus.xcodeproj/xcshareddata/xcschemes/Focus-watchOS.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8240CE231C3A47A500EF4D29"
+               BuildableName = "Focus-watchOS.framework"
+               BlueprintName = "Focus-watchOS"
+               ReferencedContainer = "container:Focus.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8240CE231C3A47A500EF4D29"
+            BuildableName = "Focus-watchOS.framework"
+            BlueprintName = "Focus-watchOS"
+            ReferencedContainer = "container:Focus.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8240CE231C3A47A500EF4D29"
+            BuildableName = "Focus-watchOS.framework"
+            BlueprintName = "Focus-watchOS"
+            ReferencedContainer = "container:Focus.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/FocusTests/PrismSpec.swift b/FocusTests/PrismSpec.swift
@@ -14,8 +14,8 @@ class PrismSpec : XCTestCase {
 	func testPrismLaws() {
 		property("modify-identity") <- forAll { (fs : IsoOf<Int, UInt>) in
 			/// Cannot generate this in the forAll because we need this to be memoizing and consistent with the Iso.
-			let tryGet = ArrowOf<UInt, OptionalOf<UInt>>({ arc4random() % 4 == 0 ? OptionalOf(.None) : OptionalOf(.Some($0)) })
-			let prism = Prism(tryGet: { $0.getOptional } • tryGet.getArrow • fs.getTo, inject: fs.getFrom)
+			let tryGet : UInt -> OptionalOf<UInt> = { arc4random() % 4 == 0 ? OptionalOf(.None) : OptionalOf(.Some($0)) }
+			let prism = Prism(tryGet: { $0.getOptional } • tryGet • fs.getTo, inject: fs.getFrom)
 			return forAll { (l : Int) in
 				let m = prism.tryModify(l, { $0 })
 				return m != nil ==> (m == l)
@@ -28,8 +28,8 @@ class SimplePrismSpec : XCTestCase {
 	func testPrismLaws() {
 		property("modify-identity") <- forAll { (fs : IsoOf<Int, UInt>) in
 			/// Cannot generate this in the forAll because we need this to be memoizing and consistent with the Iso.
-			let tryGet = ArrowOf<UInt, OptionalOf<UInt>>({ arc4random() % 4 == 0 ? OptionalOf(.None) : OptionalOf(.Some($0)) })
-			let prism = SimplePrism(tryGet: { $0.getOptional } • tryGet.getArrow • fs.getTo, inject: fs.getFrom)
+			let tryGet : UInt -> OptionalOf<UInt> = { arc4random() % 4 == 0 ? OptionalOf(.None) : OptionalOf(.Some($0)) }
+			let prism = SimplePrism(tryGet: { $0.getOptional } • tryGet • fs.getTo, inject: fs.getFrom)
 			return forAll { (l : Int) in
 				let m = prism.tryModify(l, { $0 })
 				return m != nil ==> (m == l)

diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Build Status](https://travis-ci.org/typelift/Focus.svg?branch=master)](https://travis-ci.org/typelift/Focus)
+[![Gitter chat](https://badges.gitter.im/DPVN/chat.png)](https://gitter.im/typelift/general?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
 
 # Focus
 Focus is an Optics library for Swift (where Optics includes `Lens`, `Prism`s, and `Iso`s) that is
+16 −6		.travis.yml
+5 −2		README.md
+2 −1		SwiftCheck.podspec
+335 −14		SwiftCheck.xcodeproj/project.pbxproj
+99 −0		SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-tvOS.xcscheme
+73 −520		SwiftCheck/Arbitrary.swift
+23 −20		SwiftCheck/Check.swift
+176 −0		SwiftCheck/CoArbitrary.swift
+23 −23		SwiftCheck/Gen.swift
+1 −1		SwiftCheck/Lattice.swift
+177 −104		SwiftCheck/Modifiers.swift
+129 −84		SwiftCheck/Property.swift
+168 −79		SwiftCheck/Random.swift
+5 −1		SwiftCheck/State.swift
+400 −210		SwiftCheck/Test.swift
+5 −5		SwiftCheck/TestOperators.swift
+1 −1		SwiftCheck/Testable.swift
+341 −0		SwiftCheck/WitnessedArbitrary.swift
+0 −1		SwiftCheckTests/BooleanIdentitySpec.swift
+0 −1		SwiftCheckTests/ComplexSpec.swift
+0 −1		SwiftCheckTests/DiscardSpec.swift
+62 −0		SwiftCheckTests/FailureSpec.swift
+120 −23		SwiftCheckTests/GenSpec.swift
+4 −1		SwiftCheckTests/ModifierSpec.swift
+20 −1		SwiftCheckTests/PropertySpec.swift
+30 −0		SwiftCheckTests/ReplaySpec.swift
+0 −1		SwiftCheckTests/ShrinkSpec.swift
+0 −2		SwiftCheckTests/SimpleSpec.swift
+14 −2		SwiftCheckTests/TestSpec.swift
+49 −38		Tutorial.playground/Contents.swift
+1 −1		Tutorial.playground/contents.xcplayground
+18 −0		script/LICENSE.md
+82 −0		script/README.md
+47 −0		script/bootstrap
+173 −0		script/cibuild
+10 −0		script/schemes.awk
+25 −0		script/xctool.awk