Skip to content

Commit 25aca53

Browse files
authored
Merge pull request #144 from tonystone/xcode-update
Release 1.8.0
2 parents 373afc3 + 5f229fc commit 25aca53

File tree

16 files changed

+167
-92
lines changed

16 files changed

+167
-92
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: objective-c
22
os: osx
3-
osx_image: xcode8.3
3+
osx_image: xcode10.1
44

55
git:
66
submodules: false
@@ -18,36 +18,36 @@ matrix:
1818
include:
1919
-
2020
os: osx
21-
osx_image: xcode8.3
21+
osx_image: xcode10.1
2222
env:
2323
- BUILD="pod lint"
2424
-
2525
os: osx
26-
osx_image: xcode8.3
26+
osx_image: xcode10.1
2727
env:
2828
- BUILD="xcodebuild"
2929
- TEST_DEST="platform=macosx"
3030
- SCHEME=GeoFeatures-OSX-Example
3131
- TEST_SDK=macosx
3232
-
3333
os: osx
34-
osx_image: xcode8.3
34+
osx_image: xcode10.1
3535
env:
3636
- BUILD="xcodebuild"
3737
- TEST_DEST="platform=iOS Simulator,OS=10.0,name=iPhone 6s"
3838
- SCHEME=GeoFeatures-iOS-Example
3939
- TEST_SDK=iphonesimulator
4040
-
4141
os: osx
42-
osx_image: xcode8.3
42+
osx_image: xcode10.1
4343
env:
4444
- BUILD="xcodebuild"
4545
- TEST_DEST="platform=iOS Simulator,OS=10.0,name=iPhone 6"
4646
- SCHEME=GeoFeatures-iOS-Example
4747
- TEST_SDK=iphonesimulator
4848
-
4949
os: osx
50-
osx_image: xcode8.3
50+
osx_image: xcode10.1
5151
env:
5252
- BUILD="xcodebuild"
5353
- TEST_DEST="platform=iOS Simulator,OS=9.3,name=iPhone 6"

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Change Log
2+
All significant changes to this project will be documented in this file.
3+
4+
## [1.8.0](https://github.com/tonystone/geofeatures/tree/1.8.0)
5+
6+
#### Changed
7+
- Now requires Xcode 10.1 to build.
8+
- Now requires Cocoapods 1.6.0
9+
10+
#### Fixed
11+
- Nullability of GFLineString `- (GFPoint *) firstPoint` and `- (GFPoint *) lastPoint` changed to `_Nullable` return type.
12+
- Nullability of GFGeometryCollection `- (GFPoint *) firstGeometry` and `- (GFPoint *) lastGeometry` changed to `_Nullable` return type.
13+
- Nullability of GFMultiLineString `- (GFPoint *) firstGeometry` and `- (GFPoint *) lastGeometry` changed to `_Nullable` return type.
14+
- Nullability of GFMultiPoint `- (GFPoint *) firstGeometry` and `- (GFPoint *) lastGeometry` changed to `_Nullable` return type.
15+
- Nullability of GFMultiPolygon `- (GFPoint *) firstGeometry` and `- (GFPoint *) lastGeometry` changed to `_Nullable` return type.

Example/GeoFeatures.xcodeproj/project.pbxproj

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@
568568
attributes = {
569569
CLASSPREFIX = GF;
570570
LastSwiftUpdateCheck = 0730;
571-
LastUpgradeCheck = 0710;
571+
LastUpgradeCheck = 1010;
572572
ORGANIZATIONNAME = "Tony Stone";
573573
TargetAttributes = {
574574
6003F5AD195388D20070C39A = {
@@ -577,9 +577,11 @@
577577
};
578578
EAD891331BF3AFDF00BD4FAC = {
579579
CreatedOnToolsVersion = 7.1;
580+
LastSwiftMigration = 1010;
580581
};
581582
EAD891411BF3AFDF00BD4FAC = {
582583
CreatedOnToolsVersion = 7.1;
584+
LastSwiftMigration = 1010;
583585
TestTargetID = EAD891331BF3AFDF00BD4FAC;
584586
};
585587
};
@@ -1039,19 +1041,32 @@
10391041
CLANG_CXX_LIBRARY = "libc++";
10401042
CLANG_ENABLE_MODULES = YES;
10411043
CLANG_ENABLE_OBJC_ARC = YES;
1044+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10421045
CLANG_WARN_BOOL_CONVERSION = YES;
1046+
CLANG_WARN_COMMA = YES;
10431047
CLANG_WARN_CONSTANT_CONVERSION = YES;
1048+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
10441049
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10451050
CLANG_WARN_EMPTY_BODY = YES;
10461051
CLANG_WARN_ENUM_CONVERSION = YES;
1052+
CLANG_WARN_INFINITE_RECURSION = YES;
10471053
CLANG_WARN_INT_CONVERSION = YES;
1054+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1055+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1056+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10481057
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1058+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1059+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1060+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1061+
CLANG_WARN_UNREACHABLE_CODE = YES;
10491062
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10501063
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10511064
COPY_PHASE_STRIP = NO;
1065+
ENABLE_STRICT_OBJC_MSGSEND = YES;
10521066
ENABLE_TESTABILITY = YES;
10531067
GCC_C_LANGUAGE_STANDARD = gnu99;
10541068
GCC_DYNAMIC_NO_PIC = NO;
1069+
GCC_NO_COMMON_BLOCKS = YES;
10551070
GCC_OPTIMIZATION_LEVEL = 0;
10561071
GCC_PREPROCESSOR_DEFINITIONS = (
10571072
"DEBUG=1",
@@ -1068,6 +1083,7 @@
10681083
MACOSX_DEPLOYMENT_TARGET = 10.7;
10691084
ONLY_ACTIVE_ARCH = YES;
10701085
SDKROOT = iphoneos;
1086+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
10711087
SWIFT_VERSION = 3.0;
10721088
TARGETED_DEVICE_FAMILY = "1,2";
10731089
};
@@ -1081,18 +1097,31 @@
10811097
CLANG_CXX_LIBRARY = "libc++";
10821098
CLANG_ENABLE_MODULES = YES;
10831099
CLANG_ENABLE_OBJC_ARC = YES;
1100+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10841101
CLANG_WARN_BOOL_CONVERSION = YES;
1102+
CLANG_WARN_COMMA = YES;
10851103
CLANG_WARN_CONSTANT_CONVERSION = YES;
1104+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
10861105
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10871106
CLANG_WARN_EMPTY_BODY = YES;
10881107
CLANG_WARN_ENUM_CONVERSION = YES;
1108+
CLANG_WARN_INFINITE_RECURSION = YES;
10891109
CLANG_WARN_INT_CONVERSION = YES;
1110+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1111+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1112+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10901113
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1114+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1115+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1116+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1117+
CLANG_WARN_UNREACHABLE_CODE = YES;
10911118
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10921119
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10931120
COPY_PHASE_STRIP = YES;
10941121
ENABLE_NS_ASSERTIONS = NO;
1122+
ENABLE_STRICT_OBJC_MSGSEND = YES;
10951123
GCC_C_LANGUAGE_STANDARD = gnu99;
1124+
GCC_NO_COMMON_BLOCKS = YES;
10961125
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
10971126
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
10981127
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1102,6 +1131,8 @@
11021131
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
11031132
MACOSX_DEPLOYMENT_TARGET = 10.7;
11041133
SDKROOT = iphoneos;
1134+
SWIFT_COMPILATION_MODE = wholemodule;
1135+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
11051136
SWIFT_VERSION = 3.0;
11061137
TARGETED_DEVICE_FAMILY = "1,2";
11071138
VALIDATE_PRODUCT = YES;
@@ -1208,6 +1239,7 @@
12081239
PRODUCT_NAME = "$(TARGET_NAME)";
12091240
SDKROOT = macosx;
12101241
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1242+
SWIFT_VERSION = 4.2;
12111243
};
12121244
name = Debug;
12131245
};
@@ -1230,6 +1262,7 @@
12301262
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.GeoFeatures-OSX";
12311263
PRODUCT_NAME = "$(TARGET_NAME)";
12321264
SDKROOT = macosx;
1265+
SWIFT_VERSION = 4.2;
12331266
};
12341267
name = Release;
12351268
};
@@ -1252,6 +1285,7 @@
12521285
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.GeoFeatures-OSX-Tests";
12531286
PRODUCT_NAME = "$(TARGET_NAME)";
12541287
SDKROOT = macosx;
1288+
SWIFT_VERSION = 4.2;
12551289
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GeoFeatures-OSX.app/Contents/MacOS/GeoFeatures-OSX";
12561290
};
12571291
name = Debug;
@@ -1275,6 +1309,7 @@
12751309
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.GeoFeatures-OSX-Tests";
12761310
PRODUCT_NAME = "$(TARGET_NAME)";
12771311
SDKROOT = macosx;
1312+
SWIFT_VERSION = 4.2;
12781313
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GeoFeatures-OSX.app/Contents/MacOS/GeoFeatures-OSX";
12791314
};
12801315
name = Release;

Example/GeoFeatures.xcodeproj/xcshareddata/xcschemes/GeoFeatures-OSX-Example.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 = "0710"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example/GeoFeatures.xcodeproj/xcshareddata/xcschemes/GeoFeatures-iOS-Example.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 = "0710"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)