Merge branch 'release/2.2.0'

Author: normansander

.travis.yml

@@ -3,8 +3,9 @@ language: objective-c
 xcode_project: CriticalMaps.xcodeproj
 
 before_install:
+- rvm use system
 - rvm install ruby-2.2.2
 - gem install cocoapods
 
-notifications:
-  slack: criticalmaps:kqEoZW8uAidSNHkWTh2uenaW
+# notifications:
+  # slack: criticalmaps:kqEoZW8uAidSNHkWTh2uenaW

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 Changelog for Critical Maps iOS
 
+## [2.2.0] - 2017-06-06
+### Changed
+- temporary API url
+
+### Updated
+- SDWebImage 
+- Appirater 2.1.2 (was 2.0.5)
+- STTwitter 0.2.6 (was 0.2.5)
+
 ## [2.1.0] - 2016-09-24
 ### Added
 - Changelog
@@ -21,4 +30,4 @@ Changelog for Critical Maps iOS
 ### Changed
 - redesign by zutrinken
 
-previous versions are not tracked
+previous versions are not tracked

CriticalMass/CriticalMaps-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0.1</string>
+	<string>2.2.0.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

CriticalMass/PLConstants.m

@@ -20,7 +20,7 @@ @implementation PLConstants
 BOOL const kDebugShowAppirater = NO;
 
 // Urls
-NSString *const kUrlService = @"http://api.criticalmaps.net/postv2";
+NSString *const kUrlService = @"https://criticalmaps-api.stephanlindauer.de/postv2";
 
 // Notifications
 NSString *const kNotificationInitialGpsDataReceived = @"initialGpsDataReceived";

Podfile.lock

@@ -15,13 +15,13 @@ PODS:
   - AFNetworking/Serialization (3.1.0)
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
-  - Appirater (2.0.5)
+  - Appirater (2.1.2)
   - NSString-Hashes (1.2.2)
   - SAMLoadingView (0.1.0)
-  - SDWebImage (3.8.2):
-    - SDWebImage/Core (= 3.8.2)
-  - SDWebImage/Core (3.8.2)
-  - STTwitter (0.2.5)
+  - SDWebImage (4.0.0):
+    - SDWebImage/Core (= 4.0.0)
+  - SDWebImage/Core (4.0.0)
+  - STTwitter (0.2.6)
   - TTTAttributedLabel (2.0.0)
 
 DEPENDENCIES:
@@ -37,13 +37,13 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   AccordionView: 4f82751476a96ec60985041a48bf4c94ac1ea5ab
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  Appirater: e7c0a47fb67ee5041ce8479e6ba960927fb40264
+  Appirater: f1c9e53e8b612193e6256144f6a0fd2e31f4340d
   NSString-Hashes: c3848d809e92650e4fb17db5d8cc4bd2aa1eaddd
   SAMLoadingView: 7ffc4f0efe85f9717d6e367b6b93e32befe4407c
-  SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
-  STTwitter: 5c157e8dcb4f0e4cf5b4374393021b7d7b7fd497
+  SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41
+  STTwitter: 30ee2f79eff78c3d633a1edc869e97db9c9ead59
   TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
 
 PODFILE CHECKSUM: d0ff173bc6ec07b51790de9163b1ee4ca8b6b8fd
 
-COCOAPODS: 1.1.0.rc.1
+COCOAPODS: 1.2.0.beta.1