Skip to content

Commit

Permalink
Merge pull request #160 from Babylonpartners/release/0.4.0
Browse files Browse the repository at this point in the history
Release 0.4.0 (master)
  • Loading branch information
TheAdamBorek authored May 2, 2019
2 parents 09a21db + 3756889 commit c200a3f
Show file tree
Hide file tree
Showing 447 changed files with 4,153 additions and 3,132 deletions.
9 changes: 4 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@ version: 2
jobs:
build-and-test:
macos:
xcode: "10.0.0"
xcode: "10.2.0"

working_directory: /Users/distiller/project

steps:
- checkout
- run: git submodule sync --recursive
- run: git submodule update --init --recursive
- run: script/test iphonesimulator "platform=iOS Simulator,name=iPhone 6,OS=12.0" Bento
- run: script/test iphonesimulator "platform=iOS Simulator,name=iPhone 6,OS=12.0" BentoKit
- run: script/test iphonesimulator "platform=iOS Simulator,name=iPhone 6,OS=12.0" StyleSheets
- run: script/test iphonesimulator "platform=iOS Simulator,name=iPhone 6,OS=12.0" BentoExample build
- run: script/test iphonesimulator "platform=iOS Simulator,name=iPhone 6,OS=12.2" Bento
- run: script/test iphonesimulator "platform=iOS Simulator,name=iPhone 6,OS=12.2" BentoKit
- run: script/test iphonesimulator "platform=iOS Simulator,name=iPhone 6,OS=12.2" BentoExample build

workflows:
version: 2
Expand Down
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
[submodule "Carthage/Checkouts/Nimble"]
path = Carthage/Checkouts/Nimble
url = https://github.com/Quick/Nimble.git
[submodule "Carthage/Checkouts/ReactiveFeedback"]
path = Carthage/Checkouts/ReactiveFeedback
url = https://github.com/Babylonpartners/ReactiveFeedback.git
[submodule "Carthage/Checkouts/Kingfisher"]
path = Carthage/Checkouts/Kingfisher
url = https://github.com/onevcat/Kingfisher.git
[submodule "Carthage/Checkouts/ReactiveCocoa"]
path = Carthage/Checkouts/ReactiveCocoa
url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
Expand Down
32 changes: 17 additions & 15 deletions Bento.podspec
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
Pod::Spec.new do |s|

s.name = "Bento"
s.version = "0.3"
s.summary = "Component based abstraction on top of UITableView and UICollectionView"
s.name = "Bento"
s.version = "0.4"
s.summary = "Component based abstraction on top of UITableView and UICollectionView"

s.description = <<-DESC
Component-based abstraction on top of UITableView and UICollectionView.
Provides a declarative way to render data in UITableView and UICollectionView
DESC
s.description = <<-DESC
Component-based abstraction on top of UITableView and UICollectionView.
Provides a declarative way to render data in UITableView and UICollectionView
DESC

s.homepage = "https://github.com/Babylonpartners/Bento"
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = { "Babylon iOS" => "[email protected]" }
s.ios.deployment_target = '9.0'
s.source = { :git => "https://github.com/Babylonpartners/Bento.git", :tag => "#{s.version}" }
s.source_files = 'Bento/*.swift', 'Bento/**/*.swift'
s.homepage = "https://github.com/Babylonpartners/Bento"
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = { "Babylon iOS" => "[email protected]" }
s.ios.deployment_target = '10.0'
s.source = { :git => "https://github.com/Babylonpartners/Bento.git", :tag => "#{s.version}" }
s.source_files = 'Bento/*.swift', 'Bento/**/*.swift', 'Common/*.swift'
s.resource_bundles = { 'Bento' => 'Bento/Resources/Media.xcassets' }
s.exclude_files = 'Bento/Components.playground/**/*'
s.swift_version = "4.2"

s.swift_version = "4.2"
s.dependency "FlexibleDiff", "= 0.0.7"
s.dependency "FlexibleDiff", "= 0.0.8"
end
647 changes: 582 additions & 65 deletions Bento.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion Bento.xcodeproj/xcshareddata/xcschemes/Bento.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -70,6 +70,18 @@
ReferencedContainer = "container:Bento.xcodeproj">
</BuildableReference>
</MacroExpansion>
<EnvironmentVariables>
<EnvironmentVariable
key = "IMAGE_DIFF_DIR"
value = "${SRCROOT}/Snapshots/FailureDiffs"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "FB_REFERENCE_IMAGE_DIR"
value = "${SRCROOT}/Snapshots/ReferenceImages"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "580B616A215E3F7400A69E87"
BuildableName = "BentoKitPlaygroundSupport.framework"
BlueprintName = "BentoKitPlaygroundSupport"
ReferencedContainer = "container:BentoKit.xcodeproj">
BlueprintIdentifier = "7448E816226613B70036B2D6"
BuildableName = "BentoPlaygroundSupport.framework"
BlueprintName = "BentoPlaygroundSupport"
ReferencedContainer = "container:Bento.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -45,10 +45,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "580B616A215E3F7400A69E87"
BuildableName = "BentoKitPlaygroundSupport.framework"
BlueprintName = "BentoKitPlaygroundSupport"
ReferencedContainer = "container:BentoKit.xcodeproj">
BlueprintIdentifier = "7448E816226613B70036B2D6"
BuildableName = "BentoPlaygroundSupport.framework"
BlueprintName = "BentoPlaygroundSupport"
ReferencedContainer = "container:Bento.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -63,10 +63,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "580B616A215E3F7400A69E87"
BuildableName = "BentoKitPlaygroundSupport.framework"
BlueprintName = "BentoKitPlaygroundSupport"
ReferencedContainer = "container:BentoKit.xcodeproj">
BlueprintIdentifier = "7448E816226613B70036B2D6"
BuildableName = "BentoPlaygroundSupport.framework"
BlueprintName = "BentoPlaygroundSupport"
ReferencedContainer = "container:Bento.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
9 changes: 0 additions & 9 deletions Bento.xcworkspace/contents.xcworkspacedata

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

31 changes: 31 additions & 0 deletions Bento/Adapters/AdapterProtocol.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/// Provide generic parameter agnostic access to the adapter.
internal protocol AdapterStoreAccessible: AnyObject {
var layoutMargins: UIEdgeInsets { get set }
var boundSize: CGSize { get set }
var cachesSizeInformation: Bool { get set }
}

/// Provide a default implementation for all adapter store owners.
internal protocol AdapterStoreOwner: AdapterStoreAccessible {
associatedtype SectionID: Hashable
associatedtype ItemID: Hashable

var store: AdapterStore<SectionID, ItemID> { get set }
}

extension AdapterStoreOwner {
var layoutMargins: UIEdgeInsets {
get { return store.layoutMargins }
set { store.layoutMargins = newValue }
}

var boundSize: CGSize {
get { return store.boundSize }
set { store.boundSize = newValue }
}

var cachesSizeInformation: Bool {
get { return store.cachesSizeInformation }
set { store.cachesSizeInformation = newValue }
}
}
Loading

0 comments on commit c200a3f

Please sign in to comment.