Skip to content

Commit 3dbf6f8

Browse files
baekteunbaekteun
committed
Merge branch 'master' of https://github.com/baekteun/PinLayout 
2 parents e87f044 + 5d79378 commit 3dbf6f8

File tree

9 files changed

+120
-123
lines changed

9 files changed

+120
-123
lines changed

‎PinLayout.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,11 +1262,13 @@
12621262
DYLIB_INSTALL_NAME_BASE = "@rpath";
12631263
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
12641264
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1265+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
12651266
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12661267
PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.PinLayout-iOS";
12671268
PRODUCT_NAME = PinLayout;
12681269
SKIP_INSTALL = YES;
12691270
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1271+
TVOS_DEPLOYMENT_TARGET = 9.0;
12701272
};
12711273
name = Debug;
12721274
};
@@ -1282,10 +1284,12 @@
12821284
DYLIB_INSTALL_NAME_BASE = "@rpath";
12831285
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
12841286
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1287+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
12851288
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12861289
PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.PinLayout-iOS";
12871290
PRODUCT_NAME = PinLayout;
12881291
SKIP_INSTALL = YES;
1292+
TVOS_DEPLOYMENT_TARGET = 9.0;
12891293
};
12901294
name = Release;
12911295
};

‎Sources/Extensions/UIView+PinLayout.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,8 @@ extension UIView: Layoutable, SizeCalculable {
8484
case .auto:
8585
if #available(iOS 10.0, tvOS 10.0, *) {
8686
return effectiveUserInterfaceLayoutDirection == .leftToRight
87-
} else if #available(iOS 9.0, *) {
88-
return UIView.userInterfaceLayoutDirection(for: semanticContentAttribute) == .leftToRight
89-
} else if let shared = UIApplication.value(forKey: "sharedApplication") as? UIApplication {
90-
return shared.userInterfaceLayoutDirection == .leftToRight
9187
} else {
92-
return true
88+
return UIView.userInterfaceLayoutDirection(for: semanticContentAttribute) == .leftToRight
9389
}
9490
case .ltr: return true
9591
case .rtl: return false

‎TestProjects/cocoapods/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
source 'https://github.com/CocoaPods/Specs.git'
1+
source 'https://cdn.cocoapods.org/'
22
platform :ios, '9.0'
33

44
use_frameworks!

‎TestProjects/cocoapods/ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- PinLayout (1.9.3)
2+
- PinLayout (1.10.0)
33
- SwifterSwift (5.0.0):
44
- SwifterSwift/AppKit (= 5.0.0)
55
- SwifterSwift/CoreGraphics (= 5.0.0)
@@ -25,17 +25,17 @@ DEPENDENCIES:
2525
- SwifterSwift
2626

2727
SPEC REPOS:
28-
https://github.com/cocoapods/specs.git:
28+
trunk:
2929
- SwifterSwift
3030

3131
EXTERNAL SOURCES:
3232
PinLayout:
3333
:path: "../../.."
3434

3535
SPEC CHECKSUMS:
36-
PinLayout: 45d8413afa778da892f6c2d4f898fb8de88c8e29
36+
PinLayout: e50e9a748b632905fca6e67043ea4b05d6c92186
3737
SwifterSwift: 96f90594b370802f01647c2b1229c74a84ffafee
3838

39-
PODFILE CHECKSUM: c982140b0cd5bfe70429dbe53e838e301e7b0022
39+
PODFILE CHECKSUM: 3eeeff509b48ae95b0ba6a131fc224e3d13ac363
4040

41-
COCOAPODS: 1.7.5
41+
COCOAPODS: 1.11.2

‎TestProjects/cocoapods/macos/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
source 'https://github.com/CocoaPods/Specs.git'
1+
source 'https://cdn.cocoapods.org/'
22
platform :osx, '10.11'
33

44
use_frameworks!

‎TestProjects/cocoapods/macos/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- PinLayout (1.9.3)
2+
- PinLayout (1.10.0)
33

44
DEPENDENCIES:
55
- PinLayout (from `../../..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: "../../.."
1010

1111
SPEC CHECKSUMS:
12-
PinLayout: 45d8413afa778da892f6c2d4f898fb8de88c8e29
12+
PinLayout: e50e9a748b632905fca6e67043ea4b05d6c92186
1313

14-
PODFILE CHECKSUM: e4d7a00501eec9097d00e6c5397befb6e16ccaec
14+
PODFILE CHECKSUM: 86e6c0cc7c81d4254004a467812b22fc28f71f5d
1515

16-
COCOAPODS: 1.7.5
16+
COCOAPODS: 1.11.2

‎TestProjects/cocoapods/tvos/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
source 'https://github.com/CocoaPods/Specs.git'
1+
source 'https://cdn.cocoapods.org/'
22
platform :tvos, '10.3'
33

44
target 'PinLayout-tvOS' do

‎TestProjects/cocoapods/tvos/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- PinLayout (1.9.3)
2+
- PinLayout (1.10.0)
33

44
DEPENDENCIES:
55
- PinLayout (from `../../..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: "../../.."
1010

1111
SPEC CHECKSUMS:
12-
PinLayout: 45d8413afa778da892f6c2d4f898fb8de88c8e29
12+
PinLayout: e50e9a748b632905fca6e67043ea4b05d6c92186
1313

14-
PODFILE CHECKSUM: 8c63011727a286dcaaff051ed3b2eedd5363f244
14+
PODFILE CHECKSUM: 60349558e04e1526c8f0f58c7473553a38d0b7f6
1515

16-
COCOAPODS: 1.7.5
16+
COCOAPODS: 1.11.2

‎build-ci.sh

Lines changed: 99 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,65 @@
1+
set -e
2+
13
DERIVED_DATA=${1:-/tmp/PinLayout}
24
BASEDIR=$(pwd)
35

4-
set -e &&
5-
set -o pipefail &&
6-
rm -rf $DERIVED_DATA &&
6+
set -e
7+
set -o pipefail
8+
rm -rf $DERIVED_DATA
79

8-
echo "===============================" &&
9-
echo "PinLayout-iOS" &&
10-
echo "===============================" &&
11-
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS \
10+
echo "==============================="
11+
echo "PinLayout-iOS"
12+
echo "==============================="
13+
xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS \
1214
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
1315
-destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
14-
| xcpretty &&
16+
| xcpretty
1517

16-
echo "===============================" &&
17-
echo "PinLayout-tvOS" &&
18-
echo "===============================" &&
19-
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS \
18+
echo "==============================="
19+
echo "PinLayout-tvOS"
20+
echo "==============================="
21+
xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS \
2022
-derivedDataPath $DERIVED_DATA -sdk appletvsimulator15.2 \
2123
-destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=15.2' \
22-
| xcpretty &&
23-
24-
echo "===============================" &&
25-
echo "PinLayout-macOS" &&
26-
echo "===============================" &&
27-
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-macOS \
28-
-derivedDataPath $DERIVED_DATA -sdk macosx11.3 \
29-
| xcpretty &&
30-
31-
echo "===============================" &&
32-
echo "PinLayoutSample" &&
33-
echo "===============================" &&
34-
time xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
24+
| xcpretty
25+
26+
echo "==============================="
27+
echo "PinLayout-macOS"
28+
echo "==============================="
29+
xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-macOS \
30+
-derivedDataPath $DERIVED_DATA -sdk macosx12.1 \
31+
| xcpretty
32+
33+
echo "==============================="
34+
echo "PinLayoutSample"
35+
echo "==============================="
36+
xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
3537
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
3638
-destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
37-
| xcpretty &&
39+
| xcpretty
3840

39-
time xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
41+
xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
4042
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
41-
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
42-
| xcpretty &&
43+
-destination 'platform=iOS Simulator,name=iPhone 8,OS=14.1' \
44+
| xcpretty
4345

44-
echo "===============================" &&
45-
echo "iOS unit test" &&
46-
echo "===============================" &&
47-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
46+
echo "==============================="
47+
echo "iOS unit test"
48+
echo "==============================="
49+
xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
4850
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
49-
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
50-
| xcpretty &&
51+
-destination 'platform=iOS Simulator,name=iPhone 8,OS=14.1' \
52+
| xcpretty
5153

52-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
53-
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
54-
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.5' \
55-
| xcpretty &&
56-
57-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
54+
xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
5855
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
5956
-destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
60-
| xcpretty &&
57+
| xcpretty
6158

6259
# echo "==============================="
6360
# echo "tvOS unit test"
6461
# echo "==============================="
65-
# time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
62+
# xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
6663
# -derivedDataPath $DERIVED_DATA -sdk appletvos15.2 \
6764
# -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=15.2' \
6865
# | xcpretty
@@ -71,66 +68,66 @@ time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-i
7168
# echo "==============================="
7269
# echo "macOS unit test"
7370
# echo "==============================="
74-
# time xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS \
75-
# -derivedDataPath $DERIVED_DATA -sdk macosx11.3 \
71+
# xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS \
72+
# -derivedDataPath $DERIVED_DATA -sdk macosx12.1 \
7673
# | xcpretty
7774

78-
echo "===============================" &&
79-
echo " Cocoapods: iOS Empty project" &&
80-
echo "===============================" &&
81-
cd TestProjects/cocoapods/ios &&
82-
rm -rf $DERIVED_DATA &&
83-
pod install &&
84-
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS \
75+
echo "==============================="
76+
echo " Cocoapods: iOS Empty project"
77+
echo "==============================="
78+
cd TestProjects/cocoapods/ios
79+
rm -rf $DERIVED_DATA
80+
arch -x86_64 pod install
81+
xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS \
8582
-sdk iphonesimulator15.2 -derivedDataPath $DERIVED_DATA \
8683
-destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
87-
| xcpretty &&
88-
cd ../../.. &&
89-
90-
91-
echo "===============================" &&
92-
echo " Cocoapods: macOS Empty project" &&
93-
echo "===============================" &&
94-
cd TestProjects/cocoapods/macos &&
95-
rm -rf $DERIVED_DATA &&
96-
pod install &&
97-
time xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS \
98-
-sdk macosx11.3 -derivedDataPath $DERIVED_DATA \
99-
| xcpretty &&
100-
rm -rf $DERIVED_DATA &&
101-
cd ../../.. &&
102-
103-
104-
echo "===============================" &&
105-
echo " Cocoapods: tvOS Empty project" &&
106-
echo "===============================" &&
107-
cd TestProjects/cocoapods/tvos &&
108-
rm -rf $DERIVED_DATA &&
109-
pod install &&
110-
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS \
84+
| xcpretty
85+
cd ../../..
86+
87+
88+
echo "==============================="
89+
echo " Cocoapods: macOS Empty project"
90+
echo "==============================="
91+
cd TestProjects/cocoapods/macos
92+
rm -rf $DERIVED_DATA
93+
arch -x86_64 pod install
94+
xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS \
95+
-sdk macosx12.1 -derivedDataPath $DERIVED_DATA \
96+
| xcpretty
97+
rm -rf $DERIVED_DATA
98+
cd ../../..
99+
100+
101+
echo "==============================="
102+
echo " Cocoapods: tvOS Empty project"
103+
echo "==============================="
104+
cd TestProjects/cocoapods/tvos
105+
rm -rf $DERIVED_DATA
106+
arch -x86_64 pod install
107+
xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS \
111108
-sdk appletvsimulator15.2 -derivedDataPath $DERIVED_DATA \
112109
-destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=15.2' \
113-
| xcpretty &&
114-
rm -rf $DERIVED_DATA &&
115-
cd ../../.. &&
116-
117-
118-
echo "===============================" &&
119-
echo " Carthage: iOS Empty project" &&
120-
echo "===============================" &&
121-
cd TestProjects/carthage/ios &&
122-
rm -rf $DERIVED_DATA &&
123-
rm Cartfile &&
124-
echo "git \"file:///$BASEDIR\"" > Cartfile &&
125-
carthage update --use-ssh --platform iOS --use-xcframeworks &&
126-
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj \
127-
-scheme PinLayout-Carthage-iOS -sdk iphonesimulator15.2 \
128-
-derivedDataPath $DERIVED_DATA \
129-
-destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
130-
| xcpretty &&
131-
rm -rf $DERIVED_DATA &&
132-
rm Cartfile.resolved &&
133-
cd ../../.. &&
110+
| xcpretty
111+
rm -rf $DERIVED_DATA
112+
cd ../../..
113+
114+
115+
# echo "==============================="
116+
# echo " Carthage: iOS Empty project"
117+
# echo "==============================="
118+
# cd TestProjects/carthage/ios
119+
# rm -rf $DERIVED_DATA
120+
# rm Cartfile
121+
# echo "git \"file:///$BASEDIR\"" > Cartfile
122+
# carthage update --use-ssh --platform iOS --use-xcframeworks
123+
# xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj \
124+
# -scheme PinLayout-Carthage-iOS -sdk iphonesimulator15.2 \
125+
# -derivedDataPath $DERIVED_DATA \
126+
# -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
127+
# | xcpretty
128+
# rm -rf $DERIVED_DATA
129+
# rm Cartfile.resolved
130+
# cd ../../..
134131

135132

136133
echo "=========================================="
@@ -139,13 +136,13 @@ echo "=========================================="
139136
cd TestProjects/swift-package-manager/ios
140137
rm -rf $DERIVED_DATA
141138
rm -rf .build
142-
time xcodebuild clean build -project PinLayout-SPM-iOS.xcodeproj -scheme PinLayout-SPM-iOS -sdk iphonesimulator15.2 -derivedDataPath $DERIVED_DATA \
139+
xcodebuild clean build -project PinLayout-SPM-iOS.xcodeproj -scheme PinLayout-SPM-iOS -sdk iphonesimulator15.2 -derivedDataPath $DERIVED_DATA \
143140
-destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
144141
| xcpretty
145142
cd ../../..
146143

147144

148-
echo "===============================" &&
149-
echo " Pod lib lint" &&
150-
echo "===============================" &&
151-
time bundle exec pod lib lint --allow-warnings
145+
echo "==============================="
146+
echo " Pod lib lint"
147+
echo "==============================="
148+
bundle exec pod lib lint --allow-warnings

0 commit comments

Comments
 (0)