ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-21 11:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Public/develop' into feature/update-readme

Browse Source
This commit is contained in:
Benjamin Scholtysik (Reimold)
2016-11-07 18:34:36 -08:00
parent d86b304484 6bcc374115
commit b4e2f44aa9
10 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.2
osx_image: xcode8
env:
global:
@@ -8,13 +8,11 @@ env:
- CONFIGURATION="DEBUG"
matrix:
- SCHEME="HockeySDK" DESTINATION="OS=8.1,name=iPhone 5" RUN_TESTS="YES"
- SCHEME="HockeySDK" DESTINATION="OS=8.4,name=iPhone 6" RUN_TESTS="YES"
- SCHEME="HockeySDK" DESTINATION="OS=9.0,name=iPad Air" RUN_TESTS="YES"
- SCHEME="HockeySDK" DESTINATION="OS=9.0,name=iPhone 6 Plus" RUN_TESTS="YES"
- SCHEME="HockeySDK" DESTINATION="OS=9.1,name=iPhone 6 Plus" RUN_TESTS="YES"
- SCHEME="HockeySDK" DESTINATION="OS=9.2,name=iPad Pro" RUN_TESTS="YES"
- SCHEME="HockeySDK" DESTINATION="OS=9.2,name=iPhone 6s" RUN_TESTS="YES"
- SCHEME="HockeySDK Framework" DESTINATION="platform=iOS Simulator,name=iPhone 6" RUN_TESTS="YES"
- SCHEME="HockeySDK" DESTINATION="OS=9.3,name=iPhone 6s" RUN_TESTS="YES"
- SCHEME="HockeySDK Framework" DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6" RUN_TESTS="YES"
- SCHEME="HockeySDK Distribution" RUN_TESTS="NO" LINT="YES"
before_install:
@@ -22,6 +20,7 @@ before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
- gem install xcpretty-travis-formatter --no-rdoc --no-ri --no-document --quiet
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- brew unlink carthage
- brew install carthage
script:
@@ -44,7 +43,7 @@ script:
- if [ $LINT == "YES" ]; then
cp -R Products/HockeySDK-iOS/ HockeySDK-iOS;
pod lib lint;
carthage build --no-skip-current;
carthage build --no-skip-current ;
fi
# Use better failure diagnostics, copied from https://github.com/0xced/XCDYouTubeKit

4
Classes/BITHockeyHelper.m
View File

@@ -617,7 +617,7 @@ NSString *bit_validAppIconStringFromIcons(NSBundle *resourceBundle, NSArray *ico
BOOL useHighResIcon = NO;
BOOL useiPadIcon = NO;
if ([UIScreen mainScreen].scale == 2.0f) useHighResIcon = YES;
if ([UIScreen mainScreen].scale >= 2.0f) useHighResIcon = YES;
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) useiPadIcon = YES;
NSString *currentBestMatch = nil;
@@ -1047,7 +1047,7 @@ UIImage *bit_appIcon() {
if (icons) {
BOOL useHighResIcon = NO;
if ([UIScreen mainScreen].scale == 2.0f) useHighResIcon = YES;
if ([UIScreen mainScreen].scale >= 2.0f) useHighResIcon = YES;
for(NSString *icon in icons) {
iconString = icon;

2
README.md
View File

@@ -162,7 +162,7 @@ Our examples will use the **default** SDK (`HockeySDK.embeddedframework`).
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool
```
4. Add the following lines to setup and start the Application Insights SDK:
4. Add the following lines to setup and start the HockeyApp SDK:
```swift
BITHockeyManager.shared().configure(withIdentifier: "cdef2c2b4ddf420b9cdf470a9667eb27")

2
Support/HockeySDK.xcodeproj/project.pbxproj
View File

@@ -1610,7 +1610,7 @@
isa = PBXProject;
attributes = {
LastTestingUpgradeCheck = 0600;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0810;
TargetAttributes = {
1EB6173E1B0A30480035A986 = {
CreatedOnToolsVersion = 6.3.1;

2
Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK Distribution.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK Documentation.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK Framework.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDKResources.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
Support/HockeySDKTests/BITHockeyHelperTests.m
View File

@@ -116,7 +116,7 @@
// Regular icon names
NSString *validIconPath = @"AppIcon";
NSString *validIconPath2x = @"AppIcon@2x";
NSString *expected = ([UIScreen mainScreen].scale == 2.0f) ? validIconPath2x : validIconPath;
NSString *expected = ([UIScreen mainScreen].scale >= 2.0f) ? validIconPath2x : validIconPath;
// No valid icons defined at all