Merge branch 'release-1.0.5' into develop

yandexmobile · Jul 24, 2013 · f512897 · f512897
2 parents da185d4 + d400786
commit f512897
Show file tree

Hide file tree

Showing 45 changed files with 335 additions and 403 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ docs
 xcuserdata
 .idea
 Pods
+Podfile.lock
diff --git a/Podfile b/Podfile
@@ -1,3 +1,7 @@
-platform :ios, :deployment_target => '5.0'
+platform :ios, '5.0'
 
-pod 'YandexMapKit', '~> 1.0'
+if ENV['YANDEX_DEV']
+  pod 'YandexMapKit', :path => "#{ENV['BINBUILDS_FOLDER']}/yandex-mapkit-ios"
+else
+  pod 'YandexMapKit', '>= 1.0.5'
+end
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/YandexMapKitSample.xcodeproj/project.pbxproj b/YandexMapKitSample.xcodeproj/project.pbxproj
@@ -28,7 +28,7 @@
 		C96EECA81423899B00F3D0CF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96EECA71423899B00F3D0CF /* Foundation.framework */; };
 		C96EECAA1423899B00F3D0CF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96EECA91423899B00F3D0CF /* CoreGraphics.framework */; };
 		C96EECB01423899B00F3D0CF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C96EECAE1423899B00F3D0CF /* InfoPlist.strings */; };
-		C96EECB21423899B00F3D0CF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C96EECB11423899B00F3D0CF /* main.m */; };
+		C96EECB21423899B00F3D0CF /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = C96EECB11423899B00F3D0CF /* main.mm */; };
 		C96EECB61423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C96EECB51423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m */; };
 		C96EECB91423899B00F3D0CF /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = C96EECB71423899B00F3D0CF /* MainWindow.xib */; };
 		C96EECD114238DB300F3D0CF /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96EECD014238DB300F3D0CF /* OpenGLES.framework */; };
@@ -111,7 +111,7 @@
 		C96EECA91423899B00F3D0CF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		C96EECAD1423899B00F3D0CF /* YandexMapKitSample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "YandexMapKitSample-Info.plist"; sourceTree = "<group>"; };
 		C96EECAF1423899B00F3D0CF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		C96EECB11423899B00F3D0CF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		C96EECB11423899B00F3D0CF /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		C96EECB31423899B00F3D0CF /* YandexMapKitSample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YandexMapKitSample-Prefix.pch"; sourceTree = "<group>"; };
 		C96EECB41423899B00F3D0CF /* YandexMapKitSampleAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YandexMapKitSampleAppDelegate.h; sourceTree = "<group>"; };
 		C96EECB51423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YandexMapKitSampleAppDelegate.m; sourceTree = "<group>"; };
@@ -324,7 +324,7 @@
 				C940DD2514265AFF004DB73E /* Default.png */,
 				C96EECAD1423899B00F3D0CF /* YandexMapKitSample-Info.plist */,
 				C96EECAE1423899B00F3D0CF /* InfoPlist.strings */,
-				C96EECB11423899B00F3D0CF /* main.m */,
+				C96EECB11423899B00F3D0CF /* main.mm */,
 				C96EECB31423899B00F3D0CF /* YandexMapKitSample-Prefix.pch */,
 			);
 			name = "Supporting Files";
@@ -493,6 +493,7 @@
 		C96EEC981423899B00F3D0CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = "–Ø–Ω–¥–µ–∫—Å";
 			};
 			buildConfigurationList = C96EEC9B1423899B00F3D0CF /* Build configuration list for PBXProject "YandexMapKitSample" */;
@@ -577,7 +578,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C96EECB21423899B00F3D0CF /* main.m in Sources */,
+				C96EECB21423899B00F3D0CF /* main.mm in Sources */,
 				C96EECB61423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m in Sources */,
 				C99C78621426193F00380582 /* MapViewController.m in Sources */,
 				C9D7219F14261C1B00711704 /* RootViewController.m in Sources */,
@@ -628,9 +629,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -663,20 +662,17 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/YandexMapKit/Headers";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "-all_load";
 				SDKROOT = iphoneos;
@@ -689,9 +685,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;

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

diff --git a/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout b/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>885E977A-BFD2-488E-A074-75A70A14BB02</string>
+	<key>IDESourceControlProjectName</key>
+	<string>YandexMapKitSample</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>E66839EE-7A2F-4B5E-AF90-22680F6C400D</key>
+		<string>ssh://github.com/yandexmobile/yandexmapkit-ios.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>YandexMapKitSample.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>E66839EE-7A2F-4B5E-AF90-22680F6C400D</key>
+		<string>..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/yandexmobile/yandexmapkit-ios.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>E66839EE-7A2F-4B5E-AF90-22680F6C400D</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>E66839EE-7A2F-4B5E-AF90-22680F6C400D</string>
+			<key>IDESourceControlWCCName</key>
+			<string>yandexmapkit-ios</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/YandexMapKitSample/AnnotationDetailViewController.h b/YandexMapKitSample/AnnotationDetailViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/AnnotationDetailViewController.m b/YandexMapKitSample/AnnotationDetailViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/AnnotationsViewController.h b/YandexMapKitSample/AnnotationsViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/AnnotationsViewController.m b/YandexMapKitSample/AnnotationsViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/CalloutView.h b/YandexMapKitSample/CalloutView.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/CalloutView.m b/YandexMapKitSample/CalloutView.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/CustomAnnotationViewController.h b/YandexMapKitSample/CustomAnnotationViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/CustomAnnotationViewController.m b/YandexMapKitSample/CustomAnnotationViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/CustomCalloutViewController.h b/YandexMapKitSample/CustomCalloutViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/CustomCalloutViewController.m b/YandexMapKitSample/CustomCalloutViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/DraggableAnnotationViewController.h b/YandexMapKitSample/DraggableAnnotationViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/DraggableAnnotationViewController.m b/YandexMapKitSample/DraggableAnnotationViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/MapLayersViewController.h b/YandexMapKitSample/MapLayersViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/MapLayersViewController.m b/YandexMapKitSample/MapLayersViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */
@@ -114,7 +114,7 @@ - (void)configureVisibleLayerSegmentedControl
 
 - (void)layerChange:(UISegmentedControl *)sender {
     NSInteger index = sender.selectedSegmentIndex;
-    YMKMapLayerInfo *layerInfo = [self.layers objectAtIndex:index];
+    YMKMapLayerInfo *layerInfo = self.layers[index];
     self.mapView.visibleLayerIdentifier = layerInfo.identifier;
 }
 

diff --git a/YandexMapKitSample/MapViewController.h b/YandexMapKitSample/MapViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/MapViewController.m b/YandexMapKitSample/MapViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/OnScreenButtonsViewController.h b/YandexMapKitSample/OnScreenButtonsViewController.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/OnScreenButtonsViewController.m b/YandexMapKitSample/OnScreenButtonsViewController.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/PointAnnotation.h b/YandexMapKitSample/PointAnnotation.h
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */

diff --git a/YandexMapKitSample/PointAnnotation.m b/YandexMapKitSample/PointAnnotation.m
@@ -3,8 +3,8 @@
  *
  * This file is a part of the Yandex Map Kit.
  *
- * Version for iOS © 2011-2012 YANDEX
- * 
+ * Version for iOS © 2011-2013 YANDEX
+ *
  * You may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,3 +11,4 @@ docs @@
     xcuserdata
     .idea
     Pods
+    Podfile.lock