Skip to content

Commit d4ab2d7

Browse files
derek-robinderek-robin
authored
Merge pull request #55 from robinpowered/feature/update-ios
Update ios and swift version
2 parents 2301a27 + 2300606 commit d4ab2d7

2 files changed

Lines changed: 57 additions & 14 deletions

File tree

‎ios/AppConfigSettingsFramework.xcodeproj/project.pbxproj‎

Lines changed: 55 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 53;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -100,21 +100,23 @@
100100
C91CCA661C691C0700E71355 /* Project object */ = {
101101
isa = PBXProject;
102102
attributes = {
103-
LastUpgradeCheck = 0720;
103+
BuildIndependentTargetsInParallel = YES;
104+
LastUpgradeCheck = 1430;
104105
ORGANIZATIONNAME = AppConfig;
105106
TargetAttributes = {
106107
C91CCA6E1C691C0700E71355 = {
107108
CreatedOnToolsVersion = 7.2.1;
108-
LastSwiftMigration = 1010;
109+
LastSwiftMigration = "";
109110
};
110111
};
111112
};
112113
buildConfigurationList = C91CCA691C691C0700E71355 /* Build configuration list for PBXProject "AppConfigSettingsFramework" */;
113114
compatibilityVersion = "Xcode 3.2";
114-
developmentRegion = English;
115+
developmentRegion = en;
115116
hasScannedForEncodings = 0;
116117
knownRegions = (
117118
en,
119+
Base,
118120
);
119121
mainGroup = C91CCA651C691C0700E71355;
120122
productRefGroup = C91CCA701C691C0700E71355 /* Products */;
@@ -153,17 +155,29 @@
153155
isa = XCBuildConfiguration;
154156
buildSettings = {
155157
ALWAYS_SEARCH_USER_PATHS = NO;
158+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
156159
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
157160
CLANG_CXX_LIBRARY = "libc++";
158161
CLANG_ENABLE_MODULES = YES;
159162
CLANG_ENABLE_OBJC_ARC = YES;
163+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
160164
CLANG_WARN_BOOL_CONVERSION = YES;
165+
CLANG_WARN_COMMA = YES;
161166
CLANG_WARN_CONSTANT_CONVERSION = YES;
167+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
162168
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
163169
CLANG_WARN_EMPTY_BODY = YES;
164170
CLANG_WARN_ENUM_CONVERSION = YES;
171+
CLANG_WARN_INFINITE_RECURSION = YES;
165172
CLANG_WARN_INT_CONVERSION = YES;
173+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
174+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
175+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
166176
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
177+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
178+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
179+
CLANG_WARN_STRICT_PROTOTYPES = YES;
180+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
167181
CLANG_WARN_UNREACHABLE_CODE = YES;
168182
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
169183
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -186,7 +200,7 @@
186200
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
187201
GCC_WARN_UNUSED_FUNCTION = YES;
188202
GCC_WARN_UNUSED_VARIABLE = YES;
189-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
203+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
190204
MTL_ENABLE_DEBUG_INFO = YES;
191205
ONLY_ACTIVE_ARCH = YES;
192206
SDKROOT = iphoneos;
@@ -201,17 +215,29 @@
201215
isa = XCBuildConfiguration;
202216
buildSettings = {
203217
ALWAYS_SEARCH_USER_PATHS = NO;
218+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
204219
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
205220
CLANG_CXX_LIBRARY = "libc++";
206221
CLANG_ENABLE_MODULES = YES;
207222
CLANG_ENABLE_OBJC_ARC = YES;
223+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
208224
CLANG_WARN_BOOL_CONVERSION = YES;
225+
CLANG_WARN_COMMA = YES;
209226
CLANG_WARN_CONSTANT_CONVERSION = YES;
227+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
210228
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
211229
CLANG_WARN_EMPTY_BODY = YES;
212230
CLANG_WARN_ENUM_CONVERSION = YES;
231+
CLANG_WARN_INFINITE_RECURSION = YES;
213232
CLANG_WARN_INT_CONVERSION = YES;
233+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
234+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
235+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
214236
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
237+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
238+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
239+
CLANG_WARN_STRICT_PROTOTYPES = YES;
240+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
215241
CLANG_WARN_UNREACHABLE_CODE = YES;
216242
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
217243
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -228,9 +254,10 @@
228254
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
229255
GCC_WARN_UNUSED_FUNCTION = YES;
230256
GCC_WARN_UNUSED_VARIABLE = YES;
231-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
257+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
232258
MTL_ENABLE_DEBUG_INFO = NO;
233259
SDKROOT = iphoneos;
260+
SWIFT_COMPILATION_MODE = wholemodule;
234261
TARGETED_DEVICE_FAMILY = "1,2";
235262
VALIDATE_PRODUCT = YES;
236263
VERSIONING_SYSTEM = "apple-generic";
@@ -242,40 +269,56 @@
242269
isa = XCBuildConfiguration;
243270
buildSettings = {
244271
CLANG_ENABLE_MODULES = YES;
272+
CODE_SIGN_IDENTITY = "";
245273
DEFINES_MODULE = YES;
246274
DYLIB_COMPATIBILITY_VERSION = 1;
247275
DYLIB_CURRENT_VERSION = 1;
248276
DYLIB_INSTALL_NAME_BASE = "@rpath";
277+
ENABLE_MODULE_VERIFIER = YES;
249278
INFOPLIST_FILE = AppConfigSettingsFramework/Info.plist;
250279
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
251-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
252-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
280+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
281+
LD_RUNPATH_SEARCH_PATHS = (
282+
"$(inherited)",
283+
"@executable_path/Frameworks",
284+
"@loader_path/Frameworks",
285+
);
286+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
287+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
253288
PRODUCT_BUNDLE_IDENTIFIER = org.appconfig.AppConfigSettingsFramework;
254289
PRODUCT_NAME = "$(TARGET_NAME)";
255290
SKIP_INSTALL = YES;
256291
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
257292
SWIFT_SWIFT3_OBJC_INFERENCE = On;
258-
SWIFT_VERSION = 4.2;
293+
SWIFT_VERSION = 5.0;
259294
};
260295
name = Debug;
261296
};
262297
C91CCA791C691C0700E71355 /* Release */ = {
263298
isa = XCBuildConfiguration;
264299
buildSettings = {
265300
CLANG_ENABLE_MODULES = YES;
301+
CODE_SIGN_IDENTITY = "";
266302
DEFINES_MODULE = YES;
267303
DYLIB_COMPATIBILITY_VERSION = 1;
268304
DYLIB_CURRENT_VERSION = 1;
269305
DYLIB_INSTALL_NAME_BASE = "@rpath";
306+
ENABLE_MODULE_VERIFIER = YES;
270307
INFOPLIST_FILE = AppConfigSettingsFramework/Info.plist;
271308
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
272-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
273-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
309+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
310+
LD_RUNPATH_SEARCH_PATHS = (
311+
"$(inherited)",
312+
"@executable_path/Frameworks",
313+
"@loader_path/Frameworks",
314+
);
315+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
316+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
274317
PRODUCT_BUNDLE_IDENTIFIER = org.appconfig.AppConfigSettingsFramework;
275318
PRODUCT_NAME = "$(TARGET_NAME)";
276319
SKIP_INSTALL = YES;
277320
SWIFT_SWIFT3_OBJC_INFERENCE = On;
278-
SWIFT_VERSION = 4.2;
321+
SWIFT_VERSION = 5.0;
279322
};
280323
name = Release;
281324
};

‎ios/AppConfigSettingsFramework/ManagedAppConfigSettings.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ open class ManagedAppConfigSettings: NSObject {
2525

2626
- returns: ManagedAppConfigSettings instance
2727
*/
28-
open static func clientInstance() -> ManagedAppConfigSettings
28+
public static func clientInstance() -> ManagedAppConfigSettings
2929
{
3030
_ = ManagedAppConfigSettings.__once
3131
return manager!
@@ -48,7 +48,7 @@ open class ManagedAppConfigSettings: NSObject {
4848
}
4949
}
5050
}
51-
self.checkAppConfigChanges()
51+
_ = self.checkAppConfigChanges()
5252
}
5353

5454
open func end()

0 commit comments

Comments
 (0)