Skip to content

Commit

Permalink
Merge pull request #26 from NordicSemiconductor/develop
Browse files Browse the repository at this point in the history
1.3.2
  • Loading branch information
mostafaberg authored Dec 12, 2017
2 parents 4e4988e + b183708 commit 06ad63e
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
* **Version 1.3.2**
- Bugfix: Fixed bug causing delete Thingy action sheet not to work on iPad causing a crash

* **Version 1.3.1**
- Bugfix: Fixed bug causing app to crash when deleting the first connected Thingy
- Improvement: iOS 11 UI refresh
- Improvement: iPhone X UI adaptation

* **Version 1.3.0**
- Improvement: Thingy SDK will now return nil instead of 0.0.0 on version reading if it's not ready.
- Improvement: All view presentations now are done from navigation controllers instead of detached views.
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PODS:
- Charts/Core (3.0.4)
- iOSDFULibrary (4.0.3):
- Zip (~> 1.0)
- IOSThingyLibrary (1.3.1):
- IOSThingyLibrary (1.3.2):
- iOSDFULibrary (~> 4.0)
- Keychain (0.3.1)
- SDCAlertView (8.0.1)
Expand All @@ -25,7 +25,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Charts: 0705898046257443f0afbbc3179f4b67507b6e48
iOSDFULibrary: 7a8fd23fb6a673ba311cd3821f8f5b4bd1eb1dce
IOSThingyLibrary: a7f55e186fc0c072f70b5d8e80aba1755372b896
IOSThingyLibrary: 71ec0e00b7bfcf0a95df19d34c6b527e0daca6e6
Keychain: ef812eafcf6593fe4409b07cfecc00b95fb373ed
SDCAlertView: 0dac88159108e755a78ca8d789b3b82305accae4
SWRevealViewController: 6d3fd97f70112fd7cef9de14df4260eacce4c63a
Expand Down
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/IOSThingyLibrary.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Example/ThingySDK/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.1</string>
<string>1.3.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>14</string>
<string>15</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NFCReaderUsageDescription</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@ class MainMenuViewController: UIViewController, UITableViewDataSource, UITableVi
alert.addAction(UIAlertAction(title: "Forget", style: .destructive) { (action) in
self.removePeripheral(peripheralToRemove, at: indexPath)
})
alert.popoverPresentationController?.permittedArrowDirections = [.up]
alert.popoverPresentationController?.sourceView = tableView.cellForRow(at: indexPath)
present(alert, animated: true)
}
}
Expand Down
2 changes: 1 addition & 1 deletion IOSThingyLibrary.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'IOSThingyLibrary'
s.version = '1.3.1'
s.version = '1.3.2'
s.summary = 'A Swift 4 SDK implementation for the Nordic:Thingy32 produced by Nordic Semiconductor'
s.description = <<-DESC
This is a mobile SDK for the Thingy:52 devices developed by Nordic Semiconductor, the Thingy
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Thingy SDK for iOS
```
target 'YourAppTargetName' do
use_frameworks!
pod 'IOSThingyLibrary', '~> 1.3.1'
pod 'IOSThingyLibrary', '~> 1.3.2'
end
```
- Install dependencies
Expand All @@ -21,7 +21,7 @@ pod install
**For Carthage:**
- Create a new **Cartfile** in your project's root with the following contents
```
github "NordicSemiconductor/NordicSemiconductor/IOS-Nordic-Thingy" ~> 1.3.1
github "NordicSemiconductor/NordicSemiconductor/IOS-Nordic-Thingy" ~> 1.3.2
```

- Build with carthage
Expand Down

0 comments on commit 06ad63e

Please sign in to comment.