Skip to content

Commit bd26fca

Browse files
pietbrauerpietbrauer
authored
Merge pull request #591 from tiennou/carthage-update
carthage update
2 parents deb6e4e + 6675b7f commit bd26fca

File tree

10 files changed

+41
-16
lines changed

10 files changed

+41
-16
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
osx_image: xcode7
1+
osx_image: xcode8
22
language: objective-c
33
matrix:
44
fast_finish: true
55
include:
6-
- osx_image: xcode7.3
6+
- osx_image: xcode8
77
env:
88
- SCHEME="ObjectiveGit Mac"
9-
- osx_image: xcode7.3
9+
- osx_image: xcode8
1010
env:
1111
- SCHEME="ObjectiveGit iOS"
1212
before_install:

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "v4.0.0"
2-
github "Quick/Quick" "v0.9.2"
3-
github "ZipArchive/ZipArchive" "v1.1"
1+
github "Quick/Nimble" "v4.1.0"
2+
github "Quick/Quick" "v0.9.3"
3+
github "ZipArchive/ZipArchive" "v1.6.2"
44
github "jspahrsummers/xcconfigs" "0.9"

‎Carthage/Checkouts/Nimble‎

‎Carthage/Checkouts/Quick‎

Submodule Quick updated 35 files

‎Carthage/Checkouts/ZipArchive‎

Submodule ZipArchive updated 30 files

‎ObjectiveGitFramework.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,11 +1256,18 @@
12561256
attributes = {
12571257
LastSwiftUpdateCheck = 0700;
12581258
LastTestingUpgradeCheck = 0510;
1259-
LastUpgradeCheck = 0700;
1259+
LastUpgradeCheck = 0800;
12601260
ORGANIZATIONNAME = "GitHub, Inc";
12611261
TargetAttributes = {
1262+
88F05A6A16011E5400B7AD1D = {
1263+
LastSwiftMigration = 0800;
1264+
};
1265+
8DC2EF4F0486A6940098B216 = {
1266+
LastSwiftMigration = 0800;
1267+
};
12621268
D01B6ED219F82E2000D411BC = {
12631269
CreatedOnToolsVersion = 6.1;
1270+
LastSwiftMigration = 0800;
12641271
};
12651272
F879D8351B4B7F7C002D5C07 = {
12661273
CreatedOnToolsVersion = 6.4;
@@ -1694,6 +1701,9 @@
16941701
baseConfigurationReference = D0A463D817E57C45000F5021 /* Debug.xcconfig */;
16951702
buildSettings = {
16961703
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
1704+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
1705+
CLANG_WARN_INFINITE_RECURSION = YES;
1706+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
16971707
ENABLE_TESTABILITY = YES;
16981708
GCC_NO_COMMON_BLOCKS = YES;
16991709
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
@@ -1712,6 +1722,7 @@
17121722
"$(inherited)",
17131723
"-DGIT_SSH",
17141724
);
1725+
SWIFT_VERSION = 2.3;
17151726
TARGETED_DEVICE_FAMILY = "1,2";
17161727
WARNING_CFLAGS = (
17171728
"$(inherited)",
@@ -1725,6 +1736,9 @@
17251736
baseConfigurationReference = D0A463DA17E57C45000F5021 /* Release.xcconfig */;
17261737
buildSettings = {
17271738
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
1739+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
1740+
CLANG_WARN_INFINITE_RECURSION = YES;
1741+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
17281742
GCC_NO_COMMON_BLOCKS = YES;
17291743
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
17301744
HEADER_SEARCH_PATHS = (
@@ -1741,6 +1755,7 @@
17411755
"$(inherited)",
17421756
"-DGIT_SSH",
17431757
);
1758+
SWIFT_VERSION = 2.3;
17441759
TARGETED_DEVICE_FAMILY = "1,2";
17451760
WARNING_CFLAGS = (
17461761
"$(inherited)",
@@ -1845,6 +1860,9 @@
18451860
baseConfigurationReference = D0A463DB17E57C45000F5021 /* Test.xcconfig */;
18461861
buildSettings = {
18471862
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
1863+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
1864+
CLANG_WARN_INFINITE_RECURSION = YES;
1865+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
18481866
GCC_NO_COMMON_BLOCKS = YES;
18491867
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
18501868
HEADER_SEARCH_PATHS = (
@@ -1861,6 +1879,7 @@
18611879
"$(inherited)",
18621880
"-DGIT_SSH",
18631881
);
1882+
SWIFT_VERSION = 2.3;
18641883
TARGETED_DEVICE_FAMILY = "1,2";
18651884
WARNING_CFLAGS = (
18661885
"$(inherited)",
@@ -1918,7 +1937,7 @@
19181937
baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */;
19191938
buildSettings = {
19201939
CODE_SIGN_IDENTITY = "iPhone Developer";
1921-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1940+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
19221941
CURRENT_PROJECT_VERSION = 1;
19231942
DYLIB_COMPATIBILITY_VERSION = 1;
19241943
DYLIB_CURRENT_VERSION = 1;
@@ -1982,7 +2001,7 @@
19822001
baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */;
19832002
buildSettings = {
19842003
CODE_SIGN_IDENTITY = "iPhone Developer";
1985-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2004+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
19862005
CURRENT_PROJECT_VERSION = 1;
19872006
DYLIB_COMPATIBILITY_VERSION = 1;
19882007
DYLIB_CURRENT_VERSION = 1;
@@ -2014,7 +2033,7 @@
20142033
baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */;
20152034
buildSettings = {
20162035
CODE_SIGN_IDENTITY = "iPhone Developer";
2017-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2036+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
20182037
CURRENT_PROJECT_VERSION = 1;
20192038
DYLIB_COMPATIBILITY_VERSION = 1;
20202039
DYLIB_CURRENT_VERSION = 1;
@@ -2046,7 +2065,7 @@
20462065
baseConfigurationReference = D019778C19F830D100F523DA /* iOS-Framework.xcconfig */;
20472066
buildSettings = {
20482067
CODE_SIGN_IDENTITY = "iPhone Developer";
2049-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2068+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
20502069
CURRENT_PROJECT_VERSION = 1;
20512070
DYLIB_COMPATIBILITY_VERSION = 1;
20522071
DYLIB_CURRENT_VERSION = 1;
@@ -2078,6 +2097,9 @@
20782097
baseConfigurationReference = D0A463D917E57C45000F5021 /* Profile.xcconfig */;
20792098
buildSettings = {
20802099
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
2100+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
2101+
CLANG_WARN_INFINITE_RECURSION = YES;
2102+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
20812103
GCC_NO_COMMON_BLOCKS = YES;
20822104
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
20832105
HEADER_SEARCH_PATHS = (
@@ -2094,6 +2116,7 @@
20942116
"$(inherited)",
20952117
"-DGIT_SSH",
20962118
);
2119+
SWIFT_VERSION = 2.3;
20972120
TARGETED_DEVICE_FAMILY = "1,2";
20982121
WARNING_CFLAGS = (
20992122
"$(inherited)",

‎ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0700"
3+
LastUpgradeVersion = "0800"
44
version = "2.0">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0700"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ObjectiveGitTests/GTBranchSpec.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import <Nimble/Nimble.h>
10+
#import <Nimble/Nimble-Swift.h>
1011
#import <ObjectiveGit/ObjectiveGit.h>
1112
#import <Quick/Quick.h>
1213

‎ObjectiveGitTests/Libgit2FeaturesSpec.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import <Nimble/Nimble.h>
10+
#import <Nimble/Nimble-Swift.h>
1011
#import <ObjectiveGit/ObjectiveGit.h>
1112
#import <Quick/Quick.h>
1213

0 commit comments

Comments
 (0)