From 4388caeefd2ffcec952002bbca5651a727e665c2 Mon Sep 17 00:00:00 2001 From: Etienne Samson Date: Fri, 23 Sep 2016 01:36:20 +0200 Subject: [PATCH 1/3] carthage update ZipArchive is actually on its swift23 branch because Xcode 7 --- Cartfile.resolved | 6 +++--- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/ZipArchive | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index b67d877a6..fb7614eff 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v4.0.0" -github "Quick/Quick" "v0.9.2" -github "ZipArchive/ZipArchive" "v1.1" +github "Quick/Nimble" "v4.1.0" +github "Quick/Quick" "v0.9.3" +github "ZipArchive/ZipArchive" "v1.6.1" github "jspahrsummers/xcconfigs" "0.9" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 29f7fb373..b4a0f9d6e 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 29f7fb3732893f76fa851cb37b0c4b339c49cead +Subproject commit b4a0f9d6ee6b89f0e2f9ee8fa32aaa7200b1e27c diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index dc2b4b75d..faa6056c0 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit dc2b4b75d2f718518acbdef289a72fad77975a8a +Subproject commit faa6056c0c7da69fc1fb494cf61fa264aea4d9bc diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 057c49375..ddd27ec5a 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 057c4937552f421d782e6d07ae09191b191bcc23 +Subproject commit ddd27ec5abdedc04b2964bf45cf1e91f762da588 From 2038841d354a1e6f17cb763ec87528dbff5ef24f Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Thu, 27 Oct 2016 11:15:05 +0200 Subject: [PATCH 2/3] Test if migrating to Xcode 8 works on Travis --- Cartfile.resolved | 2 +- Carthage/Checkouts/ZipArchive | 2 +- .../project.pbxproj | 33 ++++++++++++++++--- .../xcschemes/ObjectiveGit Mac.xcscheme | 2 +- .../xcschemes/ObjectiveGit iOS.xcscheme | 2 +- ObjectiveGitTests/GTBranchSpec.m | 1 + ObjectiveGitTests/Libgit2FeaturesSpec.m | 1 + 7 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index fb7614eff..f2376fca0 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "Quick/Nimble" "v4.1.0" github "Quick/Quick" "v0.9.3" -github "ZipArchive/ZipArchive" "v1.6.1" +github "ZipArchive/ZipArchive" "v1.6.2" github "jspahrsummers/xcconfigs" "0.9" diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index ddd27ec5a..76ca4b329 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit ddd27ec5abdedc04b2964bf45cf1e91f762da588 +Subproject commit 76ca4b3293e2effa548fdd6b09f8925a85d35a92 diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 731423e35..3426f3c5b 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1256,11 +1256,18 @@ attributes = { LastSwiftUpdateCheck = 0700; LastTestingUpgradeCheck = 0510; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = "GitHub, Inc"; TargetAttributes = { + 88F05A6A16011E5400B7AD1D = { + LastSwiftMigration = 0800; + }; + 8DC2EF4F0486A6940098B216 = { + LastSwiftMigration = 0800; + }; D01B6ED219F82E2000D411BC = { CreatedOnToolsVersion = 6.1; + LastSwiftMigration = 0800; }; F879D8351B4B7F7C002D5C07 = { CreatedOnToolsVersion = 6.4; @@ -1694,6 +1701,9 @@ baseConfigurationReference = D0A463D817E57C45000F5021 /* Debug.xcconfig */; buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; @@ -1712,6 +1722,7 @@ "$(inherited)", "-DGIT_SSH", ); + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1725,6 +1736,9 @@ baseConfigurationReference = D0A463DA17E57C45000F5021 /* Release.xcconfig */; buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; HEADER_SEARCH_PATHS = ( @@ -1741,6 +1755,7 @@ "$(inherited)", "-DGIT_SSH", ); + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1845,6 +1860,9 @@ baseConfigurationReference = D0A463DB17E57C45000F5021 /* Test.xcconfig */; buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; HEADER_SEARCH_PATHS = ( @@ -1861,6 +1879,7 @@ "$(inherited)", "-DGIT_SSH", ); + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1918,7 +1937,7 @@ baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1982,7 +2001,7 @@ baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2014,7 +2033,7 @@ baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2046,7 +2065,7 @@ baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2078,6 +2097,9 @@ baseConfigurationReference = D0A463D917E57C45000F5021 /* Profile.xcconfig */; buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; HEADER_SEARCH_PATHS = ( @@ -2094,6 +2116,7 @@ "$(inherited)", "-DGIT_SSH", ); + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme index 47f735a71..245964018 100644 --- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme @@ -1,6 +1,6 @@ +#import #import #import diff --git a/ObjectiveGitTests/Libgit2FeaturesSpec.m b/ObjectiveGitTests/Libgit2FeaturesSpec.m index 0503b56b0..0868db2d7 100644 --- a/ObjectiveGitTests/Libgit2FeaturesSpec.m +++ b/ObjectiveGitTests/Libgit2FeaturesSpec.m @@ -7,6 +7,7 @@ // #import +#import #import #import From 6675b7fc82696d819a8afe0fe79b6059041e6abe Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Thu, 27 Oct 2016 13:27:29 +0200 Subject: [PATCH 3/3] Use Xcode8 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a6bf09bc..c9ad0c8c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ -osx_image: xcode7 +osx_image: xcode8 language: objective-c matrix: fast_finish: true include: - - osx_image: xcode7.3 + - osx_image: xcode8 env: - SCHEME="ObjectiveGit Mac" - - osx_image: xcode7.3 + - osx_image: xcode8 env: - SCHEME="ObjectiveGit iOS" before_install: