Merge branch 'develop'

sygic-travel · Mar 10, 2021 · 25614dc · 25614dc
2 parents bd68952 + c462cf3
commit 25614dc
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/TravelKit.podspec b/TravelKit.podspec
@@ -2,12 +2,12 @@
 Pod::Spec.new do |spec|
 
   spec.name         = 'TravelKit'
-  spec.version      = '3.1.1'
+  spec.version      = '3.1.2'
   spec.license      = 'MIT'
   spec.homepage     = 'https://github.com/sygic-travel/apple-sdk'
   spec.authors      = 'Tripomatic s.r.o.', 'Michal Zelinka'
   spec.summary      = 'Travel SDK for travelling projects'
-  spec.source       = { :http => 'https://github.com/sygic-travel/apple-sdk/releases/download/v3.1.1/TravelKit-3.1.1-iOS.zip' }
+  spec.source       = { :http => 'https://github.com/sygic-travel/apple-sdk/releases/download/v3.1.2/TravelKit-3.1.2-iOS.zip' }
   spec.documentation_url = 'http://docs.sygictravelapi.com/apple-sdk/latest'
   spec.module_name  = 'TravelKit'
 

diff --git a/TravelKit.xcodeproj/project.pbxproj b/TravelKit.xcodeproj/project.pbxproj
@@ -931,7 +931,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = TK;
-				LastUpgradeCheck = 1220;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = Tripomatic;
 				TargetAttributes = {
 					D6B2A1281E530AFD005509E8 = {

diff --git a/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-iOS-Universal.xcscheme b/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-iOS-Universal.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-iOS.xcscheme b/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-macOS.xcscheme b/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-tvOS.xcscheme b/TravelKit.xcodeproj/xcshareddata/xcschemes/TravelKit-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/TravelKit/Config.xcconfig b/TravelKit/Config.xcconfig
@@ -9,5 +9,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-TK_BUNDLE_VERSION   = 3.1.1
-TK_BUNDLE_BUILD     = 304
+TK_BUNDLE_VERSION   = 3.1.2
+TK_BUNDLE_BUILD     = 307
diff --git a/TravelKit/TKTrip.m b/TravelKit/TKTrip.m
@@ -700,7 +700,7 @@ - (BOOL)isEqual:(TKTripInfo *)trip
 - (NSString *)description
 {
 	return [NSString stringWithFormat:@"<Trip Info | ID: %@>\n\t"
-		"Name = %@\n\tVersion = %tu\n\tStart date = %@\n\tDays count = %tu\n\tChanged = %c",
+		"Name = %@\n\tVersion = %tu\n\tStart date = %@\n\tDays count = %tu\n\tChanged = %d",
 			_ID, _name, _version, _startDate, _daysCount, _changed];
 }
 

diff --git a/TravelKit/Version.h b/TravelKit/Version.h
@@ -9,7 +9,7 @@
 #ifndef Version_h
 #define Version_h
 
-#define TRAVELKIT_VERSION   "3.1.1"
-#define TRAVELKIT_BUILD     304
+#define TRAVELKIT_VERSION   "3.1.2"
+#define TRAVELKIT_BUILD     307
 
 #endif /* Version_h */