Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 2c1518b

Browse files
committed
Merge branch 'develop'
2 parents 99f2707 + b787d52 commit 2c1518b

File tree

12 files changed

+15
-17
lines changed

12 files changed

+15
-17
lines changed

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "0x73/SwiftIconFont" "2.7.3"
22
github "SnapKit/SnapKit" "4.0.0"
3-
github "SvenTiigi/FlyoverKit" "1.0.0"
3+
github "SvenTiigi/FlyoverKit" "1.1.1"

STLocationRequest.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@
414414
isa = PBXProject;
415415
attributes = {
416416
LastSwiftUpdateCheck = 0920;
417-
LastUpgradeCheck = 0920;
417+
LastUpgradeCheck = 0930;
418418
ORGANIZATIONNAME = "Sven Tiigi";
419419
TargetAttributes = {
420420
3D244C822036DF9A007BD2E7 = {
@@ -614,13 +614,15 @@
614614
CLANG_WARN_BOOL_CONVERSION = YES;
615615
CLANG_WARN_COMMA = YES;
616616
CLANG_WARN_CONSTANT_CONVERSION = YES;
617+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
617618
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
618619
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
619620
CLANG_WARN_EMPTY_BODY = YES;
620621
CLANG_WARN_ENUM_CONVERSION = YES;
621622
CLANG_WARN_INFINITE_RECURSION = YES;
622623
CLANG_WARN_INT_CONVERSION = YES;
623624
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
625+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
624626
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
625627
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
626628
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -674,13 +676,15 @@
674676
CLANG_WARN_BOOL_CONVERSION = YES;
675677
CLANG_WARN_COMMA = YES;
676678
CLANG_WARN_CONSTANT_CONVERSION = YES;
679+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
677680
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
678681
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
679682
CLANG_WARN_EMPTY_BODY = YES;
680683
CLANG_WARN_ENUM_CONVERSION = YES;
681684
CLANG_WARN_INFINITE_RECURSION = YES;
682685
CLANG_WARN_INT_CONVERSION = YES;
683686
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
687+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
684688
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
685689
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
686690
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

STLocationRequest.xcodeproj/xcshareddata/xcschemes/STLocationRequest.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 = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
4544
<Testables>
4645
<TestableReference
@@ -70,7 +69,6 @@
7069
buildConfiguration = "Debug"
7170
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7271
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7472
launchStyle = "0"
7573
useCustomWorkingDirectory = "NO"
7674
ignoresPersistentStateOnLaunch = "NO"

STLocationRequest.xcodeproj/xcshareddata/xcschemes/STLocationRequestExample.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 = "0930"
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
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

STLocationRequest/Place/STLocationRequestController+PlaceChanger.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ import CoreLocation
1010

1111
extension STLocationRequestController {
1212

13+
/// ChangePlace function typealias
14+
typealias ChangePlace = (CLLocationCoordinate2D) -> Void
15+
1316
/// The PlaceChanger
1417
class PlaceChanger {
1518

16-
// MARK: Typealias
17-
18-
/// ChangePlace function typealias
19-
typealias ChangePlace = (CLLocationCoordinate2D) -> Void
20-
2119
// MARK: Properties
2220

2321
/// The places configuration
@@ -35,7 +33,7 @@ extension STLocationRequestController {
3533
/// The places
3634
private lazy var places: [CLLocationCoordinate2D] = {
3735
// Initialize Places by iterate Place enumeration with filter
38-
var places = STLocationRequestController.Place.iterate().flatMap { (place) -> CLLocationCoordinate2D? in
36+
var places = STLocationRequestController.Place.iterate().compactMap { (place) -> CLLocationCoordinate2D? in
3937
// If the current iteration is customPlaces
4038
if place == .customPlaces {
4139
return nil

STLocationRequestExample/Supporting Files/Assets.xcassets/github.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "icons8-github-22.png",
5+
"filename" : "icons8-github-filled-26.png",
66
"scale" : "1x"
77
},
88
{
99
"idiom" : "universal",
10-
"filename" : "icons8-github-44.png",
10+
"filename" : "icons8-github-filled-52.png",
1111
"scale" : "2x"
1212
},
1313
{
1414
"idiom" : "universal",
15-
"filename" : "icons8-github-88.png",
15+
"filename" : "icons8-github-filled-78.png",
1616
"scale" : "3x"
1717
}
1818
],
Binary file not shown.
Binary file not shown.
Binary file not shown.
633 Bytes
Loading

0 commit comments

Comments
 (0)