Merge branch 'develop'

TravelKit.playground/Contents.swift

@@ -81,7 +81,7 @@ toursQuery.parentID = "city:1"
 toursQuery.sortingType = .price
 toursQuery.descendingSortingOrder = true
 
-travelKit._tours.tours(for: toursQuery) { (tours, error) in
+travelKit.tours.tours(for: toursQuery) { (tours, error) in
 	printLock.lock()
 	print("\nMost Expensive Tours in London:\n")
 	tours?.forEach({ (tour) in

TravelKit.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
   spec.name         = 'TravelKit'
-  spec.version      = '2.0'
+  spec.version      = '2.0.1'
   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/v2.0/TravelKit-2.0-iOS.zip' }
+  spec.source       = { :http => 'https://github.com/sygic-travel/apple-sdk/releases/download/v2.0.1/TravelKit-2.0.1-iOS.zip' }
   spec.documentation_url = 'http://docs.sygictravelapi.com/apple-sdk/latest'
   spec.module_name  = 'TravelKit'
 

TravelKit.xcodeproj/project.pbxproj

@@ -1252,8 +1252,8 @@
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_SWIFT_SYMBOLS = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TK_BUNDLE_BUILD = 234;
-				TK_BUNDLE_VERSION = 2.0;
+				TK_BUNDLE_BUILD = 236;
+				TK_BUNDLE_VERSION = 2.0.1;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1340,8 +1340,8 @@
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TK_BUNDLE_BUILD = 234;
-				TK_BUNDLE_VERSION = 2.0;
+				TK_BUNDLE_BUILD = 236;
+				TK_BUNDLE_VERSION = 2.0.1;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";

TravelKit/TKCollectionsQuery.m

@@ -27,10 +27,10 @@ -(NSUInteger)hash
 //	result = prime * result + self.isSelected?yesPrime:noPrime;
 
 	result = prime * result + [_parentPlaceID hash];
-	result = prime * result + [_placeIDs hash];
+	result = prime * result + [_placeIDs.description hash];
 	result = prime * result + _placeIDsMatching;
-	result = prime * result + [_tags hash];
-	result = prime * result + [_tagsToOmit hash];
+	result = prime * result + [_tags.description hash];
+	result = prime * result + [_tagsToOmit.description hash];
 	result = prime * result + [_searchTerm hash];
 	result = prime * result + [_limit hash];
 	result = prime * result + [_offset hash];

TravelKit/TKPlacesQuery.m

@@ -42,11 +42,11 @@ -(NSUInteger)hash
 	result = prime * result + _levels;
 	result = prime * result + _categories;
 	result = prime * result + _categoriesMatching;
-	result = prime * result + [_tags hash];
+	result = prime * result + [_tags.description hash];
 	result = prime * result + _tagsMatching;
-	result = prime * result + [_parentIDs hash];
+	result = prime * result + [_parentIDs.description hash];
 	result = prime * result + _parentIDsMatching;
-	result = prime * result + [_quadKeys hash];
+	result = prime * result + [_quadKeys.description hash];
 	result = prime * result + [_mapSpread hash];
 	result = prime * result + [_minimumRating hash];
 	result = prime * result + [_maximumRating hash];

TravelKit/TKToursManager.h

@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///---------------------------------------------------------------------------------------
 
 /// Shared Tours managing instance.
-@property (class, readonly, strong) TKToursManager *sharedManager DEPRECATED_MSG_ATTRIBUTE("Experimental.");
+@property (class, readonly, strong) TKToursManager *sharedManager;
 
 + (instancetype)new  UNAVAILABLE_ATTRIBUTE;
 - (instancetype)init UNAVAILABLE_ATTRIBUTE;
@@ -42,8 +42,6 @@ NS_ASSUME_NONNULL_BEGIN
 
  @param query `TKToursViatorQuery` object containing the desired attributes to look for.
  @param completion Completion block called on success or error.
-
- @note Experimental.
  */
 - (void)toursForViatorQuery:(TKToursViatorQuery *)query
 	completion:(void (^)(NSArray<TKTour *>  * _Nullable places, NSError * _Nullable error))completion;
@@ -55,8 +53,6 @@ NS_ASSUME_NONNULL_BEGIN
 
  @param query `TKToursGYGQuery` object containing the desired attributes to look for.
  @param completion Completion block called on success or error.
-
- @note Experimental.
  */
 - (void)toursForGYGQuery:(TKToursGYGQuery *)query
 	completion:(void (^)(NSArray<TKTour *>  * _Nullable places, NSError * _Nullable error))completion;

TravelKit/TravelKit.h

@@ -157,11 +157,8 @@ kit.APIKey = @"<YOUR_API_KEY_GOES_HERE>";
 
 /**
  Shared Tours Manager instance to provide Tours-related stuff.
-
- @warning Experimental.
  */
-@property (nonatomic, strong, readonly) TKToursManager *_tours
-	DEPRECATED_MSG_ATTRIBUTE("Experimental.");
+@property (nonatomic, strong, readonly) TKToursManager *tours;
 
 /**
  Shared Session Manager instance to provide Session-related stuff.

TravelKit/TravelKit.m

@@ -98,7 +98,7 @@ - (instancetype)init
 	if (self = [super init])
 	{
 		_places = [TKPlacesManager sharedManager];
-		__tours = [TKToursManager sharedManager];
+		_tours = [TKToursManager sharedManager];
 //		_trips = [TKTripsManager sharedManager];
 //		_session = [TKSessionManager sharedManager];
 //		_favorites = [TKFavoritesManager sharedManager];