Skip to content

Commit 768d57b

Browse files
DeluxeAlonsoDeluxeAlonso
authored
Merge pull request #817 from DeluxeAlonso/configuration/deployment-target-update
Configuration/deployment target update to iOS15
2 parents 3ef417f + b3b12e0 commit 768d57b

File tree

4 files changed

+34
-16
lines changed

4 files changed

+34
-16
lines changed

‎UpcomingMovies.xcodeproj/project.pbxproj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@
436436
E2EBDC32256A26090026319B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2EBDC31256A26090026319B /* Assets.xcassets */; };
437437
E2EBDC36256A26090026319B /* UpcomingMoviesWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = E2EBDC29256A26060026319B /* UpcomingMoviesWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
438438
E2ED5D53279920C5006F4316 /* ProgressHUDAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2ED5D52279920C5006F4316 /* ProgressHUDAdapter.swift */; };
439+
E2EF1B4C2B5E20EA00589B51 /* UIApplication+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2EF1B4B2B5E20EA00589B51 /* UIApplication+Extensions.swift */; };
439440
E2F789F82598401700002CAD /* AppExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F789F72598401700002CAD /* AppExtension.swift */; };
440441
E2F78A0125985D5A00002CAD /* RootCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F78A0025985D5A00002CAD /* RootCoordinator.swift */; };
441442
E2F9F7182201F3C300C62089 /* TransitioningInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F9F7162201F3C300C62089 /* TransitioningInteractor.swift */; };
@@ -951,6 +952,7 @@
951952
E2EBDC31256A26090026319B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
952953
E2EBDC33256A26090026319B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
953954
E2ED5D52279920C5006F4316 /* ProgressHUDAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressHUDAdapter.swift; sourceTree = "<group>"; };
955+
E2EF1B4B2B5E20EA00589B51 /* UIApplication+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Extensions.swift"; sourceTree = "<group>"; };
954956
E2F789F72598401700002CAD /* AppExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppExtension.swift; sourceTree = "<group>"; };
955957
E2F78A0025985D5A00002CAD /* RootCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootCoordinator.swift; sourceTree = "<group>"; };
956958
E2F9F7162201F3C300C62089 /* TransitioningInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitioningInteractor.swift; sourceTree = "<group>"; };
@@ -1222,6 +1224,7 @@
12221224
E268CD412736FA4100E764A9 /* AppDelegate+Appearance.swift */,
12231225
E2FE720928F738D4002178BA /* UIScrollView+Extensions.swift */,
12241226
E237D3FA2A40307400E1B357 /* RangeReplaceableCollection+Extensions.swift */,
1227+
E2EF1B4B2B5E20EA00589B51 /* UIApplication+Extensions.swift */,
12251228
);
12261229
path = Extensions;
12271230
sourceTree = "<group>";
@@ -2942,6 +2945,7 @@
29422945
E237D3FB2A40307400E1B357 /* RangeReplaceableCollection+Extensions.swift in Sources */,
29432946
E26911772478D7690039F144 /* RetryActionable.swift in Sources */,
29442947
E223773A21EEA317000400B7 /* GenreSearchOptionCellViewModel.swift in Sources */,
2948+
E2EF1B4C2B5E20EA00589B51 /* UIApplication+Extensions.swift in Sources */,
29452949
E2A4D93F2511C0CF00571893 /* UpcomingMoviesAssembly.swift in Sources */,
29462950
E270980D220FAFA7007F18A2 /* MovieVideoCellViewModel.swift in Sources */,
29472951
E2FB564E292DE5930011E499 /* PublishBindableProtocol.swift in Sources */,
@@ -3422,7 +3426,7 @@
34223426
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
34233427
GCC_WARN_UNUSED_FUNCTION = YES;
34243428
GCC_WARN_UNUSED_VARIABLE = YES;
3425-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3429+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
34263430
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
34273431
MTL_FAST_MATH = YES;
34283432
ONLY_ACTIVE_ARCH = YES;
@@ -3480,7 +3484,7 @@
34803484
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
34813485
GCC_WARN_UNUSED_FUNCTION = YES;
34823486
GCC_WARN_UNUSED_VARIABLE = YES;
3483-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3487+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
34843488
MTL_ENABLE_DEBUG_INFO = NO;
34853489
MTL_FAST_MATH = YES;
34863490
SDKROOT = iphoneos;
@@ -3501,7 +3505,7 @@
35013505
CODE_SIGN_STYLE = Automatic;
35023506
DEVELOPMENT_TEAM = E95KU8J3PN;
35033507
INFOPLIST_FILE = UpcomingMovies/Info.plist;
3504-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3508+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
35053509
LD_RUNPATH_SEARCH_PATHS = (
35063510
"$(inherited)",
35073511
"@executable_path/Frameworks",
@@ -3525,7 +3529,7 @@
35253529
CODE_SIGN_STYLE = Automatic;
35263530
DEVELOPMENT_TEAM = E95KU8J3PN;
35273531
INFOPLIST_FILE = UpcomingMovies/Info.plist;
3528-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3532+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
35293533
LD_RUNPATH_SEARCH_PATHS = (
35303534
"$(inherited)",
35313535
"@executable_path/Frameworks",
@@ -3639,7 +3643,7 @@
36393643
CODE_SIGN_STYLE = Automatic;
36403644
DEVELOPMENT_TEAM = E95KU8J3PN;
36413645
INFOPLIST_FILE = UpcomingMoviesWidgetExtension/Info.plist;
3642-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3646+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
36433647
LD_RUNPATH_SEARCH_PATHS = (
36443648
"$(inherited)",
36453649
"@executable_path/Frameworks",
@@ -3662,7 +3666,7 @@
36623666
CODE_SIGN_STYLE = Automatic;
36633667
DEVELOPMENT_TEAM = E95KU8J3PN;
36643668
INFOPLIST_FILE = UpcomingMoviesWidgetExtension/Info.plist;
3665-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3669+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
36663670
LD_RUNPATH_SEARCH_PATHS = (
36673671
"$(inherited)",
36683672
"@executable_path/Frameworks",

‎UpcomingMovies/Helpers/Extensions/UIApplication+Extensions.swift

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// UIApplication+Extensions.swift
3+
// UpcomingMovies
4+
//
5+
// Created by Alonso on 21/01/24.
6+
// Copyright © 2024 Alonso. All rights reserved.
7+
//
8+
9+
import UIKit
10+
11+
extension UIApplication {
12+
13+
var keyWindow: UIWindow? {
14+
connectedScenes
15+
.filter { $0.activationState == .foregroundActive }
16+
.first(where: { $0 is UIWindowScene })
17+
.flatMap({ $0 as? UIWindowScene })?.windows
18+
.first(where: \.isKeyWindow)
19+
}
20+
21+
}

‎UpcomingMovies/Helpers/Extensions/UIViewController+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ extension UIViewController {
131131

132132
let top = navigationController.navigationBar.intrinsicContentSize.height
133133

134-
let window = UIApplication.shared.windows.filter {$0.isKeyWindow}.first
134+
let window = UIApplication.shared.keyWindow
135135
let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
136136

137137
let navBarHeight = top + statusBarHeight

‎UpcomingMovies/Scenes/Account/CustomListDetail/HeaderView/CustomListDetailHeaderView.xib

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
7-
<capability name="System colors in document resources" minToolsVersion="11.0"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
87
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
98
</dependencies>
109
<objects>
@@ -62,7 +61,6 @@
6261
</subviews>
6362
</stackView>
6463
</subviews>
65-
<color key="backgroundColor" systemColor="linkColor"/>
6664
<constraints>
6765
<constraint firstAttribute="trailing" secondItem="5H8-fK-RG1" secondAttribute="trailing" id="2yU-2t-vzv"/>
6866
<constraint firstItem="fRO-iW-9EL" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="3SJ-Wr-b04"/>
@@ -84,9 +82,4 @@
8482
<point key="canvasLocation" x="131.8840579710145" y="-4.3526785714285712"/>
8583
</view>
8684
</objects>
87-
<resources>
88-
<systemColor name="linkColor">
89-
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
90-
</systemColor>
91-
</resources>
9285
</document>

0 commit comments

Comments
 (0)