Skip to content

Commit

Permalink
Version bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
ashfurrow committed Sep 8, 2018
1 parent de25b06 commit a9e2d27
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 63 deletions.
5 changes: 5 additions & 0 deletions Changelog.md
Expand Up @@ -4,6 +4,11 @@

- Nothing yet.

## 4.2.0

- Updated RxSwift requirement.
- Swift 4.1 support again. See [#30](https://github.com/RxSwiftCommunity/RxNimble/pull/31).

## 4.1.1

- Swift 4.1 support. See [#30](https://github.com/RxSwiftCommunity/RxNimble/issues/30).
Expand Down
48 changes: 0 additions & 48 deletions Demo/Demo.xcodeproj/project.pbxproj
Expand Up @@ -139,8 +139,6 @@
5E47F3241C3EAE9B00EC0751 /* Sources */,
5E47F3251C3EAE9B00EC0751 /* Frameworks */,
5E47F3261C3EAE9B00EC0751 /* Resources */,
8EC133641E3963166AA7C9C3 /* [CP] Embed Pods Frameworks */,
12D863B873789B9CCCD06988 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -160,7 +158,6 @@
5E47F3391C3EAE9B00EC0751 /* Frameworks */,
5E47F33A1C3EAE9B00EC0751 /* Resources */,
BFBAE9138B5A3CE9DCC8CF11 /* [CP] Embed Pods Frameworks */,
9081272DF92D5737A7AFD5CB /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -232,21 +229,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
12D863B873789B9CCCD06988 /* [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-Demo/Pods-Demo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
4684295F66E54B3D255A1C9D /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -265,36 +247,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;
};
8EC133641E3963166AA7C9C3 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9081272DF92D5737A7AFD5CB /* [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-DemoTests/Pods-DemoTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
BFBAE9138B5A3CE9DCC8CF11 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
33 changes: 20 additions & 13 deletions Demo/Podfile.lock
@@ -1,30 +1,37 @@
PODS:
- Nimble (7.0.2)
- Quick (1.2.0)
- RxBlocking (4.0.0):
- Nimble (7.3.0)
- Quick (1.3.1)
- RxBlocking (4.2.0):
- RxSwift (~> 4.0)
- RxNimble (4.1.0):
- RxNimble (4.2.0):
- Nimble (~> 7.0)
- RxBlocking (~> 4.0)
- RxSwift (~> 4.0)
- RxSwift (4.0.0)
- RxSwift (~> 4.2)
- RxSwift (4.2.0)

DEPENDENCIES:
- Nimble
- Quick
- RxNimble (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Nimble
- Quick
- RxBlocking
- RxSwift

EXTERNAL SOURCES:
RxNimble:
:path: ../
:path: "../"

SPEC CHECKSUMS:
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
RxBlocking: 923c2c8106d80d7c2d6b276afd66ce3b10824836
RxNimble: ca8181857989e395eb342c442a567eed6b0f18a5
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
Nimble: c8d6a1f463701921c46de965c673e13cafa09196
Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
RxBlocking: e339d8a6e752e25ade95ff858466c55436668f59
RxNimble: cb8c3dd1ca79b83c60744f1c327130c1aef202a1
RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104

PODFILE CHECKSUM: 7405369509db0cbd242146add66181ab5ab0efb0

COCOAPODS: 1.3.1
COCOAPODS: 1.5.3
4 changes: 2 additions & 2 deletions RxNimble.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxNimble"
s.version = "4.1.1"
s.version = "4.2.0"
s.summary = "Nimble extensions that making unit testing with RxSwift easier 🎉"
s.description = <<-DESC
This library includes functions that make testing RxSwift projects easier with Nimble.
Expand All @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/RxSwiftCommunity/RxNimble.git", :tag => s.version }
s.source_files = "Source/**/*.swift"
s.dependency "Nimble", "~> 7.0"
s.dependency "RxSwift", "~> 4.0"
s.dependency "RxSwift", "~> 4.2"
s.dependency "RxBlocking", "~> 4.0"

s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"' }
Expand Down

0 comments on commit a9e2d27

Please sign in to comment.