mac os

kvs-coder · kvs-coder · commit d2060bab24cb · 2021-04-01T21:16:36.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -34,4 +34,4 @@ Carthage/Build
 # Note: if you ignore the Pods directory, make sure to uncomment
 # `pod install` in .travis.yml
 #
-# Pods/
+Pods/
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SwiftBloc.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SwiftBloc.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1240"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SwiftBloc"
+               BuildableName = "SwiftBloc"
+               BlueprintName = "SwiftBloc"
+               ReferencedContainer = "container:">
+            </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 = "SwiftBlocTests"
+               BuildableName = "SwiftBlocTests"
+               BlueprintName = "SwiftBlocTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </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">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "SwiftBloc"
+            BuildableName = "SwiftBloc"
+            BlueprintName = "SwiftBloc"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - SwiftBloc (1.0.0)
+  - SwiftBloc (1.0.1)
 
 DEPENDENCIES:
   - SwiftBloc (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  SwiftBloc: 31aad2949ccfe3de54a447868f489c697ef00428
+  SwiftBloc: c051dd14cfc932200a3fd27d14e12124a4ae7741
 
 PODFILE CHECKSUM: a328c1d5c47373468c0f027e420b98fc6ea4155e
 
diff --git a/Example/SwiftBloc.xcodeproj/project.pbxproj b/Example/SwiftBloc.xcodeproj/project.pbxproj
@@ -11,14 +11,14 @@
 		047A7BB925ED733700228011 /* BlocContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047A7BB825ED733700228011 /* BlocContentView.swift */; };
 		047A7BBB25ED735800228011 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047A7BBA25ED735800228011 /* MainView.swift */; };
 		047EC4D025EAEE860004C90C /* CounterCubit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047EC4CF25EAEE860004C90C /* CounterCubit.swift */; };
+		04B45D1926164D1F0050F1D6 /* Pods_SwiftBloc_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D9208F1CC2C0172BFA8D1E4 /* Pods_SwiftBloc_Example.framework */; };
+		04B45D3026164E710050F1D6 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
 		04EB15FB25EAC7E8008E0030 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EB15FA25EAC7E8008E0030 /* SceneDelegate.swift */; };
 		08611E94466D97B3F329DCE3 /* Pods_SwiftBloc_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82EC3EC02FB63CEFC4EA0403 /* Pods_SwiftBloc_Tests.framework */; };
-		2EF31873A1F3203A48F66733 /* Pods_SwiftBloc_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D9208F1CC2C0172BFA8D1E4 /* Pods_SwiftBloc_Example.framework */; };
 		607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
 		607FACD81AFB9204008FA782 /* CubitContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* CubitContentView.swift */; };
 		607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
 		607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
-		607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -38,6 +38,7 @@
 		047A7BB825ED733700228011 /* BlocContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlocContentView.swift; sourceTree = "<group>"; };
 		047A7BBA25ED735800228011 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
 		047EC4CF25EAEE860004C90C /* CounterCubit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CounterCubit.swift; sourceTree = "<group>"; };
+		04B45D0D26164BD50050F1D6 /* SwiftBloc_Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SwiftBloc_Example.entitlements; sourceTree = "<group>"; };
 		04EB15FA25EAC7E8008E0030 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		0D9208F1CC2C0172BFA8D1E4 /* Pods_SwiftBloc_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftBloc_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0DD499F2FF4B6CDD3A8F0679 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
@@ -66,7 +67,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2EF31873A1F3203A48F66733 /* Pods_SwiftBloc_Example.framework in Frameworks */,
+				04B45D1926164D1F0050F1D6 /* Pods_SwiftBloc_Example.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -102,6 +103,7 @@
 		607FACC71AFB9204008FA782 = {
 			isa = PBXGroup;
 			children = (
+				04B45D0D26164BD50050F1D6 /* SwiftBloc_Example.entitlements */,
 				043EE4DE25EC197400FAE1E8 /* .swiftlint.yml */,
 				607FACF51AFB993E008FA782 /* Podspec Metadata */,
 				607FACD21AFB9204008FA782 /* Example for SwiftBloc */,
@@ -249,11 +251,15 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
+						DevelopmentTeam = MAVP5V2N7V;
 						LastSwiftMigration = 1170;
+						ProvisioningStyle = Automatic;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
+						DevelopmentTeam = MAVP5V2N7V;
 						LastSwiftMigration = 1170;
+						ProvisioningStyle = Automatic;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -397,7 +403,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				607FACEC1AFB9204008FA782 /* Tests.swift in Sources */,
+				04B45D3026164E710050F1D6 /* Tests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -535,13 +541,23 @@
 			baseConfigurationReference = 5C8F27C1B948611BBB8A3EB5 /* Pods-SwiftBloc_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = SwiftBloc_Example.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = MAVP5V2N7V;
 				INFOPLIST_FILE = SwiftBloc/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -550,20 +566,34 @@
 			baseConfigurationReference = 3E2125C73E725C0C0E6379E5 /* Pods-SwiftBloc_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = SwiftBloc_Example.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = MAVP5V2N7V;
 				INFOPLIST_FILE = SwiftBloc/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
 		607FACF31AFB9204008FA782 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4B01CD3000816151C6152076 /* Pods-SwiftBloc_Tests.debug.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = MAVP5V2N7V;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -576,6 +606,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftBloc_Example.app/SwiftBloc_Example";
@@ -586,6 +618,10 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 43D4B93CE8F3432B5D3E459C /* Pods-SwiftBloc_Tests.release.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = MAVP5V2N7V;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -594,6 +630,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftBloc_Example.app/SwiftBloc_Example";
diff --git a/Example/SwiftBloc_Example.entitlements b/Example/SwiftBloc_Example.entitlements
@@ -0,0 +1,10 @@
+<?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>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Package.swift b/Package.swift
@@ -21,6 +21,9 @@ let package = Package(
         .target(
             name: "SwiftBloc",
             path: "Sources"),
+        .testTarget(
+            name: "SwiftBlocTests",
+            path: "Tests"),
     ]
 )
 
diff --git a/Sources/BlocTest.swift b/Sources/BlocTest.swift
@@ -0,0 +1,41 @@
+//
+//  File.swift
+//  
+//
+//  Created by Kachalov, Victor on 01.04.21.
+//
+
+import Foundation
+import Combine
+
+final public class BlocTest<S: Equatable, B: Base<S>> {
+    public static func execute(
+        description: String,
+        build: () -> B,
+        act: ((B) -> Void)?,
+        wait: TimeInterval? = 0,
+        expect: (() -> Any)?,
+        verify: ((Bool, String) -> Void)
+    ) {
+        print("Running test: \(description)")
+        var areEqual = false
+        var states = [S]()
+        let bloc = build()
+        let scheduler = ImmediateScheduler.shared
+        let cancellable = bloc.$state
+            .subscribe(on: scheduler)
+            .delay(for: .seconds(wait ?? 0), scheduler: scheduler)
+            .sink(receiveValue: { value in
+                print("New state added: \(value)")
+                states.append(value)
+            } )
+        act?(bloc)
+        if expect != nil {
+            let expected = expect!()
+            areEqual = "\(states)" == "\(expected)"
+            let message = "State received: \(states). \nStates expected: \(expected)"
+            verify(areEqual, message)
+        }
+        cancellable.cancel()
+    }
+}
diff --git a/Tests/BlocTest.swift b/Tests/BlocTest.swift
@@ -0,0 +1,44 @@
+//
+//  File.swift
+//  
+//
+//  Created by Kachalov, Victor on 01.04.21.
+//
+
+//import Foundation
+//import SwiftBloc
+//import Combine
+//import XCTest
+//
+//final public class BlocTest<S: Equatable, B: Base<S>> {
+//    public static func execute(
+//        description: String,
+//        build: () -> B,
+//        act: ((B) -> Void)?,
+//        wait: TimeInterval? = 0,
+//        expect: (() -> Any)?,
+//        verify: ((B) -> Void)? = nil
+//    ) {
+//        print("Running test: \(description)")
+//        var areEqual = false
+//        var states = [S]()
+//        let bloc = build()
+//        let scheduler = ImmediateScheduler.shared
+//        let cancellable = bloc.$state
+//            .subscribe(on: scheduler)
+//            .delay(for: .seconds(wait ?? 0), scheduler: scheduler)
+//            .sink(receiveValue: { value in
+//                print("New state added: \(value)")
+//                states.append(value)
+//            } )
+//        act?(bloc)
+//        if expect != nil {
+//            let expected = expect!()
+//            areEqual = "\(states)" == "\(expected)"
+//            let message = "State received: \(states). \nStates expected: \(expected)"
+//            XCTAssert(areEqual, message)
+//        }
+//        cancellable.cancel()
+//        verify?(bloc)
+//    }
+//}
diff --git a/Tests/MockCounterBloc.swift b/Tests/MockCounterBloc.swift
diff --git a/Tests/SwiftBlocTests.swift b/Tests/SwiftBlocTests.swift

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ Carthage/Build`
`34`	`34`	`# Note: if you ignore the Pods directory, make sure to uncomment`
`35`	`35`	# `pod install` in .travis.yml
`36`	`36`	`#`
`37`		`-# Pods/`
	`37`	`+Pods/`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ let package = Package(`
`21`	`21`	`.target(`
`22`	`22`	`name: "SwiftBloc",`
`23`	`23`	`path: "Sources"),`
	`24`	`+ .testTarget(`
	`25`	`+ name: "SwiftBlocTests",`
	`26`	`+ path: "Tests"),`
`24`	`27`	`]`
`25`	`28`	`)`
`26`	`29`