Skip to content

Commit

Permalink
Merge pull request #66 from AliSoftware/release/4.0.3
Browse files Browse the repository at this point in the history
Release 4.0.3
  • Loading branch information
AliSoftware authored Aug 25, 2018
2 parents 81039ef + 0edd1fc commit e84643b
Show file tree
Hide file tree
Showing 15 changed files with 301 additions and 292 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG

## Master
## 4.0.3

* Upgrade to CircleCI 2.
[djbe](https://github.com/djbe)
Expand Down
16 changes: 8 additions & 8 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
PODS:
- Reusable (4.0.2):
- Reusable/Storyboard (= 4.0.2)
- Reusable/View (= 4.0.2)
- Reusable/Storyboard (4.0.2)
- Reusable/View (4.0.2)
- Reusable (4.0.3):
- Reusable/Storyboard (= 4.0.3)
- Reusable/View (= 4.0.3)
- Reusable/Storyboard (4.0.3)
- Reusable/View (4.0.3)

DEPENDENCIES:
- Reusable (from `../`)

EXTERNAL SOURCES:
Reusable:
:path: ../
:path: "../"

SPEC CHECKSUMS:
Reusable: 31ebbca57f620f3956465fd2aa07cfc9ea18f1b0
Reusable: e2d126bb8404ebf9d36b1a37c9e4c71dd06245c0

PODFILE CHECKSUM: 2e4cfd412f90711e15fcfa281c33e3b31f1e90b8

COCOAPODS: 1.4.0
COCOAPODS: 1.5.3
5 changes: 3 additions & 2 deletions Example/Pods/Local Podspecs/Reusable.podspec.json

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

16 changes: 8 additions & 8 deletions Example/Pods/Manifest.lock

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

452 changes: 226 additions & 226 deletions Example/Pods/Pods.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.

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

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

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

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Reusable-iOS/Info.plist

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

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

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Reusable-tvOS/Info.plist

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

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

32 changes: 0 additions & 32 deletions Example/ReusableDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@
09B346061C4ED26F00BA041F /* Frameworks */,
09B346071C4ED26F00BA041F /* Resources */,
D01516303907BB14A4BDD69A /* [CP] Embed Pods Frameworks */,
B74A5D9CF37846C09D87FA1B /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -284,7 +283,6 @@
37E3FC691E55CDD8000A7436 /* Frameworks */,
37E3FC6A1E55CDD8000A7436 /* Resources */,
EC45F6CEBD45B4A8F3B56EEA /* [CP] Embed Pods Frameworks */,
0F3B4F4C64FDE911B54BB04B /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -383,21 +381,6 @@
shellScript = "if which swiftlint; then\n swiftlint\nelse\n echo \"warning: Install SwiftLint to ensure the coding conventions are respected on this project.\"\nfi\n";
showEnvVarsInLog = 0;
};
0F3B4F4C64FDE911B54BB04B /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReusableDemo tvOS/Pods-ReusableDemo tvOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
8D810F689ED55C59DF40EA88 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -434,21 +417,6 @@
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;
};
B74A5D9CF37846C09D87FA1B /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReusableDemo iOS/Pods-ReusableDemo iOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D01516303907BB14A4BDD69A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
2 changes: 1 addition & 1 deletion Reusable.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "Reusable"
s.version = "4.0.2"
s.version = "4.0.3"
s.swift_version = "4.0"
s.summary = "A Swift Mixin to deal with reusable UITableView & UICollectionView cells and XIB-based views"

Expand Down

0 comments on commit e84643b

Please sign in to comment.