Skip to content

Commit

Permalink
Update project to be compatible with Xcode 15 (#290)
Browse files Browse the repository at this point in the history
* Update gems

* Update minimum deployment target to 12.0

* Fix Mac Catalyst version support

* Update project settings

* Bump version number
  • Loading branch information
msaps authored Apr 6, 2024
1 parent 5522aa6 commit 31eda06
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 118 deletions.
204 changes: 106 additions & 98 deletions Gemfile.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Pageboy.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Pod::Spec.new do |s|

s.name = "Pageboy"

s.ios.deployment_target = '11.0'
s.tvos.deployment_target = '11.0'
s.ios.deployment_target = '12.0'
s.tvos.deployment_target = '12.0'

s.swift_versions = ['5.0']

s.requires_arc = true

s.version = "4.0.2"
s.version = "4.1.0"
s.summary = "A simple, highly informative page view controller."
s.description = <<-DESC
A page view controller that provides simplified data source management, enhanced delegation and other useful features.
Expand Down
6 changes: 3 additions & 3 deletions Pageboy.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PB_VERSION=4.0.2
PB_VERSION=4.1.0

PB_IOS_DEPLOYMENT_TARGET=11.0
PB_TVOS_DEPLOYMENT_TARGET=11.0
PB_IOS_DEPLOYMENT_TARGET=12.0
PB_TVOS_DEPLOYMENT_TARGET=12.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- [x] Support for custom animated page transitions.

## 📋 Requirements
Pageboy requires iOS 11 / tvOS 11; and is compatible with Swift 5.
Pageboy requires iOS 12 / tvOS 12; and is compatible with Swift 5.

## 📲 Installation

Expand Down
32 changes: 23 additions & 9 deletions Sources/Examples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -297,8 +297,9 @@
D623B1D61E1D32D700527F3D /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1200;
LastUpgradeCheck = 1400;
LastUpgradeCheck = 1530;
ORGANIZATIONNAME = "UI At Six";
TargetAttributes = {
4614988E2531E7C700AE1B1B = {
Expand Down Expand Up @@ -451,7 +452,10 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = tvOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = "$(PB_VERSION)";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand All @@ -477,7 +481,10 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = tvOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = "$(PB_VERSION)";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.uias.Pageboy.tvOS;
Expand All @@ -504,8 +511,10 @@
DEVELOPMENT_TEAM = 5792P6S32Z;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = iOS/Info.plist;
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = "$(PB_VERSION)";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand All @@ -532,8 +541,10 @@
DEVELOPMENT_TEAM = 5792P6S32Z;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = iOS/Info.plist;
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = "$(PB_VERSION)";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.uias.Pageboy.iOS;
Expand Down Expand Up @@ -581,6 +592,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -644,6 +656,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -655,7 +668,8 @@
IPHONEOS_DEPLOYMENT_TARGET = "$(PB_IOS_DEPLOYMENT_TARGET)";
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = "$(PB_TVOS_DEPLOYMENT_TARGET)";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1400"
LastUpgradeVersion = "1530"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1400"
LastUpgradeVersion = "1530"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1400"
LastUpgradeVersion = "1530"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 3 additions & 1 deletion Sources/iOS/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {

if let titlebar = windowScene.titlebar {
titlebar.toolbar = toolbar
titlebar.toolbarStyle = .automatic
if #available(iOS 14.0, *) {
titlebar.toolbarStyle = .automatic
}
}

pageViewController.registerForNavigationNotifications()
Expand Down

0 comments on commit 31eda06

Please sign in to comment.