Skip to content

Commit

Permalink
Integrate Example dependencies via Carthage
Browse files Browse the repository at this point in the history
  • Loading branch information
msaps committed Oct 18, 2018
1 parent 66ac273 commit 0479eb8
Show file tree
Hide file tree
Showing 139 changed files with 39 additions and 9,908 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build
Carthage/

# fastlane
#
Expand Down
1 change: 1 addition & 0 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "alexaubry/BulletinBoard" ~> 2.0.0
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "alexaubry/BulletinBoard" "2.0.2"
61 changes: 15 additions & 46 deletions Example/Pageboy-Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
46A32DBA20FF7ADC003AEAFC /* Gradients.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A32DB920FF7ADC003AEAFC /* Gradients.swift */; };
46A32DC120FF7BBC003AEAFC /* UIColor+Interpolation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A32DC020FF7BBC003AEAFC /* UIColor+Interpolation.swift */; };
46A32DC320FF7DA8003AEAFC /* GradientViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A32DC220FF7DA8003AEAFC /* GradientViewController.swift */; };
46B7BD79217905500041EFFC /* BLTNBoard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46B7BD74217905500041EFFC /* BLTNBoard.framework */; };
46EDC8F7210368B400675EC3 /* SettingsBulletinDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46EDC8F6210368B400675EC3 /* SettingsBulletinDataSource.swift */; };
95EB9402F206F2C241407EEE /* Pods_Pageboy_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5C1D68F89D0728DCA126B0A /* Pods_Pageboy_Example.framework */; };
D623B1E21E1D32D700527F3D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623B1E11E1D32D700527F3D /* AppDelegate.swift */; };
D623B1E41E1D32D700527F3D /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623B1E31E1D32D700527F3D /* PageViewController.swift */; };
D623B1E71E1D32D700527F3D /* Pageboy.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D623B1E51E1D32D700527F3D /* Pageboy.storyboard */; };
Expand Down Expand Up @@ -95,7 +95,6 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
22D5D537913042076AC16780 /* Pods-Pageboy-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pageboy-Example.release.xcconfig"; path = "../Pods/Target Support Files/Pods-Pageboy-Example/Pods-Pageboy-Example.release.xcconfig"; sourceTree = "<group>"; };
4603D7712103701E00FA0F23 /* PageViewController+Bulletins.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PageViewController+Bulletins.swift"; sourceTree = "<group>"; };
4603D77921060C8600FA0F23 /* SettingsBulletinPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsBulletinPage.swift; sourceTree = "<group>"; };
4603D77D2106148A00FA0F23 /* SettingsOptionButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsOptionButton.swift; sourceTree = "<group>"; };
Expand All @@ -108,8 +107,8 @@
46A32DB920FF7ADC003AEAFC /* Gradients.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Gradients.swift; sourceTree = "<group>"; };
46A32DC020FF7BBC003AEAFC /* UIColor+Interpolation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Interpolation.swift"; sourceTree = "<group>"; };
46A32DC220FF7DA8003AEAFC /* GradientViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientViewController.swift; sourceTree = "<group>"; };
46B7BD74217905500041EFFC /* BLTNBoard.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BLTNBoard.framework; path = ../Carthage/Build/iOS/BLTNBoard.framework; sourceTree = "<group>"; };
46EDC8F6210368B400675EC3 /* SettingsBulletinDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsBulletinDataSource.swift; sourceTree = "<group>"; };
C5C1D68F89D0728DCA126B0A /* Pods_Pageboy_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Pageboy_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D623B1DE1E1D32D700527F3D /* Pageboy-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Pageboy-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
D623B1E11E1D32D700527F3D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
D623B1E31E1D32D700527F3D /* PageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageViewController.swift; sourceTree = "<group>"; };
Expand All @@ -122,7 +121,6 @@
D681E3531E549F7E007C08F5 /* PageViewController+BarButtons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PageViewController+BarButtons.swift"; sourceTree = "<group>"; };
D681E3551E54ABE8007C08F5 /* TransparentNavigationBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransparentNavigationBar.swift; sourceTree = "<group>"; };
D6ECCEC51E51B6FB00E9D5B3 /* ChildViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChildViewController.swift; sourceTree = "<group>"; };
E8DA8DCCF2018C397CC96DF4 /* Pods-Pageboy-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pageboy-Example.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-Pageboy-Example/Pods-Pageboy-Example.debug.xcconfig"; sourceTree = "<group>"; };
E8F663AA1E9C387D00F601AC /* UINavigationController+Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Utilities.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -132,7 +130,7 @@
buildActionMask = 2147483647;
files = (
D681E3331E546A90007C08F5 /* Pageboy.framework in Frameworks */,
95EB9402F206F2C241407EEE /* Pods_Pageboy_Example.framework in Frameworks */,
46B7BD79217905500041EFFC /* BLTNBoard.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -186,7 +184,6 @@
D623B1E01E1D32D700527F3D /* Pageboy-Example */,
D6CC55831ECCCCB700A7FBB4 /* Frameworks */,
D623B1DF1E1D32D700527F3D /* Products */,
E89E66555AB13D5969586923 /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -251,34 +248,24 @@
D6CC55831ECCCCB700A7FBB4 /* Frameworks */ = {
isa = PBXGroup;
children = (
46B7BD74217905500041EFFC /* BLTNBoard.framework */,
D681E31E1E546A7D007C08F5 /* Pageboy.xcodeproj */,
C5C1D68F89D0728DCA126B0A /* Pods_Pageboy_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
E89E66555AB13D5969586923 /* Pods */ = {
isa = PBXGroup;
children = (
E8DA8DCCF2018C397CC96DF4 /* Pods-Pageboy-Example.debug.xcconfig */,
22D5D537913042076AC16780 /* Pods-Pageboy-Example.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
D623B1DD1E1D32D700527F3D /* Pageboy-Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = D623B1F01E1D32D700527F3D /* Build configuration list for PBXNativeTarget "Pageboy-Example" */;
buildPhases = (
BF43A48B7FD85A3BD59BE132 /* [CP] Check Pods Manifest.lock */,
D623B1DA1E1D32D700527F3D /* Sources */,
D623B1DB1E1D32D700527F3D /* Frameworks */,
D623B1DC1E1D32D700527F3D /* Resources */,
D6E73A701E51F7C400A8D5A5 /* Embed Frameworks */,
1C801D1CF6D073978EA7D11A /* [CP] Embed Pods Frameworks */,
46B7BD7A217905650041EFFC /* Copy Carthage Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -384,43 +371,25 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
1C801D1CF6D073978EA7D11A /* [CP] Embed Pods Frameworks */ = {
46B7BD7A217905650041EFFC /* Copy Carthage Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/../Pods/Target Support Files/Pods-Pageboy-Example/Pods-Pageboy-Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/BulletinBoard/BLTNBoard.framework",
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BLTNBoard.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Pageboy-Example/Pods-Pageboy-Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
BF43A48B7FD85A3BD59BE132 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
"$(SRCROOT)/../Carthage/Build/iOS/BLTNBoard.framework",
);
name = "Copy Carthage Frameworks";
outputFileListPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Pageboy-Example-checkManifestLockResult.txt",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/BLTNBoard.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -594,11 +563,11 @@
};
D623B1F11E1D32D700527F3D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E8DA8DCCF2018C397CC96DF4 /* Pods-Pageboy-Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS";
INFOPLIST_FILE = "Pageboy-Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.uias.Pageboy-Example";
Expand All @@ -612,11 +581,11 @@
};
D623B1F21E1D32D700527F3D /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 22D5D537913042076AC16780 /* Pods-Pageboy-Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS";
INFOPLIST_FILE = "Pageboy-Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.uias.Pageboy-Example";
Expand Down
41 changes: 21 additions & 20 deletions Example/Pageboy-Example/PageStepper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
//

import UIKit
import SnapKit

class PageStepper: UIControl {

Expand Down Expand Up @@ -61,31 +60,34 @@ class PageStepper: UIControl {
let negativeButton = makeStepperButton(for: .negative)
negativeButton.addTarget(self, action: #selector(negativeButtonPressed(_:)), for: .touchUpInside)
addSubview(negativeButton)
negativeButton.snp.makeConstraints { (make) in
make.leading.equalToSuperview()
make.top.equalToSuperview()
make.bottom.equalToSuperview()
}
negativeButton.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
negativeButton.leadingAnchor.constraint(equalTo: leadingAnchor),
negativeButton.topAnchor.constraint(equalTo: topAnchor),
negativeButton.bottomAnchor.constraint(equalTo: bottomAnchor)
])
self.negativeButton = negativeButton

let positiveButton = makeStepperButton(for: .positive)
positiveButton.addTarget(self, action: #selector(positiveButtonPressed(_:)), for: .touchUpInside)
addSubview(positiveButton)
positiveButton.snp.makeConstraints { (make) in
make.trailing.equalToSuperview()
make.top.equalToSuperview()
make.bottom.equalToSuperview()
}
positiveButton.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
positiveButton.trailingAnchor.constraint(equalTo: trailingAnchor),
positiveButton.topAnchor.constraint(equalTo: topAnchor),
positiveButton.bottomAnchor.constraint(equalTo: bottomAnchor)
])
self.positiveButton = positiveButton

let statusLabel = makeStatusLabel()
addSubview(statusLabel)
statusLabel.snp.makeConstraints { (make) in
make.leading.equalTo(negativeButton.snp.trailing)
make.top.equalToSuperview()
make.bottom.equalToSuperview()
make.trailing.equalTo(positiveButton.snp.leading)
}
statusLabel.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
statusLabel.leadingAnchor.constraint(equalTo: negativeButton.trailingAnchor),
statusLabel.topAnchor.constraint(equalTo: topAnchor),
statusLabel.bottomAnchor.constraint(equalTo: bottomAnchor),
statusLabel.trailingAnchor.constraint(equalTo: positiveButton.leadingAnchor)
])
self.statusLabel = statusLabel

update(for: currentPage)
Expand Down Expand Up @@ -130,9 +132,8 @@ extension PageStepper {
button.imageView?.contentMode = .scaleAspectFit
button.imageEdgeInsets = UIEdgeInsets(top: 10.0, left: 28.0, bottom: 10.0, right: 28.0)

button.snp.makeConstraints { (make) in
make.width.equalTo(80.0)
}
button.translatesAutoresizingMaskIntoConstraints = false
button.widthAnchor.constraint(equalToConstant: 80.0).isActive = true

return button
}
Expand Down
3 changes: 0 additions & 3 deletions Pageboy.xcworkspace/contents.xcworkspacedata

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

25 changes: 0 additions & 25 deletions Podfile

This file was deleted.

20 changes: 0 additions & 20 deletions Podfile.lock

This file was deleted.

22 changes: 0 additions & 22 deletions Pods/BulletinBoard/LICENSE

This file was deleted.

Loading

0 comments on commit 0479eb8

Please sign in to comment.