Skip to content

Commit ffe49f7

Browse files
committed
Merge branch 'release/1.4.2'
2 parents 8a8b6f1 + 23d78fc commit ffe49f7

File tree

15 files changed

+138
-80
lines changed

15 files changed

+138
-80
lines changed

.gitignore

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
11
/Pods
22
/Podfile.lock
33
.DS_Store
4+
5+
# Swift PM
6+
Package.resolved
7+
8+
## User settings
9+
xcuserdata/
10+
11+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
12+
*.xcscmblueprint
13+
*.xccheckout
14+
15+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
16+
build/
17+
DerivedData/
18+
*.moved-aside
19+
*.pbxuser
20+
!default.pbxuser
21+
*.mode1v3
22+
!default.mode1v3
23+
*.mode2v3
24+
!default.mode2v3
25+
*.perspectivev3
26+
!default.perspectivev3
27+
28+
## Obj-C/Swift specific
29+
*.hmap
30+
31+
## App packaging
32+
*.ipa
33+
*.dSYM.zip
34+
*.dSYM
35+
36+
## Playgrounds
37+
timeline.xctimeline
38+
playground.xcworkspace
39+
40+
# Swift Package Manager
41+
#
42+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
43+
# Packages/
44+
# Package.pins
45+
# Package.resolved
46+
# *.xcodeproj
47+
#
48+
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
49+
# hence it is not needed unless you have added a package configuration file to your project
50+
.swiftpm
51+
52+
.build/
Binary file not shown.

Package.swift

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
1-
// swift-tools-version:5.3
2-
// The swift-tools-version declares the minimum version of Swift required to build this package.
1+
// swift-tools-version:5.4
32

43
import PackageDescription
54

65
let package = Package(
76
name: "ScrollStackController",
7+
platforms: [.iOS(.v11)],
88
products: [
9-
// Products define the executables and libraries produced by a package, and make them visible to other packages.
109
.library(
1110
name: "ScrollStackController",
12-
targets: ["ScrollStackController"]),
13-
],
14-
dependencies: [
15-
// Dependencies declare other packages that this package depends on.
16-
// .package(url: /* package url */, from: "1.0.0"),
11+
targets: ["ScrollStackController"]
12+
),
1713
],
1814
targets: [
19-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
20-
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
2115
.target(
2216
name: "ScrollStackController",
23-
dependencies: []),
24-
.testTarget(
25-
name: "ScrollStackControllerTests",
26-
dependencies: ["ScrollStackController"]),
17+
dependencies: []
18+
),
2719
]
2820
)

ScrollStackController.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ScrollStackController"
3-
s.version = "1.4.1"
3+
s.version = "1.4.2"
44
s.summary = "Create complex scrollable layout using UIViewController and simplify your code"
55
s.homepage = "https://github.com/malcommac/ScrollStackController"
66
s.license = { :type => "MIT", :file => "LICENSE" }
@@ -10,5 +10,5 @@ Pod::Spec.new do |s|
1010
s.source = { :git => "https://github.com/malcommac/ScrollStackController.git", :tag => s.version.to_s }
1111
s.frameworks = "Foundation", "UIKit"
1212
s.source_files = 'Sources/**/*.swift'
13-
s.swift_versions = ['5.0', '5.1', '5.3']
13+
s.swift_versions = ['5.0', '5.1', '5.3', '5.4', '5.5']
1414
end

ScrollStackController.xcodeproj/project.pbxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
isa = PBXProject;
277277
attributes = {
278278
LastSwiftUpdateCheck = 1100;
279-
LastUpgradeCheck = 1020;
279+
LastUpgradeCheck = 1250;
280280
ORGANIZATIONNAME = ScrollStackController;
281281
TargetAttributes = {
282282
52D6D97B1BEFF229002C0205 = {
@@ -439,6 +439,7 @@
439439
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
440440
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
441441
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
442+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
442443
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
443444
CLANG_WARN_STRICT_PROTOTYPES = YES;
444445
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -464,7 +465,7 @@
464465
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
465466
GCC_WARN_UNUSED_FUNCTION = YES;
466467
GCC_WARN_UNUSED_VARIABLE = YES;
467-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
468+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
468469
MTL_ENABLE_DEBUG_INFO = YES;
469470
ONLY_ACTIVE_ARCH = YES;
470471
SDKROOT = iphoneos;
@@ -499,6 +500,7 @@
499500
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
500501
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
501502
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
503+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
502504
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
503505
CLANG_WARN_STRICT_PROTOTYPES = YES;
504506
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -518,7 +520,7 @@
518520
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
519521
GCC_WARN_UNUSED_FUNCTION = YES;
520522
GCC_WARN_UNUSED_VARIABLE = YES;
521-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
523+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
522524
MTL_ENABLE_DEBUG_INFO = NO;
523525
SDKROOT = iphoneos;
524526
SWIFT_VERSION = 5.0;
@@ -542,7 +544,7 @@
542544
DYLIB_INSTALL_NAME_BASE = "@rpath";
543545
INFOPLIST_FILE = Configs/ScrollStackController.plist;
544546
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
545-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
547+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
546548
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
547549
MARKETING_VERSION = 1.3.2;
548550
ONLY_ACTIVE_ARCH = NO;
@@ -567,7 +569,7 @@
567569
DYLIB_INSTALL_NAME_BASE = "@rpath";
568570
INFOPLIST_FILE = Configs/ScrollStackController.plist;
569571
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
570-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
572+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
571573
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
572574
MARKETING_VERSION = 1.3.2;
573575
PRODUCT_BUNDLE_IDENTIFIER = "com.ScrollStackController.ScrollStackController-iOS";

ScrollStackController.xcodeproj/xcshareddata/xcschemes/ScrollStackController-iOS.xcscheme

Lines changed: 12 additions & 16 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 = "1020"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
35+
BuildableName = "ScrollStackController.framework"
36+
BlueprintName = "ScrollStackController-iOS"
37+
ReferencedContainer = "container:ScrollStackController.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
47-
BuildableName = "ScrollStackController.framework"
48-
BlueprintName = "ScrollStackController-iOS"
49-
ReferencedContainer = "container:ScrollStackController.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:ScrollStackController.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

0 commit comments

Comments
 (0)