Skip to content

Commit 996e103

Browse files
committed
Require iOS 10, macOS 10.12, tvOS 10, watchOS 3
Increased the minimum deployment targets to iOS 10, macOS 10.12, tvOS 10, and watchOS 3. Removed now-redundant availability attributes.
1 parent d4c4d1a commit 996e103

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

MapboxGeocoder.swift.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Pod::Spec.new do |s|
2424
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
2525

2626
# When using multiple platforms
27-
s.ios.deployment_target = "8.0"
28-
s.osx.deployment_target = "10.10"
29-
s.watchos.deployment_target = "2.0"
30-
s.tvos.deployment_target = "9.0"
27+
s.ios.deployment_target = "10.0"
28+
s.osx.deployment_target = "10.12"
29+
s.watchos.deployment_target = "3.0"
30+
s.tvos.deployment_target = "10.0"
3131

3232
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
3333

MapboxGeocoder.xcodeproj/project.pbxproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,6 @@
12731273
SDKROOT = appletvos;
12741274
SKIP_INSTALL = YES;
12751275
TARGETED_DEVICE_FAMILY = 3;
1276-
TVOS_DEPLOYMENT_TARGET = 9.0;
12771276
VERSIONING_SYSTEM = "apple-generic";
12781277
VERSION_INFO_PREFIX = "";
12791278
};
@@ -1305,7 +1304,6 @@
13051304
SKIP_INSTALL = YES;
13061305
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13071306
TARGETED_DEVICE_FAMILY = 3;
1308-
TVOS_DEPLOYMENT_TARGET = 9.0;
13091307
VERSIONING_SYSTEM = "apple-generic";
13101308
VERSION_INFO_PREFIX = "";
13111309
};
@@ -1329,7 +1327,6 @@
13291327
SDKROOT = appletvos;
13301328
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
13311329
TARGETED_DEVICE_FAMILY = "1,2,3";
1332-
TVOS_DEPLOYMENT_TARGET = 9.0;
13331330
};
13341331
name = Debug;
13351332
};
@@ -1352,7 +1349,6 @@
13521349
SDKROOT = appletvos;
13531350
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13541351
TARGETED_DEVICE_FAMILY = "1,2,3";
1355-
TVOS_DEPLOYMENT_TARGET = 9.0;
13561352
};
13571353
name = Release;
13581354
};
@@ -1379,7 +1375,6 @@
13791375
TARGETED_DEVICE_FAMILY = 4;
13801376
VERSIONING_SYSTEM = "apple-generic";
13811377
VERSION_INFO_PREFIX = "";
1382-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13831378
};
13841379
name = Debug;
13851380
};
@@ -1408,7 +1403,6 @@
14081403
TARGETED_DEVICE_FAMILY = 4;
14091404
VERSIONING_SYSTEM = "apple-generic";
14101405
VERSION_INFO_PREFIX = "";
1411-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
14121406
};
14131407
name = Release;
14141408
};
@@ -1460,15 +1454,17 @@
14601454
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14611455
GCC_WARN_UNUSED_FUNCTION = YES;
14621456
GCC_WARN_UNUSED_VARIABLE = YES;
1463-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1464-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1457+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1458+
MACOSX_DEPLOYMENT_TARGET = 10.12;
14651459
MTL_ENABLE_DEBUG_INFO = YES;
14661460
ONLY_ACTIVE_ARCH = YES;
14671461
SDKROOT = iphoneos;
14681462
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
14691463
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
14701464
SWIFT_VERSION = 5.0;
14711465
TARGETED_DEVICE_FAMILY = "1,2";
1466+
TVOS_DEPLOYMENT_TARGET = 12.0;
1467+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
14721468
};
14731469
name = Debug;
14741470
};
@@ -1513,15 +1509,17 @@
15131509
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15141510
GCC_WARN_UNUSED_FUNCTION = YES;
15151511
GCC_WARN_UNUSED_VARIABLE = YES;
1516-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1517-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1512+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1513+
MACOSX_DEPLOYMENT_TARGET = 10.12;
15181514
MTL_ENABLE_DEBUG_INFO = NO;
15191515
SDKROOT = iphoneos;
15201516
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
15211517
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
15221518
SWIFT_VERSION = 5.0;
15231519
TARGETED_DEVICE_FAMILY = "1,2";
1520+
TVOS_DEPLOYMENT_TARGET = 12.0;
15241521
VALIDATE_PRODUCT = YES;
1522+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
15251523
};
15261524
name = Release;
15271525
};

Sources/MapboxGeocoder/MBGeocodeOptions.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ open class ForwardGeocodeOptions: GeocodeOptions {
163163

164164
- parameter postalAddress: A `CNPostalAddress` object to search for.
165165
*/
166-
@available(iOS 9.0, macOS 10.11, *)
167166
@objc public convenience init(postalAddress: CNPostalAddress) {
168167
let formattedAddress = CNPostalAddressFormatter().string(from: postalAddress)
169168
self.init(query: formattedAddress.replacingOccurrences(of: "\n", with: ", "))

Sources/MapboxGeocoder/MBPlacemark.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ open class Placemark: NSObject, Codable {
267267

268268
To format the postal address, use a `CNPostalAddressFormatter` object.
269269
*/
270-
@available(iOS 9.0, macOS 10.11, *)
271270
@objc open var postalAddress: CNPostalAddress? {
272271
return nil
273272
}
@@ -548,7 +547,6 @@ open class GeocodedPlacemark: Placemark {
548547
}
549548

550549
#if canImport(Contacts)
551-
@available(iOS 9.0, macOS 10.11, *)
552550
@objc open override var postalAddress: CNPostalAddress? {
553551
let postalAddress = CNMutablePostalAddress()
554552

0 commit comments

Comments
 (0)