Merge pull request #27 from bricklife/release/1.9.1

Release/1.9.1
bricklife · Nov 19, 2020 · 52fe74a · 52fe74a
2 parents fec9885 + c076c97
commit 52fe74a
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 408 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,19 +39,6 @@ playground.xcworkspace
 # Package.pins
 .build/
 
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-Carthage
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the

diff --git a/.gitmodules b/.gitmodules
diff --git a/BoostRemote.xcodeproj/project.pbxproj b/BoostRemote.xcodeproj/project.pbxproj
diff --git a/BoostRemote.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/BoostRemote.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/BoostRemote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BoostRemote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,34 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "BoostBLEKit",
+        "repositoryURL": "https://github.com/bricklife/BoostBLEKit.git",
+        "state": {
+          "branch": null,
+          "revision": "dd01e0cc61c82fb42eca5e57c1138ab48e231128",
+          "version": "3.4.0"
+        }
+      },
+      {
+        "package": "ReactiveSwift",
+        "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "e03cda84105ba707de039b757e2b2de868c65a3e",
+          "version": "6.5.0"
+        }
+      },
+      {
+        "package": "ReSwift",
+        "repositoryURL": "https://github.com/ReSwift/ReSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "b92762b5aa85c5e94053d942fbd37124ee939e5b",
+          "version": "5.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/BoostRemote/Settings.bundle/Root.plist b/BoostRemote/Settings.bundle/Root.plist
@@ -16,7 +16,7 @@
 			<key>Type</key>
 			<string>PSTitleValueSpecifier</string>
 			<key>DefaultValue</key>
-			<string>1.9.0</string>
+			<string>1.9.1</string>
 			<key>Title</key>
 			<string>Version</string>
 			<key>Key</key>

diff --git a/BoostRemote/de.lproj/InfoPlist.strings b/BoostRemote/de.lproj/InfoPlist.strings
@@ -1 +1,2 @@
 NSBluetoothPeripheralUsageDescription="Diese App verwendet Bluetooth LE zur Steuerung des LEGO BOOST Move Hub";
+NSBluetoothAlwaysUsageDescription="Diese App verwendet Bluetooth LE zur Steuerung des LEGO BOOST Move Hub";
diff --git a/BoostRemote/ja.lproj/InfoPlist.strings b/BoostRemote/ja.lproj/InfoPlist.strings
@@ -1 +1,2 @@
 NSBluetoothPeripheralUsageDescription="LEGO BOOST Move Hubを操作するためにBluetooth LEが必要です";
+NSBluetoothAlwaysUsageDescription="LEGO BOOST Move Hubを操作するためにBluetooth LEが必要です";
diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Carthage/Checkouts/BoostBLEKit b/Carthage/Checkouts/BoostBLEKit
diff --git a/Carthage/Checkouts/ReSwift b/Carthage/Checkouts/ReSwift
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		NSBluetoothPeripheralUsageDescription="Diese App verwendet Bluetooth LE zur Steuerung des LEGO BOOST Move Hub";
		NSBluetoothAlwaysUsageDescription="Diese App verwendet Bluetooth LE zur Steuerung des LEGO BOOST Move Hub";
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		NSBluetoothPeripheralUsageDescription="LEGO BOOST Move Hubを操作するためにBluetooth LEが必要です";
		NSBluetoothAlwaysUsageDescription="LEGO BOOST Move Hubを操作するためにBluetooth LEが必要です";