Skip to content

Commit

Permalink
Split the Example project in 2 projects:
Browse files Browse the repository at this point in the history
* FlexLayoutSample: Use cocoapods as dependency manager
* FlexLayoutSample-SPM: Use SPM (Swift Packager Manager) as dependency manager
  • Loading branch information
lucdion committed Dec 12, 2023
1 parent 49bc9c0 commit 17d9283
Show file tree
Hide file tree
Showing 15 changed files with 856 additions and 268 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,67 +2,92 @@
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
"scale" : "3x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
"scale" : "3x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
"scale" : "1x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
"scale" : "1x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
"scale" : "1x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
"scale" : "2x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ class RayWenderlichTutorialViewController: BaseViewController {
init(pageType: PageType) {
super.init()
title = pageType.text

// This property is used only on iOS 7/8/9/10. See https://developer.apple.com/documentation/uikit/uiviewcontroller/1621372-automaticallyadjustsscrollviewin
if #available(iOS 11.0, *) {
} else {
automaticallyAdjustsScrollViewInsets = false
}
}

required init?(coder aDecoder: NSCoder) {
Expand Down
699 changes: 699 additions & 0 deletions Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
26 changes: 26 additions & 0 deletions Example/cocoapods/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
opt_in_rules: # some rules are only opt-in
- closure_end_indentation
- closure_spacing
- explicit_init
- number_separator
- operator_usage_whitespace
- overridden_super_call
- private_outlet
- prohibited_super_call
- redundant_nil_coalescing

disabled_rules: # rule identifiers to exclude from running
- function_body_length
- trailing_whitespace
- force_cast
- type_name
- file_length
- type_body_length
- cyclomatic_complexity
- identifier_name
- line_length

excluded: # paths to ignore during linting. overridden by `included`.
- Pods
- Carthage
- fastlane

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
15 changes: 15 additions & 0 deletions Example/cocoapods/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
source 'https://cdn.cocoapods.org/'
use_frameworks!
platform :ios, '12.0'

workspace 'FlexLayoutSample.xcworkspace'

target 'FlexLayoutSample' do
project 'FlexLayoutSample.xcodeproj'

pod 'FlexLayout', path: '../..'
pod 'PinLayout'

# Debug only
pod 'SwiftLint'
end
27 changes: 27 additions & 0 deletions Example/cocoapods/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
PODS:
- FlexLayout (2.0.02)
- PinLayout (1.10.4)
- SwiftLint (0.53.0)

DEPENDENCIES:
- FlexLayout (from `../..`)
- PinLayout
- SwiftLint

SPEC REPOS:
trunk:
- PinLayout
- SwiftLint

EXTERNAL SOURCES:
FlexLayout:
:path: "../.."

SPEC CHECKSUMS:
FlexLayout: bd1d1738d67a455205e14c42492fe5450e3c1554
PinLayout: f8a677ce0cd1cfe96b58435d029b4ceb4ce9c04c
SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44

PODFILE CHECKSUM: acd6f8f55e169593da8f5d86c0f788512ba67886

COCOAPODS: 1.14.2
3 changes: 3 additions & 0 deletions FlexLayout.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ target 'FlexLayoutTests' do
end

target 'FlexLayoutSample' do
project 'Example/FlexLayoutSample.xcodeproj'
project 'Example/cocoapods/FlexLayoutSample.xcodeproj'

pod 'FlexLayout', path: './'
pod 'PinLayout'
Expand Down
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ SPEC CHECKSUMS:
PinLayout: f8a677ce0cd1cfe96b58435d029b4ceb4ce9c04c
SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44

PODFILE CHECKSUM: a6cf185e30e28e92d335118da8b7cfcbe601ea01
PODFILE CHECKSUM: a0f152e938c551fd661bee3ffe26ccc6175f088b

COCOAPODS: 1.13.0
COCOAPODS: 1.14.2

0 comments on commit 17d9283

Please sign in to comment.