Skip to content

Commit

Permalink
Merge pull request #165 from yandexmobile/arm64
Browse files Browse the repository at this point in the history
Arm64
  • Loading branch information
likhogrud committed Dec 17, 2014
2 parents 764db51 + ea1c227 commit 5dceaba
Show file tree
Hide file tree
Showing 13 changed files with 111 additions and 26 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source "http://rubygems.org"

gem 'cocoapods', "~> 0.34.4"
6 changes: 5 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -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

28 changes: 22 additions & 6 deletions YandexMapKitSample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 = "<group>"; };
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 = "<group>"; };
72BE58BC16EF26EE000ADC42 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../Default-568h@2x.png"; sourceTree = "<group>"; };
72D763BA16EF6AC1003C951F /* YMKSMovingAnnotationsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMKSMovingAnnotationsViewController.h; sourceTree = "<group>"; };
72D763BB16EF6AC1003C951F /* YMKSMovingAnnotationsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMKSMovingAnnotationsViewController.m; sourceTree = "<group>"; };
Expand All @@ -100,7 +102,9 @@
76FC1D5815923E4B00A757A3 /* SettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsViewController.xib; sourceTree = "<group>"; };
76FC1D5B1592437300A757A3 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; };
76FC1D5C1592437300A757A3 /* Settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Settings.m; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
C940DD2214264F8C004DB73E /* MapLayersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapLayersViewController.h; sourceTree = "<group>"; };
C940DD2314264F8C004DB73E /* MapLayersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapLayersViewController.m; sourceTree = "<group>"; };
C940DD2514265AFF004DB73E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../Default.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -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 = "<group>";
};
72D763B916EF6A45003C951F /* Moving Annotations */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -264,7 +278,7 @@
C96EECAB1423899B00F3D0CF /* YandexMapKitSample */,
C96EECA41423899B00F3D0CF /* Frameworks */,
C96EECA21423899B00F3D0CF /* Products */,
27CD1BCB868E41B6AA51E821 /* Pods.xcconfig */,
58326342009CD5A3FC12BDDA /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -312,6 +326,7 @@
76FC1D5515923DE800A757A3 /* Settings */,
C9D721A7142623AE00711704 /* Yandex MapKit Samples */,
C96EECAC1423899B00F3D0CF /* Supporting Files */,
AA9760971A372DE3000F8586 /* LaunchScreen.xib */,
);
path = YandexMapKitSample;
sourceTree = "<group>";
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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 */

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
11 changes: 10 additions & 1 deletion YandexMapKitSample.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,37 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>885E977A-BFD2-488E-A074-75A70A14BB02</string>
<string>4D25AFA8-576F-4915-B1CD-600329E9A3F2</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>
<key>5311E78A5807F03A8B0E75EF4362449966CA5B4F</key>
<string>https://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>
<key>5311E78A5807F03A8B0E75EF4362449966CA5B4F</key>
<string>..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>ssh://github.com/yandexmobile/yandexmapkit-ios.git</string>
<string>https://github.com/yandexmobile/yandexmapkit-ios.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>E66839EE-7A2F-4B5E-AF90-22680F6C400D</string>
<string>5311E78A5807F03A8B0E75EF4362449966CA5B4F</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>E66839EE-7A2F-4B5E-AF90-22680F6C400D</string>
<string>5311E78A5807F03A8B0E75EF4362449966CA5B4F</string>
<key>IDESourceControlWCCName</key>
<string>yandexmapkit-ios</string>
</dict>
Expand Down
4 changes: 4 additions & 0 deletions YandexMapKitSample/AnnotationDetailViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ - (void)viewDidUnload {
[super viewDidUnload];
}

- (UIRectEdge)edgesForExtendedLayout {
return UIRectEdgeNone;
}

#pragma mark - Helpers

- (void)configureAnnotationDetail {
Expand Down
33 changes: 33 additions & 0 deletions YandexMapKitSample/LaunchScreen.xib
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="YandexMapKitSample" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="Kid-kn-2rF"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="404" y="445"/>
</view>
</objects>
</document>
4 changes: 4 additions & 0 deletions YandexMapKitSample/YandexMapKitSample-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationWhenInUseUsageDescription</key>
<string>""</string>
<key>NSMainNibFile</key>
<string>MainWindow</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
2 changes: 1 addition & 1 deletion YandexMapKitSample/YandexMapKitSampleAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
8 changes: 8 additions & 0 deletions yxbuildkit-prebuild.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

source ~/.rvm/scripts/rvm

bundle install && \
pod install


3 changes: 2 additions & 1 deletion yxbuildkit.config
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5dceaba

Please sign in to comment.