Skip to content

Commit 7f62a62

Browse files
lucdionlucdion
authored
Merge pull request #240 from layoutBox/examples_refactor
Split the Example project in 2 projects (Cocoapods & SPM)
2 parents d388043 + 366f6c6 commit 7f62a62

File tree

19 files changed

+1051
-384
lines changed

19 files changed

+1051
-384
lines changed

‎.github/workflows/github-actions-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
CI:
66
# ℹ️ Available GitHub Actions Runner Images
77
# https://github.com/actions/runner-images
8-
runs-on: macos-latest
8+
runs-on: macos-13
99

1010
steps:
1111
- name: Checkout
@@ -14,8 +14,8 @@ jobs:
1414
- run: bundle install
1515
- run: pod install --repo-update
1616

17-
- name: Set Xcode Version 14.2.0 (iOS 16.2)
18-
run: sudo xcode-select -s /Applications/Xcode_14.2.0.app
17+
- name: Set Xcode Version 15.1.0 (iOS 17)
18+
run: sudo xcode-select -s /Applications/Xcode_15.1.app
1919

2020
- name: fastlane
2121
run: set -o pipefail && bundle exec fastlane travis

‎Example/FlexLayoutSample/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 52 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,92 @@
22
"images" : [
33
{
44
"idiom" : "iphone",
5-
"size" : "29x29",
6-
"scale" : "2x"
5+
"scale" : "2x",
6+
"size" : "20x20"
77
},
88
{
99
"idiom" : "iphone",
10-
"size" : "29x29",
11-
"scale" : "3x"
10+
"scale" : "3x",
11+
"size" : "20x20"
1212
},
1313
{
1414
"idiom" : "iphone",
15-
"size" : "40x40",
16-
"scale" : "2x"
15+
"scale" : "2x",
16+
"size" : "29x29"
1717
},
1818
{
1919
"idiom" : "iphone",
20-
"size" : "40x40",
21-
"scale" : "3x"
20+
"scale" : "3x",
21+
"size" : "29x29"
2222
},
2323
{
2424
"idiom" : "iphone",
25-
"size" : "60x60",
26-
"scale" : "2x"
25+
"scale" : "2x",
26+
"size" : "40x40"
2727
},
2828
{
2929
"idiom" : "iphone",
30-
"size" : "60x60",
31-
"scale" : "3x"
30+
"scale" : "3x",
31+
"size" : "40x40"
32+
},
33+
{
34+
"idiom" : "iphone",
35+
"scale" : "2x",
36+
"size" : "60x60"
37+
},
38+
{
39+
"idiom" : "iphone",
40+
"scale" : "3x",
41+
"size" : "60x60"
42+
},
43+
{
44+
"idiom" : "ipad",
45+
"scale" : "2x",
46+
"size" : "20x20"
3247
},
3348
{
3449
"idiom" : "ipad",
35-
"size" : "29x29",
36-
"scale" : "1x"
50+
"scale" : "1x",
51+
"size" : "29x29"
3752
},
3853
{
3954
"idiom" : "ipad",
40-
"size" : "29x29",
41-
"scale" : "2x"
55+
"scale" : "2x",
56+
"size" : "29x29"
4257
},
4358
{
4459
"idiom" : "ipad",
45-
"size" : "40x40",
46-
"scale" : "1x"
60+
"scale" : "1x",
61+
"size" : "40x40"
4762
},
4863
{
4964
"idiom" : "ipad",
50-
"size" : "40x40",
51-
"scale" : "2x"
65+
"scale" : "2x",
66+
"size" : "40x40"
5267
},
5368
{
5469
"idiom" : "ipad",
55-
"size" : "76x76",
56-
"scale" : "1x"
70+
"scale" : "1x",
71+
"size" : "76x76"
5772
},
5873
{
5974
"idiom" : "ipad",
60-
"size" : "76x76",
61-
"scale" : "2x"
75+
"scale" : "2x",
76+
"size" : "76x76"
77+
},
78+
{
79+
"idiom" : "ipad",
80+
"scale" : "2x",
81+
"size" : "83.5x83.5"
82+
},
83+
{
84+
"idiom" : "ios-marketing",
85+
"scale" : "1x",
86+
"size" : "1024x1024"
6287
}
6388
],
6489
"info" : {
65-
"version" : 1,
66-
"author" : "xcode"
90+
"author" : "xcode",
91+
"version" : 1
6792
}
68-
}
93+
}

‎Example/FlexLayoutSample/UI/Examples/RaywenderlichTutorial/RaywenderlichTutorialViewController.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ class RayWenderlichTutorialViewController: BaseViewController {
2222
init(pageType: PageType) {
2323
super.init()
2424
title = pageType.text
25-
26-
// This property is used only on iOS 7/8/9/10. See https://developer.apple.com/documentation/uikit/uiviewcontroller/1621372-automaticallyadjustsscrollviewin
27-
if #available(iOS 11.0, *) {
28-
} else {
29-
automaticallyAdjustsScrollViewInsets = false
30-
}
3125
}
3226

3327
required init?(coder aDecoder: NSCoder) {

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.pbxproj

Lines changed: 701 additions & 0 deletions
Large diffs are not rendered by default.

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample-SPM.xcscheme

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1510"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "B9EA7C512409B79B000D8E35"
18+
BuildableName = "FlexLayoutSample-SPM.app"
19+
BlueprintName = "FlexLayoutSample-SPM"
20+
ReferencedContainer = "container:FlexLayoutSample-SPM.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
shouldAutocreateTestPlan = "YES">
31+
</TestAction>
32+
<LaunchAction
33+
buildConfiguration = "Debug"
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
36+
launchStyle = "0"
37+
useCustomWorkingDirectory = "NO"
38+
ignoresPersistentStateOnLaunch = "NO"
39+
debugDocumentVersioning = "YES"
40+
debugServiceExtension = "internal"
41+
allowLocationSimulation = "YES">
42+
<BuildableProductRunnable
43+
runnableDebuggingMode = "0">
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "B9EA7C512409B79B000D8E35"
47+
BuildableName = "FlexLayoutSample-SPM.app"
48+
BlueprintName = "FlexLayoutSample-SPM"
49+
ReferencedContainer = "container:FlexLayoutSample-SPM.xcodeproj">
50+
</BuildableReference>
51+
</BuildableProductRunnable>
52+
</LaunchAction>
53+
<ProfileAction
54+
buildConfiguration = "Release"
55+
shouldUseLaunchSchemeArgsEnv = "YES"
56+
savedToolIdentifier = ""
57+
useCustomWorkingDirectory = "NO"
58+
debugDocumentVersioning = "YES">
59+
<BuildableProductRunnable
60+
runnableDebuggingMode = "0">
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "B9EA7C512409B79B000D8E35"
64+
BuildableName = "FlexLayoutSample-SPM.app"
65+
BlueprintName = "FlexLayoutSample-SPM"
66+
ReferencedContainer = "container:FlexLayoutSample-SPM.xcodeproj">
67+
</BuildableReference>
68+
</BuildableProductRunnable>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

0 commit comments

Comments
 (0)