Merge pull request #103 from fassko/develop

#102
fassko · Jan 14, 2018 · 1a4606e · 1a4606e
2 parents c6a60b1 + 8a28043
commit 1a4606e
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 23 deletions.
diff --git a/Dodies.lv.xcodeproj/project.pbxproj b/Dodies.lv.xcodeproj/project.pbxproj
@@ -774,7 +774,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 20161105.153542;
+				CURRENT_PROJECT_VERSION = 1.7.180108.2219;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -830,7 +830,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 20161105.153542;
+				CURRENT_PROJECT_VERSION = 1.7.180108.2219;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;

diff --git a/Dodies.lv/Info.plist b/Dodies.lv/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2017111114.21</string>
+	<string>1.7.180108.2219</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
@@ -57,9 +57,9 @@
 		<true/>
 	</dict>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Please allow to use your location!</string>
+	<string>Please allow to use your location to show the Dodies.lv hiking trails.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Please allow to use your location!</string>
+	<string>Please allow to use your location to show the Dodies.lv hiking trails.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>location</string>

diff --git a/Dodies.lvUITests/Info.plist b/Dodies.lvUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>1.7.180108.2219</string>
 </dict>
 </plist>
diff --git a/Podfile b/Podfile
@@ -5,9 +5,9 @@ target 'Dodies.lv' do
   pod 'SwiftSpinner'
   pod 'Fabric'
   pod 'Crashlytics'
-  pod 'RealmSwift'
   pod 'Localize-Swift'
   pod 'Mapbox-iOS-SDK'
   pod 'Kingfisher'
   pod 'Lightbox'
+  pod 'RealmSwift'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -43,6 +43,6 @@ SPEC CHECKSUMS:
   RealmSwift: 695393add1b8f9d5fa75dd16e6355cf3935f71e2
   SwiftSpinner: 4c058c7a1d6b444dd2e1d70988ead40783097133
 
-PODFILE CHECKSUM: 69ae4e7a07d31a2b69fd4109e0d18b5de583eddd
+PODFILE CHECKSUM: 40251a4f2bb77e1fd3ac0747aea0eac2e11d4016
 
 COCOAPODS: 1.3.1
diff --git a/fastlane/README.md b/fastlane/README.md
@@ -48,23 +48,11 @@ Circle CI lane
 fastlane ios travis
 ```
 Travis lane
-### ios beta
-```
-fastlane ios beta
-```
-Submit a new Beta Build to Apple TestFlight
-
-This will also make sure the profile is up to date
 ### ios release
 ```
 fastlane ios release
 ```
 
-### ios build
-```
-fastlane ios build
-```
-
 
 ----
 

diff --git a/fastlane/report.xml b/fastlane/report.xml
@@ -5,17 +5,37 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: update_fastlane" time="2.726644">
+      <testcase classname="fastlane.lanes" name="0: update_fastlane" time="3.564211">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.002313">
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.002564">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: scan" time="170.830189">
+      <testcase classname="fastlane.lanes" name="2: get_version_number" time="1.055783">
+
+      </testcase>
+
+
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="3.056964">
+
+      </testcase>
+
+
+      <testcase classname="fastlane.lanes" name="4: clear_derived_data" time="3.613616">
+
+      </testcase>
+
+
+      <testcase classname="fastlane.lanes" name="5: gym" time="304.425363">
+
+      </testcase>
+
+
+      <testcase classname="fastlane.lanes" name="6: testflight" time="115.823874">
 
       </testcase>