Skip to content

Commit

Permalink
Merge pull request #817 from DeluxeAlonso/configuration/deployment-ta…
Browse files Browse the repository at this point in the history 
…rget-update

Configuration/deployment target update to iOS15
  • Loading branch information
@DeluxeAlonso
DeluxeAlonso authored Jan 22, 2024
2 parents 3ef417f + b3b12e0 commit 768d57b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
16 changes: 10 additions & 6 deletions UpcomingMovies.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@
E2EBDC32256A26090026319B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2EBDC31256A26090026319B /* Assets.xcassets */; };
E2EBDC36256A26090026319B /* UpcomingMoviesWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = E2EBDC29256A26060026319B /* UpcomingMoviesWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
E2ED5D53279920C5006F4316 /* ProgressHUDAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2ED5D52279920C5006F4316 /* ProgressHUDAdapter.swift */; };
E2EF1B4C2B5E20EA00589B51 /* UIApplication+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2EF1B4B2B5E20EA00589B51 /* UIApplication+Extensions.swift */; };
E2F789F82598401700002CAD /* AppExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F789F72598401700002CAD /* AppExtension.swift */; };
E2F78A0125985D5A00002CAD /* RootCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F78A0025985D5A00002CAD /* RootCoordinator.swift */; };
E2F9F7182201F3C300C62089 /* TransitioningInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F9F7162201F3C300C62089 /* TransitioningInteractor.swift */; };
Expand Down Expand Up @@ -951,6 +952,7 @@
E2EBDC31256A26090026319B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E2EBDC33256A26090026319B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E2ED5D52279920C5006F4316 /* ProgressHUDAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressHUDAdapter.swift; sourceTree = "<group>"; };
E2EF1B4B2B5E20EA00589B51 /* UIApplication+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Extensions.swift"; sourceTree = "<group>"; };
E2F789F72598401700002CAD /* AppExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppExtension.swift; sourceTree = "<group>"; };
E2F78A0025985D5A00002CAD /* RootCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootCoordinator.swift; sourceTree = "<group>"; };
E2F9F7162201F3C300C62089 /* TransitioningInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitioningInteractor.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1222,6 +1224,7 @@
E268CD412736FA4100E764A9 /* AppDelegate+Appearance.swift */,
E2FE720928F738D4002178BA /* UIScrollView+Extensions.swift */,
E237D3FA2A40307400E1B357 /* RangeReplaceableCollection+Extensions.swift */,
E2EF1B4B2B5E20EA00589B51 /* UIApplication+Extensions.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -2942,6 +2945,7 @@
E237D3FB2A40307400E1B357 /* RangeReplaceableCollection+Extensions.swift in Sources */,
E26911772478D7690039F144 /* RetryActionable.swift in Sources */,
E223773A21EEA317000400B7 /* GenreSearchOptionCellViewModel.swift in Sources */,
E2EF1B4C2B5E20EA00589B51 /* UIApplication+Extensions.swift in Sources */,
E2A4D93F2511C0CF00571893 /* UpcomingMoviesAssembly.swift in Sources */,
E270980D220FAFA7007F18A2 /* MovieVideoCellViewModel.swift in Sources */,
E2FB564E292DE5930011E499 /* PublishBindableProtocol.swift in Sources */,
Expand Down Expand Up @@ -3422,7 +3426,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -3480,7 +3484,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -3501,7 +3505,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = E95KU8J3PN;
INFOPLIST_FILE = UpcomingMovies/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3525,7 +3529,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = E95KU8J3PN;
INFOPLIST_FILE = UpcomingMovies/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -3639,7 +3643,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = E95KU8J3PN;
INFOPLIST_FILE = UpcomingMoviesWidgetExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3662,7 +3666,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = E95KU8J3PN;
INFOPLIST_FILE = UpcomingMoviesWidgetExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
21 changes: 21 additions & 0 deletions UpcomingMovies/Helpers/Extensions/UIApplication+Extensions.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// UIApplication+Extensions.swift
// UpcomingMovies
//
// Created by Alonso on 21/01/24.
// Copyright © 2024 Alonso. All rights reserved.
//

import UIKit

extension UIApplication {

var keyWindow: UIWindow? {
connectedScenes
.filter { $0.activationState == .foregroundActive }
.first(where: { $0 is UIWindowScene })
.flatMap({ $0 as? UIWindowScene })?.windows
.first(where: \.isKeyWindow)
}

}
2 changes: 1 addition & 1 deletion UpcomingMovies/Helpers/Extensions/UIViewController+Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ extension UIViewController {

let top = navigationController.navigationBar.intrinsicContentSize.height

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

let navBarHeight = top + statusBarHeight
Expand Down
11 changes: 2 additions & 9 deletions UpcomingMovies/Scenes/Account/CustomListDetail/HeaderView/CustomListDetailHeaderView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -62,7 +61,6 @@
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" systemColor="linkColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="5H8-fK-RG1" secondAttribute="trailing" id="2yU-2t-vzv"/>
<constraint firstItem="fRO-iW-9EL" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="3SJ-Wr-b04"/>
Expand All @@ -84,9 +82,4 @@
<point key="canvasLocation" x="131.8840579710145" y="-4.3526785714285712"/>
</view>
</objects>
<resources>
<systemColor name="linkColor">
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

0 comments on commit 768d57b

Please sign in to comment.