Prepare matrix-ios-console release 0.6.8

Author: giomfo

CHANGES.rst

@@ -1,3 +1,10 @@
+Changes in Console in 0.6.8 (2016-06-01)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.3.8).
+ * Change App badge handling: Replace the missed notifications count with the missed discussions count.
+
 Changes in Console in 0.6.6 (2016-04-26)
 ===============================================
 

Podfile

@@ -8,14 +8,14 @@ target "matrixConsole" do
 
 # Different flavours of pods to MatrixKit
 # The tagged version on which this version of Console has been built
-#pod 'MatrixKit', '~> 0.3.6'
+pod 'MatrixKit', '~> 0.3.8'
 
 # The lastest release available on the CocoaPods repository 
 #pod 'MatrixKit'
 
 # The develop branch version
-pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
-pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop'
+#pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
+#pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop'
 
 # The one used for developping both MatrixSDK and MatrixKit
 # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder
@@ -24,12 +24,6 @@ pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :br
 
 pod 'GBDeviceInfo', '~> 3.4.0'
 
-### OpenWebRTC call stack ###
-# The wrapper lib between MatrixSDK and OpenWebRTC-SDK
-pod 'OpenWebRTC', '0.3.1'
-pod 'MatrixOpenWebRTCWrapper', :git => 'https://github.com/matrix-org/matrix-ios-openwebrtc-wrapper.git', :branch => 'master'
-pod 'OpenWebRTC-SDK', :git => 'https://github.com/matrix-org/openwebrtc-ios-sdk.git', :branch => 'cvo_support'
-
 end
 
 target "matrixConsole" do

Podfile.lock

@@ -24,68 +24,25 @@ PODS:
     - GBJailbreakDetection (~> 1.0)
   - GBJailbreakDetection (1.3.0)
   - HPGrowingTextView (1.1)
-  - libPhoneNumber-iOS (0.8.11)
-  - MatrixKit (0.3.5):
+  - libPhoneNumber-iOS (0.8.13)
+  - MatrixKit (0.3.8):
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.8.7)
-    - MatrixSDK (~> 0.6.5)
-  - MatrixOpenWebRTCWrapper (0.0.2):
-    - MatrixSDK
-    - OpenWebRTC-SDK
-  - MatrixSDK (0.6.5):
+    - MatrixSDK (~> 0.6.8)
+  - MatrixSDK (0.6.8):
     - AFNetworking (~> 2.6.0)
-  - OpenWebRTC (0.3.1)
-  - OpenWebRTC-SDK (0.1.1):
-    - OpenWebRTC
 
 DEPENDENCIES:
   - GBDeviceInfo (~> 3.4.0)
-  - MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
-  - MatrixOpenWebRTCWrapper (from `https://github.com/matrix-org/matrix-ios-openwebrtc-wrapper.git`,
-    branch `master`)
-  - MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
-  - OpenWebRTC (= 0.3.1)
-  - OpenWebRTC-SDK (from `https://github.com/matrix-org/openwebrtc-ios-sdk.git`, branch
-    `cvo_support`)
-
-EXTERNAL SOURCES:
-  MatrixKit:
-    :branch: develop
-    :git: https://github.com/matrix-org/matrix-ios-kit.git
-  MatrixOpenWebRTCWrapper:
-    :branch: master
-    :git: https://github.com/matrix-org/matrix-ios-openwebrtc-wrapper.git
-  MatrixSDK:
-    :branch: develop
-    :git: https://github.com/matrix-org/matrix-ios-sdk.git
-  OpenWebRTC-SDK:
-    :branch: cvo_support
-    :git: https://github.com/matrix-org/openwebrtc-ios-sdk.git
-
-CHECKOUT OPTIONS:
-  MatrixKit:
-    :commit: b4cc5e3530216023fa78cadcae42624b8af1b60e
-    :git: https://github.com/matrix-org/matrix-ios-kit.git
-  MatrixOpenWebRTCWrapper:
-    :commit: cfe1429ac809a63dc2c1dd11da70c7e27be52f03
-    :git: https://github.com/matrix-org/matrix-ios-openwebrtc-wrapper.git
-  MatrixSDK:
-    :commit: 48e2580540dbd5bf312f75d60c8922f6e2ca11d5
-    :git: https://github.com/matrix-org/matrix-ios-sdk.git
-  OpenWebRTC-SDK:
-    :commit: eb8ce71475cdd1c2879279daff48be6264237fca
-    :git: https://github.com/matrix-org/openwebrtc-ios-sdk.git
+  - MatrixKit (~> 0.3.8)
 
 SPEC CHECKSUMS:
   AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
   GBDeviceInfo: bab0f43d351b6f641a626cd7d21492abef1afe46
   GBJailbreakDetection: a216773574b62dddb6c876ffdb52c54ac05e27e0
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
-  libPhoneNumber-iOS: ded33fab2c51ee847979556aa504c9e70f32d703
-  MatrixKit: defac2bf01d1397e00cf4b1a72a25ac10c2c901c
-  MatrixOpenWebRTCWrapper: c56ed570f9151853576c14f71cea7c7c57255830
-  MatrixSDK: 598925faff319441724db8a6af2a9cfc21d167e5
-  OpenWebRTC: 85be1caf6dc45b11106eacba93de61e3e52b1cf8
-  OpenWebRTC-SDK: fd66e49ab80e88ed1e55231ac875a4976dc3ba74
+  libPhoneNumber-iOS: 3a37004baf779b4262ab29a31a87d2ae668159d4
+  MatrixKit: 41e89abd182910c5f52a4e7239886552fd6e0a6b
+  MatrixSDK: 6810a9781ad61ac26a52bd127b136000af7eb622
 
 COCOAPODS: 0.39.0

matrixConsole/AppDelegate.m

@@ -28,7 +28,7 @@
 
 #import <AudioToolbox/AudioToolbox.h>
 
-#define MX_CALL_STACK_OPENWEBRTC
+//#define MX_CALL_STACK_OPENWEBRTC
 #ifdef MX_CALL_STACK_OPENWEBRTC
 #import <MatrixOpenWebRTCWrapper/MatrixOpenWebRTCWrapper.h>
 #endif

matrixConsole/Info.plist

@@ -30,7 +30,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.6</string>
+	<string>0.6.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>