From cb32df9338439325c360806f0cdf774f0ccd3a51 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Thu, 6 Oct 2016 11:43:03 -0700 Subject: [PATCH 01/14] use cocoapods pre --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bebdef7048..253d69adcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode8 env: global: @@ -21,7 +21,7 @@ before_install: - xcrun simctl list - 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 + - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet - brew install carthage script: From 17c68743e566d98bb87b6983c090925043bab990 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Thu, 6 Oct 2016 13:58:42 -0700 Subject: [PATCH 02/14] Remove carthage install as there seems it is installed already --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 253d69adcd..a58a5d5935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ 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 --pre --no-rdoc --no-ri --no-document --quiet - - brew install carthage script: - open -b com.apple.iphonesimulator From 05c2b1b3a123b0d48762369d16c263d21fb14f4d Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Thu, 6 Oct 2016 15:41:39 -0700 Subject: [PATCH 03/14] back to xcode 7.2 and manually installing carthage. keeping cocoapods -pre. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a58a5d5935..bf419c6b54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8 +osx_image: xcode7.2 env: global: @@ -22,6 +22,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 --pre --no-rdoc --no-ri --no-document --quiet + - brew install carthage script: - open -b com.apple.iphonesimulator From ccc966eb17618c6451567f1b7a4be41899e580ee Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Tue, 18 Oct 2016 17:40:18 -0700 Subject: [PATCH 04/14] Fix appIcon detection and test for iPhone PLUS devices --- Classes/BITHockeyHelper.m | 4 ++-- Support/HockeySDKTests/BITHockeyHelperTests.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/BITHockeyHelper.m b/Classes/BITHockeyHelper.m index 05d7c06177..01487d8498 100644 --- a/Classes/BITHockeyHelper.m +++ b/Classes/BITHockeyHelper.m @@ -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; diff --git a/Support/HockeySDKTests/BITHockeyHelperTests.m b/Support/HockeySDKTests/BITHockeyHelperTests.m index a627230ccb..b106c01068 100644 --- a/Support/HockeySDKTests/BITHockeyHelperTests.m +++ b/Support/HockeySDKTests/BITHockeyHelperTests.m @@ -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 From bf2d5f361b5fb308c8124956e3e68e7824d68b39 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Mon, 24 Oct 2016 18:04:26 -0700 Subject: [PATCH 05/14] xcode 8.1 GM --- Support/HockeySDK.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/HockeySDK Distribution.xcscheme | 2 +- .../xcshareddata/xcschemes/HockeySDK Documentation.xcscheme | 2 +- .../xcshareddata/xcschemes/HockeySDK Framework.xcscheme | 2 +- .../xcshareddata/xcschemes/HockeySDK.xcscheme | 2 +- .../xcshareddata/xcschemes/HockeySDKResources.xcscheme | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj index 6631a9b41e..be58091ef1 100644 --- a/Support/HockeySDK.xcodeproj/project.pbxproj +++ b/Support/HockeySDK.xcodeproj/project.pbxproj @@ -1610,7 +1610,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0600; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0810; TargetAttributes = { 1EB6173E1B0A30480035A986 = { CreatedOnToolsVersion = 6.3.1; diff --git a/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK Distribution.xcscheme b/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK Distribution.xcscheme index 5f9c9ee4f1..0ca0b31f3c 100644 --- a/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK Distribution.xcscheme +++ b/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK Distribution.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 24 Oct 2016 18:23:26 -0700 Subject: [PATCH 06/14] use stable cocoapods for CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf419c6b54..bebdef7048 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - xcrun simctl list - 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 --pre --no-rdoc --no-ri --no-document --quiet + - gem install cocoapods --no-rdoc --no-ri --no-document --quiet - brew install carthage script: From e72c4a1f24c70611e4fed9248f3d5058bd7c854d Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Tue, 25 Oct 2016 11:20:34 -0700 Subject: [PATCH 07/14] uncomment carthage build step --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bebdef7048..ca6effb5f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,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 --verbose; fi # Use better failure diagnostics, copied from https://github.com/0xced/XCDYouTubeKit From 06ad9d255a8903143acf41e516d1d6aa53902c6c Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Tue, 25 Oct 2016 11:40:04 -0700 Subject: [PATCH 08/14] remove command completely --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca6effb5f7..1b81bab68a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,6 @@ script: - if [ $LINT == "YES" ]; then cp -R Products/HockeySDK-iOS/ HockeySDK-iOS; pod lib lint; - #carthage build --no-skip-current --verbose; fi # Use better failure diagnostics, copied from https://github.com/0xced/XCDYouTubeKit From 5d8bbd4241b24e5826fd95b82ae8065e18e42ac3 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Tue, 25 Oct 2016 15:56:56 -0700 Subject: [PATCH 09/14] Updating to Xcode 8 again --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b81bab68a..54dd41dbd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode8 env: global: @@ -13,7 +13,7 @@ env: - 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.2,name=iPad Pro" RUN_TESTS="YES" - - SCHEME="HockeySDK" DESTINATION="OS=9.2,name=iPhone 6s" RUN_TESTS="YES" + - SCHEME="HockeySDK" DESTINATION="OS=9.3,name=iPhone 6s" RUN_TESTS="YES" - SCHEME="HockeySDK Framework" DESTINATION="platform=iOS Simulator,name=iPhone 6" RUN_TESTS="YES" - SCHEME="HockeySDK Distribution" RUN_TESTS="NO" LINT="YES" From c5ef538643ee972bf8f471b179bb09e0cc72d29b Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Tue, 25 Oct 2016 16:34:06 -0700 Subject: [PATCH 10/14] add unlink carthage. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 54dd41dbd7..293ca20b6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,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: From 3b9c4366b74bfe030ff4da3e1fadbfcd6f1937c8 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Tue, 25 Oct 2016 18:44:37 -0700 Subject: [PATCH 11/14] Fix Framework integration step --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 293ca20b6e..cf04fd4907 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ env: - CONFIGURATION="DEBUG" matrix: - - SCHEME="HockeySDK" DESTINATION="OS=8.1,name=iPhone 5" RUN_TESTS="YES" + - SCHEME="HockeySDK" DESTINATION="OS=8.3,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.3,name=iPhone 6s" RUN_TESTS="YES" - - SCHEME="HockeySDK Framework" DESTINATION="platform=iOS Simulator,name=iPhone 6" 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: From 875f6503f5ba1d00c0a8899a89a853f671a83086 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Wed, 26 Oct 2016 12:07:16 -0700 Subject: [PATCH 12/14] remove iOS 8 simu from test matric and fix a lottle something in the readme --- .travis.yml | 2 -- README.md | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf04fd4907..5802571234 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ env: - CONFIGURATION="DEBUG" matrix: - - SCHEME="HockeySDK" DESTINATION="OS=8.3,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.1,name=iPhone 6 Plus" RUN_TESTS="YES" - SCHEME="HockeySDK" DESTINATION="OS=9.2,name=iPad Pro" RUN_TESTS="YES" diff --git a/README.md b/README.md index 2c966a2ef5..92f45bae93 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,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") From 448fd5edfc86e320457102fc733cdabaefbdf592 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Wed, 26 Oct 2016 14:11:26 -0700 Subject: [PATCH 13/14] add carthage back --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5802571234..662d3b6543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,10 @@ script: - echo $COMMAND - eval $COMMAND && rm xcodebuild.log - - if [ $LINT == "YES" ]; then + - if [ $LINT=="YES"]; then cp -R Products/HockeySDK-iOS/ HockeySDK-iOS; pod lib lint; + carthage build --no-skip-current ; fi # Use better failure diagnostics, copied from https://github.com/0xced/XCDYouTubeKit From 2954bb3a3b2ec85fcebab1535f36286f01fa7686 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Wed, 26 Oct 2016 17:09:24 -0700 Subject: [PATCH 14/14] oh noes. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 662d3b6543..fda3638a47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: - echo $COMMAND - eval $COMMAND && rm xcodebuild.log - - if [ $LINT=="YES"]; then + - if [ $LINT == "YES" ]; then cp -R Products/HockeySDK-iOS/ HockeySDK-iOS; pod lib lint; carthage build --no-skip-current ;