Merge branch 'dvor/updating-toxcore' into develop

SmartFreedom · Aug 22, 2017 · 135d8b0 · 135d8b0
2 parents 765839f + 15c6ab3
commit 135d8b0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
+### Changed
+- Migrating to toxcore 0.1.10.
 
 ## [1.3.4] - 2017-01-24
 ### Changed

diff --git a/Podfile b/Podfile
@@ -6,7 +6,7 @@ platform :ios, '8.0'
 inhibit_all_warnings!
 
 def common_pods
-    pod 'objcTox', :git => 'https://github.com/Antidote-for-Tox/objcTox.git', :commit => '6b1919878ade15a4d4025287287c07ca289acd7b'
+    pod 'objcTox', :git => 'https://github.com/Antidote-for-Tox/objcTox.git', :commit => '14dd4d20a76ec6eaf049fffa8bc455c3db944d41'
     pod 'UITextView+Placeholder', '~> 1.1.0'
     pod 'SDCAlertView', '~> 2.5.4'
     pod 'LNNotificationsUI', :git => 'https://github.com/LeoNatan/LNNotificationsUI.git', :commit => '3f75043fc6e77b4180b76cb6cfff4faa506ab9fc'

diff --git a/Podfile.lock b/Podfile.lock
@@ -11,10 +11,10 @@ PODS:
   - libopus-patched-config/float (1.1)
   - libsodium (1.0.12)
   - LNNotificationsUI (0.0.1)
-  - objcTox (0.6.0):
+  - objcTox (0.7.0):
     - CocoaLumberjack (= 1.9.2)
     - Realm (= 1.0.1)
-    - toxcore (= 0.1.7)
+    - toxcore (= 0.1.10)
     - TPCircularBuffer (~> 0.0.1)
   - RBBAnimation (0.4.0)
   - Realm (1.0.1):
@@ -24,7 +24,7 @@ PODS:
     - RBBAnimation (~> 0.3)
     - SDCAutoLayout (~> 2.0)
   - SDCAutoLayout (2.0.3)
-  - toxcore (0.1.7):
+  - toxcore (0.1.10):
     - libopus-patched-config (= 1.1)
     - libsodium (~> 1.0.1)
   - TPCircularBuffer (0.0.1)
@@ -34,7 +34,7 @@ DEPENDENCIES:
   - FBSnapshotTestCase/Core
   - JGProgressHUD (~> 1.4.0)
   - LNNotificationsUI (from `https://github.com/LeoNatan/LNNotificationsUI.git`, commit `3f75043fc6e77b4180b76cb6cfff4faa506ab9fc`)
-  - objcTox (from `https://github.com/Antidote-for-Tox/objcTox.git`, commit `6b1919878ade15a4d4025287287c07ca289acd7b`)
+  - objcTox (from `https://github.com/Antidote-for-Tox/objcTox.git`, commit `14dd4d20a76ec6eaf049fffa8bc455c3db944d41`)
   - SDCAlertView (~> 2.5.4)
   - UITextView+Placeholder (~> 1.1.0)
 
@@ -43,15 +43,15 @@ EXTERNAL SOURCES:
     :commit: 3f75043fc6e77b4180b76cb6cfff4faa506ab9fc
     :git: https://github.com/LeoNatan/LNNotificationsUI.git
   objcTox:
-    :commit: 6b1919878ade15a4d4025287287c07ca289acd7b
+    :commit: 14dd4d20a76ec6eaf049fffa8bc455c3db944d41
     :git: https://github.com/Antidote-for-Tox/objcTox.git
 
 CHECKOUT OPTIONS:
   LNNotificationsUI:
     :commit: 3f75043fc6e77b4180b76cb6cfff4faa506ab9fc
     :git: https://github.com/LeoNatan/LNNotificationsUI.git
   objcTox:
-    :commit: 6b1919878ade15a4d4025287287c07ca289acd7b
+    :commit: 14dd4d20a76ec6eaf049fffa8bc455c3db944d41
     :git: https://github.com/Antidote-for-Tox/objcTox.git
 
 SPEC CHECKSUMS:
@@ -61,15 +61,15 @@ SPEC CHECKSUMS:
   libopus-patched-config: 12321105eb4b96e869b7957f3122345fd67928c3
   libsodium: 9a8faa5ef2fa0d2d57bd7f7d79bf8fb7c1a9f0ea
   LNNotificationsUI: 6a091898a701a5d6dbe2edda6657c9d28c100647
-  objcTox: a182e2aa3f9b421ec7d99c11e890f1c5054b2496
+  objcTox: 7940b083e2405b218a1c86efc97f15c2e9072dab
   RBBAnimation: 4b2d66f6d993febce63cd564da934985313b9c59
   Realm: 2e15e39d35b08abb529e212ed5d8af107b5236c8
   SDCAlertView: 2e2b0ecc5f1ec367e45d83efa2e512688ca7fa55
   SDCAutoLayout: e6885bb39ab8e2ec2ff84d158f38035f025f7420
-  toxcore: c6fe374b680066ee524d4ee4c3650648f3e64bf8
+  toxcore: fcb63df0a1df64042644e53f648725cf93566691
   TPCircularBuffer: 949e9632b9fb99b7274d7b2296ee22bff5841e35
   UITextView+Placeholder: a6fc3e0378f3870036ec562a7537cbf6dbae4bf6
 
-PODFILE CHECKSUM: 0dbe3a9fc75e8d8451747ad2769ee973db778a4c
+PODFILE CHECKSUM: 49baded95fc3354b2061c099ff47778ed0399acf
 
 COCOAPODS: 1.1.1