Skip to content

Commit 674c09d

Browse files
TullebTulleb
committed
Merge branch 'hotfix/3.1_4'
2 parents b768bfb + 1aca07c commit 674c09d

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎ALCameraViewController.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
1F3C56291F701CA7009667E9 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
1111
7AC96FA21F5B5166003E53F4 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
1212
7AD3B52D23521955002BAD73 /* CropOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3B52C23521955002BAD73 /* CropOverlay.swift */; };
13+
7AEE9B1D23536865001D3C59 /* CropOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3B52C23521955002BAD73 /* CropOverlay.swift */; };
1314
7C6AF41F1FB340CA006CB4ED /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */; };
1415
C40665441C73A47C00EB9751 /* SingleImageSaver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665431C73A47C00EB9751 /* SingleImageSaver.swift */; };
1516
C40665461C73A94100EB9751 /* CameraGlobals.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665451C73A94100EB9751 /* CameraGlobals.swift */; };
@@ -273,12 +274,12 @@
273274
attributes = {
274275
LastSwiftMigration = 0700;
275276
LastSwiftUpdateCheck = 0700;
276-
LastUpgradeCheck = 0900;
277+
LastUpgradeCheck = 1110;
277278
ORGANIZATIONNAME = zero;
278279
TargetAttributes = {
279280
C4829FFA1CAEB16C00541D08 = {
280281
CreatedOnToolsVersion = 7.3;
281-
LastSwiftMigration = 0900;
282+
LastSwiftMigration = 1110;
282283
};
283284
FAF0583E1B31618D008E5592 = {
284285
CreatedOnToolsVersion = 6.3.2;
@@ -346,6 +347,7 @@
346347
C482A0041CAEB18D00541D08 /* SingleImageSaver.swift in Sources */,
347348
C482A0051CAEB18D00541D08 /* SingleImageFetcher.swift in Sources */,
348349
1F3C56291F701CA7009667E9 /* CroppingParameters.swift in Sources */,
350+
7AEE9B1D23536865001D3C59 /* CropOverlay.swift in Sources */,
349351
C482A0061CAEB18D00541D08 /* Utilities.swift in Sources */,
350352
C482A0071CAEB18D00541D08 /* CameraShot.swift in Sources */,
351353
C482A0081CAEB18D00541D08 /* CameraGlobals.swift in Sources */,
@@ -397,22 +399,21 @@
397399
buildSettings = {
398400
CLANG_ANALYZER_NONNULL = YES;
399401
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
400-
CURRENT_PROJECT_VERSION = 3;
402+
CURRENT_PROJECT_VERSION = 4;
401403
DEBUG_INFORMATION_FORMAT = dwarf;
402404
DEFINES_MODULE = YES;
403405
DYLIB_COMPATIBILITY_VERSION = 1;
404406
DYLIB_CURRENT_VERSION = 1;
405407
DYLIB_INSTALL_NAME_BASE = "@rpath";
406408
INFOPLIST_FILE = CameraViewController/Info.plist;
407409
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
408-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
410+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
409411
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
410412
MARKETING_VERSION = 3.1;
411413
PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
412414
PRODUCT_NAME = "$(TARGET_NAME)";
413415
SKIP_INSTALL = YES;
414-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
415-
SWIFT_VERSION = 4.0;
416+
SWIFT_VERSION = 5.0;
416417
VERSIONING_SYSTEM = "apple-generic";
417418
VERSION_INFO_PREFIX = "";
418419
};
@@ -423,21 +424,20 @@
423424
buildSettings = {
424425
CLANG_ANALYZER_NONNULL = YES;
425426
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
426-
CURRENT_PROJECT_VERSION = 3;
427+
CURRENT_PROJECT_VERSION = 4;
427428
DEFINES_MODULE = YES;
428429
DYLIB_COMPATIBILITY_VERSION = 1;
429430
DYLIB_CURRENT_VERSION = 1;
430431
DYLIB_INSTALL_NAME_BASE = "@rpath";
431432
INFOPLIST_FILE = CameraViewController/Info.plist;
432433
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
433-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
434+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
434435
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
435436
MARKETING_VERSION = 3.1;
436437
PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
437438
PRODUCT_NAME = "$(TARGET_NAME)";
438439
SKIP_INSTALL = YES;
439-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
440-
SWIFT_VERSION = 4.0;
440+
SWIFT_VERSION = 5.0;
441441
VERSIONING_SYSTEM = "apple-generic";
442442
VERSION_INFO_PREFIX = "";
443443
};
@@ -447,6 +447,7 @@
447447
isa = XCBuildConfiguration;
448448
buildSettings = {
449449
ALWAYS_SEARCH_USER_PATHS = NO;
450+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
450451
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
451452
CLANG_CXX_LIBRARY = "libc++";
452453
CLANG_ENABLE_MODULES = YES;
@@ -455,12 +456,14 @@
455456
CLANG_WARN_BOOL_CONVERSION = YES;
456457
CLANG_WARN_COMMA = YES;
457458
CLANG_WARN_CONSTANT_CONVERSION = YES;
459+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
458460
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
459461
CLANG_WARN_EMPTY_BODY = YES;
460462
CLANG_WARN_ENUM_CONVERSION = YES;
461463
CLANG_WARN_INFINITE_RECURSION = YES;
462464
CLANG_WARN_INT_CONVERSION = YES;
463465
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
466+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
464467
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
465468
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
466469
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -501,6 +504,7 @@
501504
isa = XCBuildConfiguration;
502505
buildSettings = {
503506
ALWAYS_SEARCH_USER_PATHS = NO;
507+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
504508
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
505509
CLANG_CXX_LIBRARY = "libc++";
506510
CLANG_ENABLE_MODULES = YES;
@@ -509,12 +513,14 @@
509513
CLANG_WARN_BOOL_CONVERSION = YES;
510514
CLANG_WARN_COMMA = YES;
511515
CLANG_WARN_CONSTANT_CONVERSION = YES;
516+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
512517
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
513518
CLANG_WARN_EMPTY_BODY = YES;
514519
CLANG_WARN_ENUM_CONVERSION = YES;
515520
CLANG_WARN_INFINITE_RECURSION = YES;
516521
CLANG_WARN_INT_CONVERSION = YES;
517522
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
523+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
518524
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
519525
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
520526
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -549,7 +555,7 @@
549555
buildSettings = {
550556
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
551557
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
552-
CURRENT_PROJECT_VERSION = 3;
558+
CURRENT_PROJECT_VERSION = 4;
553559
DEVELOPMENT_TEAM = 9E43V6CC9L;
554560
INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
555561
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -567,7 +573,7 @@
567573
buildSettings = {
568574
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
569575
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
570-
CURRENT_PROJECT_VERSION = 3;
576+
CURRENT_PROJECT_VERSION = 4;
571577
DEVELOPMENT_TEAM = 9E43V6CC9L;
572578
INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
573579
IPHONEOS_DEPLOYMENT_TARGET = 9.0;

‎ALCameraViewController.xcodeproj/xcshareddata/xcschemes/CameraViewController.xcscheme‎

Lines changed: 1 addition & 7 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 = "0900"
3+
LastUpgradeVersion = "1110"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,18 +26,14 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
33-
<AdditionalOptions>
34-
</AdditionalOptions>
3532
</TestAction>
3633
<LaunchAction
3734
buildConfiguration = "Debug"
3835
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3936
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4137
launchStyle = "0"
4238
useCustomWorkingDirectory = "NO"
4339
ignoresPersistentStateOnLaunch = "NO"
@@ -53,8 +49,6 @@
5349
ReferencedContainer = "container:ALCameraViewController.xcodeproj">
5450
</BuildableReference>
5551
</MacroExpansion>
56-
<AdditionalOptions>
57-
</AdditionalOptions>
5852
</LaunchAction>
5953
<ProfileAction
6054
buildConfiguration = "Release"

‎ALCameraViewController/ViewController/ConfirmViewController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ public class ConfirmViewController: UIViewController {
300300

301301
func showSpinner() {
302302
spinner = UIActivityIndicatorView()
303-
spinner!.style = .white
303+
spinner!.style = .white
304304
spinner!.center = centeredView.center
305305
spinner!.startAnimating()
306306

307307
view.addSubview(spinner!)
308-
view.bringSubviewToFront(spinner!)
308+
view.bringSubviewToFront(spinner!)
309309
}
310310

311311
func hideSpinner() {

0 commit comments

Comments
 (0)