Skip to content

Commit 23b8890

Browse files
author
Paul Ehrhardt
authored
Merge pull request #20 from weakfl/swift-5
Update for Xcode 10.2 / Swift 5
2 parents 372944a + ec1ce8f commit 23b8890

File tree

6 files changed

+36
-20
lines changed

6 files changed

+36
-20
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
5.0

‎GCXMulticastDNSKit.podspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = "GCXMulticastDNSKit"
3-
spec.version = "1.2.1"
3+
spec.version = "1.3.0"
44
spec.summary = "mDNS discovery framework for iOS."
55
spec.homepage = "https://github.com/grandcentrix/GCXMulticastDNSKit"
66
spec.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE.txt' }
@@ -9,4 +9,5 @@ Pod::Spec.new do |spec|
99
spec.platform = :ios, "9.0"
1010
spec.source = { git: "https://github.com/grandcentrix/GCXMulticastDNSKit.git", tag: "v#{spec.version}"}
1111
spec.source_files = "GCXMulticastDNSKit/**/*.{swift}"
12+
spec.swift_version = "5.0"
1213
end

‎GCXMulticastDNSKit.xcodeproj/project.pbxproj

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,27 +156,28 @@
156156
isa = PBXProject;
157157
attributes = {
158158
LastSwiftUpdateCheck = 0820;
159-
LastUpgradeCheck = 0920;
159+
LastUpgradeCheck = 1020;
160160
ORGANIZATIONNAME = "grandcentrix GmbH";
161161
TargetAttributes = {
162162
68FF3C161E24DDDF00A482A8 = {
163163
CreatedOnToolsVersion = 8.2.1;
164-
LastSwiftMigration = 0920;
164+
LastSwiftMigration = 1020;
165165
ProvisioningStyle = Automatic;
166166
};
167167
68FF3C1F1E24DDDF00A482A8 = {
168168
CreatedOnToolsVersion = 8.2.1;
169-
LastSwiftMigration = 0920;
169+
LastSwiftMigration = 1020;
170170
ProvisioningStyle = Automatic;
171171
};
172172
};
173173
};
174174
buildConfigurationList = 68FF3C111E24DDDF00A482A8 /* Build configuration list for PBXProject "GCXMulticastDNSKit" */;
175175
compatibilityVersion = "Xcode 3.2";
176-
developmentRegion = English;
176+
developmentRegion = en;
177177
hasScannedForEncodings = 0;
178178
knownRegions = (
179179
en,
180+
Base,
180181
);
181182
mainGroup = 68FF3C0D1E24DDDF00A482A8;
182183
productRefGroup = 68FF3C181E24DDDF00A482A8 /* Products */;
@@ -255,20 +256,29 @@
255256
isa = XCBuildConfiguration;
256257
buildSettings = {
257258
ALWAYS_SEARCH_USER_PATHS = NO;
259+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
258260
CLANG_ANALYZER_NONNULL = YES;
259261
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
260262
CLANG_CXX_LIBRARY = "libc++";
261263
CLANG_ENABLE_MODULES = YES;
262264
CLANG_ENABLE_OBJC_ARC = YES;
265+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
263266
CLANG_WARN_BOOL_CONVERSION = YES;
267+
CLANG_WARN_COMMA = YES;
264268
CLANG_WARN_CONSTANT_CONVERSION = YES;
269+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
265270
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
266271
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
267272
CLANG_WARN_EMPTY_BODY = YES;
268273
CLANG_WARN_ENUM_CONVERSION = YES;
269274
CLANG_WARN_INFINITE_RECURSION = YES;
270275
CLANG_WARN_INT_CONVERSION = YES;
276+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
277+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
278+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
271279
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
280+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
281+
CLANG_WARN_STRICT_PROTOTYPES = YES;
272282
CLANG_WARN_SUSPICIOUS_MOVE = YES;
273283
CLANG_WARN_UNREACHABLE_CODE = YES;
274284
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -308,20 +318,29 @@
308318
isa = XCBuildConfiguration;
309319
buildSettings = {
310320
ALWAYS_SEARCH_USER_PATHS = NO;
321+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
311322
CLANG_ANALYZER_NONNULL = YES;
312323
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
313324
CLANG_CXX_LIBRARY = "libc++";
314325
CLANG_ENABLE_MODULES = YES;
315326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
316328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
317330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
318332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
319333
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
320334
CLANG_WARN_EMPTY_BODY = YES;
321335
CLANG_WARN_ENUM_CONVERSION = YES;
322336
CLANG_WARN_INFINITE_RECURSION = YES;
323337
CLANG_WARN_INT_CONVERSION = YES;
338+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
339+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
340+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
324341
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
342+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
343+
CLANG_WARN_STRICT_PROTOTYPES = YES;
325344
CLANG_WARN_SUSPICIOUS_MOVE = YES;
326345
CLANG_WARN_UNREACHABLE_CODE = YES;
327346
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -367,8 +386,7 @@
367386
PRODUCT_NAME = "$(TARGET_NAME)";
368387
SKIP_INSTALL = YES;
369388
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
370-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
371-
SWIFT_VERSION = 4.0;
389+
SWIFT_VERSION = 5.0;
372390
};
373391
name = Debug;
374392
};
@@ -388,8 +406,7 @@
388406
PRODUCT_BUNDLE_IDENTIFIER = net.grandcentrix.GCXMulticastDNSKit;
389407
PRODUCT_NAME = "$(TARGET_NAME)";
390408
SKIP_INSTALL = YES;
391-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
392-
SWIFT_VERSION = 4.0;
409+
SWIFT_VERSION = 5.0;
393410
};
394411
name = Release;
395412
};
@@ -398,13 +415,13 @@
398415
buildSettings = {
399416
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
400417
CLANG_ENABLE_MODULES = YES;
418+
DEVELOPMENT_TEAM = "";
401419
INFOPLIST_FILE = GCXMulticastDNSKitTests/Info.plist;
402420
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
403421
PRODUCT_BUNDLE_IDENTIFIER = net.grandcentrix.GCXMulticastDNSKitTests;
404422
PRODUCT_NAME = "$(TARGET_NAME)";
405423
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
406-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
407-
SWIFT_VERSION = 4.0;
424+
SWIFT_VERSION = 5.0;
408425
};
409426
name = Debug;
410427
};
@@ -413,12 +430,12 @@
413430
buildSettings = {
414431
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
415432
CLANG_ENABLE_MODULES = YES;
433+
DEVELOPMENT_TEAM = "";
416434
INFOPLIST_FILE = GCXMulticastDNSKitTests/Info.plist;
417435
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
418436
PRODUCT_BUNDLE_IDENTIFIER = net.grandcentrix.GCXMulticastDNSKitTests;
419437
PRODUCT_NAME = "$(TARGET_NAME)";
420-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
421-
SWIFT_VERSION = 4.0;
438+
SWIFT_VERSION = 5.0;
422439
};
423440
name = Release;
424441
};

‎GCXMulticastDNSKit.xcodeproj/xcshareddata/xcschemes/GCXMulticastDNSKit.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎GCXMulticastDNSKit/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.2.1</string>
18+
<string>1.3.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ This framework currenlty provides functionality to discover services on the loca
2424
```ruby
2525
use_frameworks!
2626

27-
pod 'GCXMulticastDNSKit', :git => 'https://github.com/grandcentrix/GCXMulticastDNSKit.git', :tag => 'v1.2.1'
27+
pod 'GCXMulticastDNSKit', :git => 'https://github.com/grandcentrix/GCXMulticastDNSKit.git', :tag => 'v1.3.0'
2828

2929
```
3030

3131
### Carthage
3232

3333
```ruby
34-
git "https://github.com/grandcentrix/GCXMulticastDNSKit.git" ~> 1.2.1
34+
git "https://github.com/grandcentrix/GCXMulticastDNSKit.git" ~> 1.3.0
3535

3636
```
3737

0 commit comments

Comments
 (0)