Merge pull request #29 from bricklife/release/1.9.2

Release/1.9.2
bricklife · Nov 20, 2020 · 3c2d949 · 3c2d949
2 parents 52fe74a + 4c73c8c
commit 3c2d949
Show file tree

Hide file tree

Showing 12 changed files with 353 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ DerivedData/
 xcuserdata/
 
 ## Other
+.DS_Store
 *.moved-aside
 *.xccheckout
 *.xcscmblueprint

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "Carthage/Checkouts/ReSwift"]
+	path = Carthage/Checkouts/ReSwift
+	url = https://github.com/ReSwift/ReSwift.git
+[submodule "Carthage/Checkouts/ReactiveSwift"]
+	path = Carthage/Checkouts/ReactiveSwift
+	url = https://github.com/ReactiveCocoa/ReactiveSwift.git
+[submodule "Carthage/Checkouts/BoostBLEKit"]
+	path = Carthage/Checkouts/BoostBLEKit
+	url = https://github.com/bricklife/BoostBLEKit.git
diff --git a/BoostRemote.xcodeproj/project.pbxproj b/BoostRemote.xcodeproj/project.pbxproj
diff --git a/BoostRemote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BoostRemote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/BoostRemote/Info.plist b/BoostRemote/Info.plist
@@ -20,6 +20,8 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>

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.1</string>
+			<string>1.9.2</string>
 			<key>Title</key>
 			<string>Version</string>
 			<key>Key</key>

diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,3 @@
+github "bricklife/BoostBLEKit"
+github "ReactiveCocoa/ReactiveSwift"
+github "ReSwift/ReSwift"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,3 @@
+github "ReSwift/ReSwift" "5.0.0"
+github "ReactiveCocoa/ReactiveSwift" "6.5.0"
+github "bricklife/BoostBLEKit" "3.4.0"
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
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ https://itunes.apple.com/us/app/boost-remote/id1270503610?ls=1&mt=8
 https://youtu.be/WuvGT8WqLrQ
 
 ## How to build
-1. Install [Xcode 11.2](https://developer.apple.com/xcode/)
+1. Install [Xcode 12.2](https://developer.apple.com/xcode/)
 2. Clone this repository including submodules
 3. Open `BoostRemote.xcodeproj`
 4. Build `BoostRemote` scheme