diff --git a/.gitignore b/.gitignore index fd7c351..d259940 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,15 @@ docs *.tm_build_errors *.perspectivev3 xcuserdata +project.xcworkspace +Resources/data-geo +Gemfile.lock .idea +Resources/Suggest/output +Resources/data-categories +Resources/data-geo +Frank/frankified_build +Frank/lib/xcode_environment.yml Pods +YandexMaps.xcworkspace/xcshareddata/ Podfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..59b3c25 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "http://rubygems.org" + +gem 'cocoapods', "~> 0.34.4" diff --git a/Podfile b/Podfile index 0199e5f..63acb6c 100644 --- a/Podfile +++ b/Podfile @@ -1,7 +1,11 @@ + +source 'https://github.com/CocoaPods/Specs.git' + platform :ios, '5.0' if ENV['YANDEX_DEV'] pod 'YandexMapKit', :path => "#{ENV['BINBUILDS_FOLDER']}/yandex-mapkit-ios" else - pod 'YandexMapKit', '>= 1.0.5' + pod 'YandexMapKit', '1.0.7' end + diff --git a/YandexMapKitSample.xcodeproj/project.pbxproj b/YandexMapKitSample.xcodeproj/project.pbxproj index 1d29df3..9ee0575 100644 --- a/YandexMapKitSample.xcodeproj/project.pbxproj +++ b/YandexMapKitSample.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ 76FC1D5915923E4B00A757A3 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76FC1D5715923E4B00A757A3 /* SettingsViewController.m */; }; 76FC1D5A15923E4B00A757A3 /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76FC1D5815923E4B00A757A3 /* SettingsViewController.xib */; }; 76FC1D5D1592437300A757A3 /* Settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 76FC1D5C1592437300A757A3 /* Settings.m */; }; + AA9760981A372DE3000F8586 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA9760971A372DE3000F8586 /* LaunchScreen.xib */; }; C940DD2414264F8C004DB73E /* MapLayersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C940DD2314264F8C004DB73E /* MapLayersViewController.m */; }; C940DD2614265AFF004DB73E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = C940DD2514265AFF004DB73E /* Default.png */; }; C940DD2814265B02004DB73E /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C940DD2714265B02004DB73E /* Default@2x.png */; }; @@ -83,7 +84,8 @@ /* Begin PBXFileReference section */ 00FCBC761683641200A353D2 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 00FCBCA11683649C00A353D2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - 27CD1BCB868E41B6AA51E821 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; }; + 0264A400291A97803C1EA8C6 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; + 36D0975826F11C4620209739 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 72BE58BC16EF26EE000ADC42 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../Default-568h@2x.png"; sourceTree = ""; }; 72D763BA16EF6AC1003C951F /* YMKSMovingAnnotationsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMKSMovingAnnotationsViewController.h; sourceTree = ""; }; 72D763BB16EF6AC1003C951F /* YMKSMovingAnnotationsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMKSMovingAnnotationsViewController.m; sourceTree = ""; }; @@ -100,7 +102,9 @@ 76FC1D5815923E4B00A757A3 /* SettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsViewController.xib; sourceTree = ""; }; 76FC1D5B1592437300A757A3 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = ""; }; 76FC1D5C1592437300A757A3 /* Settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Settings.m; sourceTree = ""; }; + 7DFC8DB782D6C1B3C23371DC /* Pods.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.adhoc.xcconfig; path = "Pods/Target Support Files/Pods/Pods.adhoc.xcconfig"; sourceTree = ""; }; 9C41CFFBA6954A8192BC0B91 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; + AA9760971A372DE3000F8586 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = ""; }; C940DD2214264F8C004DB73E /* MapLayersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapLayersViewController.h; sourceTree = ""; }; C940DD2314264F8C004DB73E /* MapLayersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapLayersViewController.m; sourceTree = ""; }; C940DD2514265AFF004DB73E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../Default.png; sourceTree = ""; }; @@ -206,6 +210,16 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 58326342009CD5A3FC12BDDA /* Pods */ = { + isa = PBXGroup; + children = ( + 0264A400291A97803C1EA8C6 /* Pods.debug.xcconfig */, + 36D0975826F11C4620209739 /* Pods.release.xcconfig */, + 7DFC8DB782D6C1B3C23371DC /* Pods.adhoc.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; 72D763B916EF6A45003C951F /* Moving Annotations */ = { isa = PBXGroup; children = ( @@ -264,7 +278,7 @@ C96EECAB1423899B00F3D0CF /* YandexMapKitSample */, C96EECA41423899B00F3D0CF /* Frameworks */, C96EECA21423899B00F3D0CF /* Products */, - 27CD1BCB868E41B6AA51E821 /* Pods.xcconfig */, + 58326342009CD5A3FC12BDDA /* Pods */, ); sourceTree = ""; }; @@ -312,6 +326,7 @@ 76FC1D5515923DE800A757A3 /* Settings */, C9D721A7142623AE00711704 /* Yandex MapKit Samples */, C96EECAC1423899B00F3D0CF /* Supporting Files */, + AA9760971A372DE3000F8586 /* LaunchScreen.xib */, ); path = YandexMapKitSample; sourceTree = ""; @@ -527,6 +542,7 @@ C9D721C11426363900711704 /* CalloutView.xib in Resources */, C9D721C91426401200711704 /* yandex.png in Resources */, C940DD2614265AFF004DB73E /* Default.png in Resources */, + AA9760981A372DE3000F8586 /* LaunchScreen.xib in Resources */, C940DD2814265B02004DB73E /* Default@2x.png in Resources */, C994BA001496ACD400980A9E /* OnScreenButtonsViewController.xib in Resources */, C9B49A5A1496AE570090387C /* ZoomMinus.png in Resources */, @@ -569,7 +585,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -645,7 +661,7 @@ }; C96A65C6142669AE00E23D26 /* AdHoc */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 27CD1BCB868E41B6AA51E821 /* Pods.xcconfig */; + baseConfigurationReference = 7DFC8DB782D6C1B3C23371DC /* Pods.adhoc.xcconfig */; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -701,7 +717,7 @@ }; C96EECC31423899B00F3D0CF /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 27CD1BCB868E41B6AA51E821 /* Pods.xcconfig */; + baseConfigurationReference = 0264A400291A97803C1EA8C6 /* Pods.debug.xcconfig */; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -714,7 +730,7 @@ }; C96EECC41423899B00F3D0CF /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 27CD1BCB868E41B6AA51E821 /* Pods.xcconfig */; + baseConfigurationReference = 36D0975826F11C4620209739 /* Pods.release.xcconfig */; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/YandexMapKitSample.xcworkspace/contents.xcworkspacedata b/YandexMapKitSample.xcworkspace/contents.xcworkspacedata index 9721f0a..19187ef 100644 --- a/YandexMapKitSample.xcworkspace/contents.xcworkspacedata +++ b/YandexMapKitSample.xcworkspace/contents.xcworkspacedata @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + diff --git a/YandexMapKitSample.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/YandexMapKitSample.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index 08de0be..0000000 --- a/YandexMapKitSample.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded - - - diff --git a/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout b/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout index 92c824c..ae4155e 100644 --- a/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout +++ b/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout @@ -2,35 +2,37 @@ + IDESourceControlProjectFavoriteDictionaryKey + IDESourceControlProjectIdentifier - 885E977A-BFD2-488E-A074-75A70A14BB02 + 4D25AFA8-576F-4915-B1CD-600329E9A3F2 IDESourceControlProjectName YandexMapKitSample IDESourceControlProjectOriginsDictionary - E66839EE-7A2F-4B5E-AF90-22680F6C400D - ssh://github.com/yandexmobile/yandexmapkit-ios.git + 5311E78A5807F03A8B0E75EF4362449966CA5B4F + https://github.com/yandexmobile/yandexmapkit-ios.git IDESourceControlProjectPath YandexMapKitSample.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - E66839EE-7A2F-4B5E-AF90-22680F6C400D + 5311E78A5807F03A8B0E75EF4362449966CA5B4F .. IDESourceControlProjectURL - ssh://github.com/yandexmobile/yandexmapkit-ios.git + https://github.com/yandexmobile/yandexmapkit-ios.git IDESourceControlProjectVersion - 110 + 111 IDESourceControlProjectWCCIdentifier - E66839EE-7A2F-4B5E-AF90-22680F6C400D + 5311E78A5807F03A8B0E75EF4362449966CA5B4F IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - E66839EE-7A2F-4B5E-AF90-22680F6C400D + 5311E78A5807F03A8B0E75EF4362449966CA5B4F IDESourceControlWCCName yandexmapkit-ios diff --git a/YandexMapKitSample/AnnotationDetailViewController.m b/YandexMapKitSample/AnnotationDetailViewController.m index 6bdb1cc..b5bbf85 100644 --- a/YandexMapKitSample/AnnotationDetailViewController.m +++ b/YandexMapKitSample/AnnotationDetailViewController.m @@ -38,6 +38,10 @@ - (void)viewDidUnload { [super viewDidUnload]; } +- (UIRectEdge)edgesForExtendedLayout { + return UIRectEdgeNone; +} + #pragma mark - Helpers - (void)configureAnnotationDetail { diff --git a/YandexMapKitSample/LaunchScreen.xib b/YandexMapKitSample/LaunchScreen.xib new file mode 100644 index 0000000..c21a0a6 --- /dev/null +++ b/YandexMapKitSample/LaunchScreen.xib @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/YandexMapKitSample/YandexMapKitSample-Info.plist b/YandexMapKitSample/YandexMapKitSample-Info.plist index 6795142..49ce252 100644 --- a/YandexMapKitSample/YandexMapKitSample-Info.plist +++ b/YandexMapKitSample/YandexMapKitSample-Info.plist @@ -26,8 +26,12 @@ 1.0 LSRequiresIPhoneOS + NSLocationWhenInUseUsageDescription + "" NSMainNibFile MainWindow + UILaunchStoryboardName + LaunchScreen UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/YandexMapKitSample/YandexMapKitSampleAppDelegate.m b/YandexMapKitSample/YandexMapKitSampleAppDelegate.m index 66036f4..f4ff999 100644 --- a/YandexMapKitSample/YandexMapKitSampleAppDelegate.m +++ b/YandexMapKitSample/YandexMapKitSampleAppDelegate.m @@ -25,7 +25,7 @@ @implementation YandexMapKitSampleAppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [YMKConfiguration sharedInstance].apiKey = [Settings sharedSettings].apiKey; - + self.window.rootViewController = self.navigationController; [self.window makeKeyAndVisible]; diff --git a/yxbuildkit-prebuild.sh b/yxbuildkit-prebuild.sh new file mode 100755 index 0000000..d09c255 --- /dev/null +++ b/yxbuildkit-prebuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + + source ~/.rvm/scripts/rvm + + bundle install && \ + pod install + + diff --git a/yxbuildkit.config b/yxbuildkit.config index a451339..a19a1c3 100644 --- a/yxbuildkit.config +++ b/yxbuildkit.config @@ -1,8 +1,9 @@ PREBUILD_SCRIPT=yxbuildkit-prebuild.sh POSTBUILD_SCRIPT=yxbuildkit-postbuild.sh -IPA_TITLE="ЯМапКит" +IPA_TITLE="YMK Sample" IPA_FILE=yamapkit-iphoneos.ipa CODE_SIGN_IDENTITY_AdHoc="iPhone Distribution: Yandex LLC" CODE_SIGN_IDENTITY_AppStore="iPhone Distribution: Yandex, LLC" APP_VERSION=100 YX_BUILD_KIT_DISABLE_VCS_TAG=1 +BUILD_USING_XCODE=Xcode6 \ No newline at end of file