diff --git a/.gitignore b/.gitignore index 9c6af7d..1695e17 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,7 @@ playground.xcworkspace # Add this line if you want to avoid checking in source code from Carthage dependencies. # Carthage/Checkouts -Carthage/Build +#Carthage/Build # Accio dependency management Dependencies/ diff --git a/README.md b/README.md index 385ad16..61e486b 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,11 @@ Go to XCode: * File -> Swift Packages -> Add Package Dependency... * Use the URL https://github.com/fermoya/SwiftUIPager.git +### Carthage + +``` +github "fermoya/SwiftUIPager" +``` ## Usage diff --git a/Sources/SwiftUIPager/Pager+Helper.swift b/Sources/SwiftUIPager/Pager+Helper.swift index 136be7d..eafabab 100644 --- a/Sources/SwiftUIPager/Pager+Helper.swift +++ b/Sources/SwiftUIPager/Pager+Helper.swift @@ -53,7 +53,9 @@ extension Pager { /// Maximum offset allowed. This allows a bounce offset var offsetUpperbound: CGFloat { guard currentPage == numberOfPages - 1 else { return -CGFloat(numberOfPages) * self.size.width } - return -CGFloat(numberOfPagesDisplayed) / 2 * pageDistance + pageDistance / 4 + alignmentOffset + let a = -CGFloat(numberOfPagesDisplayed) / 2 + let b = pageDistance / 4 + return a * pageDistance + b + alignmentOffset } /// Addition of `draggingOffset` and `contentOffset` diff --git a/SwiftUIPager.podspec b/SwiftUIPager.podspec index e2d049a..fa87a69 100644 --- a/SwiftUIPager.podspec +++ b/SwiftUIPager.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SwiftUIPager" - s.version = "1.2.1" + s.version = "1.2.2" s.summary = "Native pager for SwiftUI. Easily to use, easy to customize." s.description = <<-DESC diff --git a/SwiftUIPager.xcodeproj/project.pbxproj b/SwiftUIPager.xcodeproj/project.pbxproj index 7a5c41c..61397bb 100644 --- a/SwiftUIPager.xcodeproj/project.pbxproj +++ b/SwiftUIPager.xcodeproj/project.pbxproj @@ -7,6 +7,19 @@ objects = { /* Begin PBXBuildFile section */ + 172F4D5323DF830600FD2F15 /* SwiftUIPager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDE441A23DE10C10022A2F7 /* SwiftUIPager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 172F4D5523DF830600FD2F15 /* SizeViewModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442723DE12480022A2F7 /* SizeViewModifier.swift */; }; + 172F4D5623DF830600FD2F15 /* Pager+Buildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442323DE12470022A2F7 /* Pager+Buildable.swift */; }; + 172F4D5723DF830600FD2F15 /* View+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442523DE12480022A2F7 /* View+Helper.swift */; }; + 172F4D5823DF830600FD2F15 /* Buildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442623DE12480022A2F7 /* Buildable.swift */; }; + 172F4D5923DF830600FD2F15 /* Pager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442223DE12470022A2F7 /* Pager.swift */; }; + 172F4D5A23DF830600FD2F15 /* Pager+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442823DE12480022A2F7 /* Pager+Helper.swift */; }; + 172F4D8023DF8B3800FD2F15 /* View+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442523DE12480022A2F7 /* View+Helper.swift */; }; + 172F4D8123DF8B3D00FD2F15 /* Buildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442623DE12480022A2F7 /* Buildable.swift */; }; + 172F4D8223DF8B3F00FD2F15 /* SizeViewModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442723DE12480022A2F7 /* SizeViewModifier.swift */; }; + 172F4D8423DF8B4400FD2F15 /* Pager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442223DE12470022A2F7 /* Pager.swift */; }; + 172F4D8523DF8B4800FD2F15 /* Pager+Buildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442323DE12470022A2F7 /* Pager+Buildable.swift */; }; + 172F4D8623DF8B4B00FD2F15 /* Pager+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442823DE12480022A2F7 /* Pager+Helper.swift */; }; 6BDE441C23DE10C10022A2F7 /* SwiftUIPager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDE441A23DE10C10022A2F7 /* SwiftUIPager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6BDE442923DE12480022A2F7 /* Pager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442223DE12470022A2F7 /* Pager.swift */; }; 6BDE442A23DE12480022A2F7 /* Pager+Buildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BDE442323DE12470022A2F7 /* Pager+Buildable.swift */; }; @@ -17,9 +30,14 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 6BDE441723DE10C10022A2F7 /* SwiftUIPager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftUIPager.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 172F4D6023DF830600FD2F15 /* SwiftUIPager_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftUIPager_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 172F4D6123DF830600FD2F15 /* Info-macOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-macOS.plist"; path = "/Users/fermoya/Documents/Tests/SwiftUIPager/SwiftUIPager/Info-macOS.plist"; sourceTree = ""; }; + 172F4D7223DF839000FD2F15 /* Info-watchOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-watchOS.plist"; path = "/Users/fermoya/Documents/Tests/SwiftUIPager/SwiftUIPager/Info-watchOS.plist"; sourceTree = ""; }; + 172F4D7823DF8A6400FD2F15 /* SwiftUIPager_watchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftUIPager_watchOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 172F4D7B23DF8A6400FD2F15 /* Info_watchOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info_watchOS.plist; sourceTree = ""; }; + 6BDE441723DE10C10022A2F7 /* SwiftUIPager_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftUIPager_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6BDE441A23DE10C10022A2F7 /* SwiftUIPager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftUIPager.h; sourceTree = ""; }; - 6BDE441B23DE10C10022A2F7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 6BDE441B23DE10C10022A2F7 /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = ""; }; 6BDE442223DE12470022A2F7 /* Pager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Pager.swift; path = Sources/SwiftUIPager/Pager.swift; sourceTree = SOURCE_ROOT; }; 6BDE442323DE12470022A2F7 /* Pager+Buildable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Pager+Buildable.swift"; path = "Sources/SwiftUIPager/Pager+Buildable.swift"; sourceTree = SOURCE_ROOT; }; 6BDE442523DE12480022A2F7 /* View+Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+Helper.swift"; sourceTree = ""; }; @@ -29,6 +47,20 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 172F4D5B23DF830600FD2F15 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 172F4D7523DF8A6400FD2F15 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 6BDE441423DE10C10022A2F7 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -50,7 +82,9 @@ 6BDE441823DE10C10022A2F7 /* Products */ = { isa = PBXGroup; children = ( - 6BDE441723DE10C10022A2F7 /* SwiftUIPager.framework */, + 6BDE441723DE10C10022A2F7 /* SwiftUIPager_iOS.framework */, + 172F4D6023DF830600FD2F15 /* SwiftUIPager_macOS.framework */, + 172F4D7823DF8A6400FD2F15 /* SwiftUIPager_watchOS.framework */, ); name = Products; sourceTree = ""; @@ -63,7 +97,10 @@ 6BDE442223DE12470022A2F7 /* Pager.swift */, 6BDE442323DE12470022A2F7 /* Pager+Buildable.swift */, 6BDE442823DE12480022A2F7 /* Pager+Helper.swift */, - 6BDE441B23DE10C10022A2F7 /* Info.plist */, + 6BDE441B23DE10C10022A2F7 /* Info-iOS.plist */, + 172F4D6123DF830600FD2F15 /* Info-macOS.plist */, + 172F4D7B23DF8A6400FD2F15 /* Info_watchOS.plist */, + 172F4D7223DF839000FD2F15 /* Info-watchOS.plist */, ); path = SwiftUIPager; sourceTree = ""; @@ -82,6 +119,21 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 172F4D5223DF830600FD2F15 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 172F4D5323DF830600FD2F15 /* SwiftUIPager.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 172F4D7323DF8A6400FD2F15 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 6BDE441223DE10C10022A2F7 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -93,9 +145,45 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 6BDE441623DE10C10022A2F7 /* SwiftUIPager */ = { + 172F4D5123DF830600FD2F15 /* SwiftUIPager_macOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 172F4D5D23DF830600FD2F15 /* Build configuration list for PBXNativeTarget "SwiftUIPager_macOS" */; + buildPhases = ( + 172F4D5223DF830600FD2F15 /* Headers */, + 172F4D5423DF830600FD2F15 /* Sources */, + 172F4D5B23DF830600FD2F15 /* Frameworks */, + 172F4D5C23DF830600FD2F15 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SwiftUIPager_macOS; + productName = SwiftUIPager; + productReference = 172F4D6023DF830600FD2F15 /* SwiftUIPager_macOS.framework */; + productType = "com.apple.product-type.framework"; + }; + 172F4D7723DF8A6400FD2F15 /* SwiftUIPager_watchOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 6BDE441F23DE10C10022A2F7 /* Build configuration list for PBXNativeTarget "SwiftUIPager" */; + buildConfigurationList = 172F4D7D23DF8A6400FD2F15 /* Build configuration list for PBXNativeTarget "SwiftUIPager_watchOS" */; + buildPhases = ( + 172F4D7323DF8A6400FD2F15 /* Headers */, + 172F4D7423DF8A6400FD2F15 /* Sources */, + 172F4D7523DF8A6400FD2F15 /* Frameworks */, + 172F4D7623DF8A6400FD2F15 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SwiftUIPager_watchOS; + productName = SwiftUIPager_watchOS; + productReference = 172F4D7823DF8A6400FD2F15 /* SwiftUIPager_watchOS.framework */; + productType = "com.apple.product-type.framework"; + }; + 6BDE441623DE10C10022A2F7 /* SwiftUIPager_iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6BDE441F23DE10C10022A2F7 /* Build configuration list for PBXNativeTarget "SwiftUIPager_iOS" */; buildPhases = ( 6BDE441223DE10C10022A2F7 /* Headers */, 6BDE441323DE10C10022A2F7 /* Sources */, @@ -106,9 +194,9 @@ ); dependencies = ( ); - name = SwiftUIPager; + name = SwiftUIPager_iOS; productName = SwiftUIPager; - productReference = 6BDE441723DE10C10022A2F7 /* SwiftUIPager.framework */; + productReference = 6BDE441723DE10C10022A2F7 /* SwiftUIPager_iOS.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -120,6 +208,9 @@ LastUpgradeCheck = 1130; ORGANIZATIONNAME = "Fernando Moya de Rivas"; TargetAttributes = { + 172F4D7723DF8A6400FD2F15 = { + CreatedOnToolsVersion = 11.2.1; + }; 6BDE441623DE10C10022A2F7 = { CreatedOnToolsVersion = 11.3; LastSwiftMigration = 1130; @@ -139,12 +230,28 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 6BDE441623DE10C10022A2F7 /* SwiftUIPager */, + 6BDE441623DE10C10022A2F7 /* SwiftUIPager_iOS */, + 172F4D5123DF830600FD2F15 /* SwiftUIPager_macOS */, + 172F4D7723DF8A6400FD2F15 /* SwiftUIPager_watchOS */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 172F4D5C23DF830600FD2F15 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 172F4D7623DF8A6400FD2F15 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 6BDE441523DE10C10022A2F7 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -155,6 +262,32 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 172F4D5423DF830600FD2F15 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 172F4D5523DF830600FD2F15 /* SizeViewModifier.swift in Sources */, + 172F4D5623DF830600FD2F15 /* Pager+Buildable.swift in Sources */, + 172F4D5723DF830600FD2F15 /* View+Helper.swift in Sources */, + 172F4D5823DF830600FD2F15 /* Buildable.swift in Sources */, + 172F4D5923DF830600FD2F15 /* Pager.swift in Sources */, + 172F4D5A23DF830600FD2F15 /* Pager+Helper.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 172F4D7423DF8A6400FD2F15 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 172F4D8123DF8B3D00FD2F15 /* Buildable.swift in Sources */, + 172F4D8423DF8B4400FD2F15 /* Pager.swift in Sources */, + 172F4D8223DF8B3F00FD2F15 /* SizeViewModifier.swift in Sources */, + 172F4D8023DF8B3800FD2F15 /* View+Helper.swift in Sources */, + 172F4D8523DF8B4800FD2F15 /* Pager+Buildable.swift in Sources */, + 172F4D8623DF8B4B00FD2F15 /* Pager+Helper.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 6BDE441323DE10C10022A2F7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -171,6 +304,117 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ + 172F4D5E23DF830600FD2F15 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftUIPager/Info-macOS.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.fmoyader.example.SwiftUIPager; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 172F4D5F23DF830600FD2F15 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftUIPager/Info-macOS.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.fmoyader.example.SwiftUIPager; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 172F4D7E23DF8A6400FD2F15 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = LPBB5C5CRP; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftUIPager/Info-watchOS.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "com.fermoya.challenge.SwiftUIPager-watchOS"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 6.0; + }; + name = Debug; + }; + 172F4D7F23DF8A6400FD2F15 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = LPBB5C5CRP; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftUIPager/Info-watchOS.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "com.fermoya.challenge.SwiftUIPager-watchOS"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 6.0; + }; + name = Release; + }; 6BDE441D23DE10C10022A2F7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -222,15 +466,18 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 6.0; }; name = Debug; }; @@ -279,15 +526,18 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 6.0; }; name = Release; }; @@ -297,12 +547,13 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = FMMUM2Q3NC; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = SwiftUIPager/Info.plist; + INFOPLIST_FILE = "SwiftUIPager/Info-iOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -323,12 +574,13 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = FMMUM2Q3NC; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = SwiftUIPager/Info.plist; + INFOPLIST_FILE = "SwiftUIPager/Info-iOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -345,6 +597,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 172F4D5D23DF830600FD2F15 /* Build configuration list for PBXNativeTarget "SwiftUIPager_macOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 172F4D5E23DF830600FD2F15 /* Debug */, + 172F4D5F23DF830600FD2F15 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 172F4D7D23DF8A6400FD2F15 /* Build configuration list for PBXNativeTarget "SwiftUIPager_watchOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 172F4D7E23DF8A6400FD2F15 /* Debug */, + 172F4D7F23DF8A6400FD2F15 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 6BDE441123DE10C10022A2F7 /* Build configuration list for PBXProject "SwiftUIPager" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -354,7 +624,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6BDE441F23DE10C10022A2F7 /* Build configuration list for PBXNativeTarget "SwiftUIPager" */ = { + 6BDE441F23DE10C10022A2F7 /* Build configuration list for PBXNativeTarget "SwiftUIPager_iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 6BDE442023DE10C10022A2F7 /* Debug */, diff --git a/SwiftUIPager.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SwiftUIPager.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/SwiftUIPager.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager.xcscheme b/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_iOS.xcscheme similarity index 91% rename from SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager.xcscheme rename to SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_iOS.xcscheme index 91c0e8e..ebe69cb 100644 --- a/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager.xcscheme +++ b/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_iOS.xcscheme @@ -15,8 +15,8 @@ @@ -51,8 +51,8 @@ diff --git a/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_macOS.xcscheme b/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_macOS.xcscheme new file mode 100644 index 0000000..3923d20 --- /dev/null +++ b/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_macOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_watchOS.xcscheme b/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_watchOS.xcscheme new file mode 100644 index 0000000..21dd8ff --- /dev/null +++ b/SwiftUIPager.xcodeproj/xcshareddata/xcschemes/SwiftUIPager_watchOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SwiftUIPager/Info.plist b/SwiftUIPager/Info-iOS.plist similarity index 100% rename from SwiftUIPager/Info.plist rename to SwiftUIPager/Info-iOS.plist diff --git a/SwiftUIPager/Info-macOS.plist b/SwiftUIPager/Info-macOS.plist new file mode 100644 index 0000000..9bcb244 --- /dev/null +++ b/SwiftUIPager/Info-macOS.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/SwiftUIPager/Info-watchOS.plist b/SwiftUIPager/Info-watchOS.plist new file mode 100644 index 0000000..9bcb244 --- /dev/null +++ b/SwiftUIPager/Info-watchOS.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/SwiftUIPager/Info_watchOS.plist b/SwiftUIPager/Info_watchOS.plist new file mode 100644 index 0000000..9bcb244 --- /dev/null +++ b/SwiftUIPager/Info_watchOS.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + +