Skip to content

Commit

Permalink
Merge pull request #30 from bricklife/release/1.9.3
Browse files Browse the repository at this point in the history
Release/1.9.3
  • Loading branch information
bricklife authored Sep 14, 2021
2 parents c359a46 + 53c2d74 commit de029cf
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 15 deletions.
8 changes: 4 additions & 4 deletions BoostRemote.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -741,11 +741,11 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 31;
CURRENT_PROJECT_VERSION = 32;
DEVELOPMENT_TEAM = UV6TAX3ANB;
INFOPLIST_FILE = BoostRemote/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.9.2;
MARKETING_VERSION = 1.9.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.bricklife.ios.boost-remote";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -757,11 +757,11 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 31;
CURRENT_PROJECT_VERSION = 32;
DEVELOPMENT_TEAM = UV6TAX3ANB;
INFOPLIST_FILE = BoostRemote/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.9.2;
MARKETING_VERSION = 1.9.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.bricklife.ios.boost-remote";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
4 changes: 2 additions & 2 deletions BoostRemote/ControllerViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class ControllerViewController: UIViewController {
.withLatest(from: settingsState.signal.map { $0.directions[port] ?? true })
.map { (power: Int8, direction: Bool) in direction ? power : -power }
.observeValues { [weak self] (value) in
self?.sendCommand(port: port, power: value)
self?.sendStartPowerCommand(port: port, power: value)
}
}
}
Expand All @@ -93,7 +93,7 @@ class ControllerViewController: UIViewController {
private var timers: [BoostBLEKit.Port: Timer] = [:]
private var waitingCommands: [BoostBLEKit.Port: Command] = [:]

private func sendCommand(port: BoostBLEKit.Port, power: Int8) {
private func sendStartPowerCommand(port: BoostBLEKit.Port, power: Int8) {
guard let command = connectedHub?.motorStartPowerCommand(port: port, power: power) else { return }

if timers[port] != nil {
Expand Down
4 changes: 3 additions & 1 deletion BoostRemote/MoveHubManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ class MoveHubManager: NSObject {
self.connectedHub = Duplo.TrainBase()
case .controlPlus:
self.connectedHub = ControlPlus.SmartHub()
case .remoteControl:
case .spikeEssential:
self.connectedHub = Spike.EssentialHub()
default:
return false
}

Expand Down
2 changes: 1 addition & 1 deletion BoostRemote/Settings.bundle/Root.plist
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>DefaultValue</key>
<string>1.9.2</string>
<string>1.9.3</string>
<key>Title</key>
<string>Version</string>
<key>Key</key>
Expand Down
2 changes: 1 addition & 1 deletion BoostRemote/State.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import ReSwift
import BoostBLEKit

struct State: StateType {
struct State {

var connectionState: ConnectionState
var portState: PortState
Expand Down
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "ReSwift/ReSwift" "5.0.0"
github "ReactiveCocoa/ReactiveSwift" "6.5.0"
github "bricklife/BoostBLEKit" "3.4.0"
github "ReSwift/ReSwift" "6.1.0"
github "ReactiveCocoa/ReactiveSwift" "6.7.0"
github "bricklife/BoostBLEKit" "3.5.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReSwift
Submodule ReSwift updated 38 files
+20 −16 .travis.yml
+37 −3 CHANGELOG.md
+6 −9 Docs/Getting Started Guide.md
+2 −5 Docs/State.md
+1 −1 [email protected]
+2 −2 Podfile.lock
+28 −4 README.md
+4 −4 ReSwift.podspec
+29 −7 ReSwift.xcodeproj/project.pbxproj
+12 −16 ReSwift.xcodeproj/xcshareddata/xcschemes/ReSwift-iOS.xcscheme
+12 −16 ReSwift.xcodeproj/xcshareddata/xcschemes/ReSwift-macOS.xcscheme
+12 −16 ReSwift.xcodeproj/xcshareddata/xcschemes/ReSwift-tvOS.xcscheme
+3 −7 ReSwift.xcodeproj/xcshareddata/xcschemes/ReSwift-watchOS.xcscheme
+1 −1 ReSwift/CoreTypes/Action.swift
+2 −0 ReSwift/CoreTypes/DispatchingStoreType.swift
+1 −1 ReSwift/CoreTypes/Middleware.swift
+1 −1 ReSwift/CoreTypes/Reducer.swift
+4 −1 ReSwift/CoreTypes/State.swift
+30 −21 ReSwift/CoreTypes/Store.swift
+2 −2 ReSwift/CoreTypes/StoreSubscriber.swift
+21 −2 ReSwift/CoreTypes/StoreType.swift
+10 −1 ReSwift/CoreTypes/Subscription.swift
+1 −1 ReSwift/Info.plist
+1 −1 ReSwift/ReSwift.h
+1 −1 ReSwift/Utils/Coding.swift
+26 −0 ReSwift/Utils/Synchronized.swift
+5 −5 ReSwift/Utils/TypeHelper.swift
+24 −5 ReSwiftTests/AutomaticallySkipRepeatsTests.swift
+3 −1 ReSwiftTests/PerformanceTests.swift
+1 −1 ReSwiftTests/StoreDispatchTests.swift
+35 −5 ReSwiftTests/StoreMiddlewareTests.swift
+225 −23 ReSwiftTests/StoreSubscriberTests.swift
+6 −16 ReSwiftTests/StoreSubscriptionTests.swift
+3 −3 ReSwiftTests/StoreTests.swift
+63 −0 ReSwiftTests/SynchronizedTests.swift
+6 −6 ReSwiftTests/TestFakes.swift
+3 −3 ReSwiftTests/TypeHelperTests.swift
+2 −0 ReSwiftTests/XCTest+Compatibility.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveSwift
Submodule ReactiveSwift updated 59 files
+2 −2 .github/workflows/master.yml
+1 −0 .gitignore
+1 −1 .gitmodules
+66 −22 CHANGELOG.md
+3 −3 Cartfile.private
+3 −3 Cartfile.resolved
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+1 −1 Carthage/Checkouts/xcconfigs
+1 −1 Documentation/RxCheatsheet.md
+22 −4 Package.resolved
+2 −2 Package.swift
+1 −1 README.md
+3 −3 ReactiveSwift.podspec
+414 −153 ReactiveSwift.xcodeproj/project.pbxproj
+20 −4 Sources/Atomic.swift
+1 −1 Sources/Disposable.swift
+70 −628 Sources/Event.swift
+1 −1 Sources/Lifetime.swift
+24 −0 Sources/Observers/AttemptMap.swift
+62 −0 Sources/Observers/Collect.swift
+78 −0 Sources/Observers/CollectEvery.swift
+23 −0 Sources/Observers/CombinePrevious.swift
+21 −0 Sources/Observers/CompactMap.swift
+77 −0 Sources/Observers/Debounce.swift
+44 −0 Sources/Observers/Delay.swift
+31 −0 Sources/Observers/Dematerialize.swift
+27 −0 Sources/Observers/DematerializeResults.swift
+21 −0 Sources/Observers/Filter.swift
+43 −0 Sources/Observers/LazyMap.swift
+19 −0 Sources/Observers/Map.swift
+26 −0 Sources/Observers/MapError.swift
+24 −0 Sources/Observers/Materialize.swift
+25 −0 Sources/Observers/MaterializeAsResult.swift
+10 −0 Sources/Observers/ObserveOn.swift
+48 −0 Sources/Observers/Observer.swift
+1 −0 Sources/Observers/Operators.swift
+25 −0 Sources/Observers/Reduce.swift
+22 −0 Sources/Observers/ScanMap.swift
+26 −0 Sources/Observers/SkipFirst.swift
+26 −0 Sources/Observers/SkipRepeats.swift
+24 −0 Sources/Observers/SkipWhile.swift
+29 −0 Sources/Observers/TakeFirst.swift
+36 −0 Sources/Observers/TakeLast.swift
+23 −0 Sources/Observers/TakeWhile.swift
+64 −0 Sources/Observers/Throttle.swift
+77 −0 Sources/Observers/UnaryAsyncOperator.swift
+26 −0 Sources/Observers/UniqueValues.swift
+22 −15 Sources/Property.swift
+12 −1 Sources/Scheduler.swift
+16 −1 Sources/Signal.Observer.swift
+167 −16 Sources/Signal.swift
+110 −4 Sources/SignalProducer.swift
+3 −3 Tests/ReactiveSwiftTests/QueueScheduler+Factory.swift
+10 −1 Tests/ReactiveSwiftTests/SchedulerSpec.swift
+2 −2 Tests/ReactiveSwiftTests/SignalProducerNimbleMatchers.swift
+71 −3 Tests/ReactiveSwiftTests/SignalProducerSpec.swift
+46 −1 Tests/ReactiveSwiftTests/SignalSpec.swift
+19 −0 script/carthage

0 comments on commit de029cf

Please sign in to comment.