diff --git a/EGDeclarativeUIKit.podspec b/EGDeclarativeUIKit.podspec index c06eff5..bb646a1 100644 --- a/EGDeclarativeUIKit.podspec +++ b/EGDeclarativeUIKit.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'EGDeclarativeUIKit' s.version = '0.1.0' - s.summary = 'A short description of DeclarativeUIKit.' + s.summary = 'Declarative UIKit.' # This description is used to generate tags and improve search results. # * Think: What does it do? Why did you write it? What is the focus? @@ -18,13 +18,13 @@ Pod::Spec.new do |s| # * Finally, don't worry about the indent, CocoaPods strips it! s.description = <<-DESC -TODO: Add long description of the pod here. +Declarative UIKit with 200 line of code. DESC s.homepage = 'https://github.com/EkkoG/DeclarativeUIKit' # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { '3138493' => 'beijiu572@gmail.com' } + s.author = { 'EkkoG' => 'beijiu572@gmail.com' } s.source = { :git => 'https://github.com/EkkoG/DeclarativeUIKit.git', :tag => s.version.to_s } # s.social_media_url = 'https://twitter.com/' @@ -37,32 +37,33 @@ TODO: Add long description of the pod here. s.subspec 'Ext' do |cs| cs.source_files = 'DeclarativeUIKit/Classes/Ext/**/*' + cs.dependency 'EGDeclarativeUIKit/Core' end s.subspec 'Rx' do |rs| rs.source_files = 'DeclarativeUIKit/Classes/Rx/**/*' rs.dependency 'RxSwift' rs.dependency 'RxCocoa' + rs.dependency 'EGDeclarativeUIKit/Core' end s.subspec 'Combine' do |cs| cs.source_files = 'DeclarativeUIKit/Classes/Combine/**/*' cs.frameworks = 'Combine' - end - - s.subspec 'ApplyStyleKit' do |as| - as.source_files = 'DeclarativeUIKit/Classes/ApplyStyleKit/**/*' - as.dependency 'ApplyStyleKit' + cs.dependency 'EGDeclarativeUIKit/Core' end s.subspec 'SnapKit' do |ss| ss.source_files = 'DeclarativeUIKit/Classes/SnapKit/**/*' ss.dependency 'SnapKit' + ss.dependency 'EGDeclarativeUIKit/Core' + ss.dependency 'EGDeclarativeUIKit/Ext' end s.subspec 'Chainable' do |ss| ss.source_files = 'DeclarativeUIKit/Classes/Chainable/**/*' ss.dependency 'EGChainable' + ss.dependency 'EGDeclarativeUIKit/Core' end s.default_subspec = 'Core', 'Ext' diff --git a/Example/DeclarativeUIKit.xcodeproj/project.pbxproj b/Example/DeclarativeUIKit.xcodeproj/project.pbxproj index 4327290..37a1638 100644 --- a/Example/DeclarativeUIKit.xcodeproj/project.pbxproj +++ b/Example/DeclarativeUIKit.xcodeproj/project.pbxproj @@ -291,7 +291,6 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-DeclarativeUIKit_Example/Pods-DeclarativeUIKit_Example-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/ApplyStyleKit/ApplyStyleKit.framework", "${BUILT_PRODUCTS_DIR}/EGChainable/EGChainable.framework", "${BUILT_PRODUCTS_DIR}/EGDeclarativeUIKit/EGDeclarativeUIKit.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", @@ -301,7 +300,6 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ApplyStyleKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EGChainable.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EGDeclarativeUIKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", diff --git a/Example/DeclarativeUIKit/ViewController.swift b/Example/DeclarativeUIKit/ViewController.swift index 4b54523..b58c1f3 100644 --- a/Example/DeclarativeUIKit/ViewController.swift +++ b/Example/DeclarativeUIKit/ViewController.swift @@ -8,7 +8,6 @@ import UIKit import EGDeclarativeUIKit -import ApplyStyleKit import SnapKit import RxSwift @@ -39,7 +38,7 @@ class ViewController: UIViewController { UIView().C.backgroundColor(.red).asView() UILabel().apply { label in label.R.text(Observable.combineLatest($text, $text1).flatMap { PublishSubject.just([$0, $1].joined(separator: " ")) }) - label.A.textColor(.black) + label.C.textColor(.black) .text("Hello, World!") label.S.makeConstraints { make in make.centerX.equalToSuperview() @@ -53,8 +52,8 @@ class ViewController: UIViewController { UIListView(with: NSLayoutConstraint.Axis.horizontal) { for i in 0..<50 { UILabel().apply { label in - label.A.text("\(i)").textAlignment(.center) - label.A.backgroundColor(.random) + label.C.text("\(i)").textAlignment(.center) + label.C.backgroundColor(.random) label.S.makeConstraints { make in make.width.equalTo(30) } @@ -68,7 +67,7 @@ class ViewController: UIViewController { } ["ahh", "ahhh"].map { s in UILabel().apply { label in - label.A.text(s).textAlignment(.center) + label.C.text(s).textAlignment(.center) } }.assign(to: &ahh) UILabel().alias("Title").apply { label in @@ -95,7 +94,7 @@ class ViewController: UIViewController { CircleView { UIButton().apply { button in - button.applyStyle.title("ahhhhhhhhhhhhhhhh", for: .normal).titleColor(.white, for: .normal) + button.C.setTitle("ahhhhhhhhhhhhhhhh", for: .normal).setTitleColor(.white, for: .normal) button.S.makeConstraints { make in make.edges.equalToSuperview() make.width.equalTo(250) diff --git a/Example/Podfile b/Example/Podfile index f358182..b46e961 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -8,7 +8,6 @@ target 'DeclarativeUIKit_Example' do pod 'EGDeclarativeUIKit', :path => '../' pod 'EGDeclarativeUIKit/Ext', :path => '../' pod 'EGDeclarativeUIKit/Rx', :path => '../' - pod 'EGDeclarativeUIKit/ApplyStyleKit', :path => '../' pod 'EGDeclarativeUIKit/Combine', :path => '../' pod 'EGDeclarativeUIKit/SnapKit', :path => '../' pod 'EGDeclarativeUIKit/Chainable', :path => '../' diff --git a/Example/Podfile.lock b/Example/Podfile.lock index d46a8b5..ea01918 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,20 +1,28 @@ PODS: - - ApplyStyleKit (0.3.1) - - EGChainable (0.1.4) + - EGChainable (0.1.11): + - EGChainable/Common (= 0.1.11) + - EGChainable/Core (= 0.1.11) + - EGChainable/Common (0.1.11): + - EGChainable/Core + - EGChainable/Core (0.1.11) - EGDeclarativeUIKit (0.1.0): - EGDeclarativeUIKit/Core (= 0.1.0) - EGDeclarativeUIKit/Ext (= 0.1.0) - - EGDeclarativeUIKit/ApplyStyleKit (0.1.0): - - ApplyStyleKit - EGDeclarativeUIKit/Chainable (0.1.0): - EGChainable - - EGDeclarativeUIKit/Combine (0.1.0) + - EGDeclarativeUIKit/Core + - EGDeclarativeUIKit/Combine (0.1.0): + - EGDeclarativeUIKit/Core - EGDeclarativeUIKit/Core (0.1.0) - - EGDeclarativeUIKit/Ext (0.1.0) + - EGDeclarativeUIKit/Ext (0.1.0): + - EGDeclarativeUIKit/Core - EGDeclarativeUIKit/Rx (0.1.0): + - EGDeclarativeUIKit/Core - RxCocoa - RxSwift - EGDeclarativeUIKit/SnapKit (0.1.0): + - EGDeclarativeUIKit/Core + - EGDeclarativeUIKit/Ext - SnapKit - RxCocoa (6.5.0): - RxRelay (= 6.5.0) @@ -26,7 +34,6 @@ PODS: DEPENDENCIES: - EGDeclarativeUIKit (from `../`) - - EGDeclarativeUIKit/ApplyStyleKit (from `../`) - EGDeclarativeUIKit/Chainable (from `../`) - EGDeclarativeUIKit/Combine (from `../`) - EGDeclarativeUIKit/Ext (from `../`) @@ -37,11 +44,10 @@ DEPENDENCIES: SPEC REPOS: https://github.com/CocoaPods/Specs.git: - EGChainable - trunk: - - ApplyStyleKit - RxCocoa - RxRelay - RxSwift + trunk: - SnapKit EXTERNAL SOURCES: @@ -49,14 +55,13 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - ApplyStyleKit: 0343b87f29764f0b8f80fb49d00361642da12ee6 - EGChainable: b20e15df604ee312a650b5125ad028a393932749 - EGDeclarativeUIKit: a2fbe517ad3aeb439555783c262d47c4bbdeb4e7 + EGChainable: 1d3d9d0cab730cf50aa10f38d7eeece21a30666e + EGDeclarativeUIKit: f491e5a15c6e6eb79eaf0ab3cef6d3b04370ed91 RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8 SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25 -PODFILE CHECKSUM: 7530d18677d6ed0bb44bd5fc123aafa8a71bd7ed +PODFILE CHECKSUM: 26bb0bf85941d7f31408bb0514dec7bda01413cb COCOAPODS: 1.11.3