Skip to content

Commit

Permalink
Merge branch 'master' into jazzy-spm
Browse files Browse the repository at this point in the history
  • Loading branch information
mtrezza authored Oct 31, 2024
2 parents cd7e496 + db501b5 commit 483b8f6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"repositoryURL": "https://github.com/erikdoe/ocmock.git",
"state": {
"branch": null,
"revision": "67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89",
"revision": "2c0bfd373289f4a7716db5d6db471640f91a6507",
"version": null
}
},
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let package = Package(
.package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"),
.package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"),
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.8"),
.package(name: "OCMock", url: "https://github.com/erikdoe/ocmock.git", .revision("67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89"))
.package(name: "OCMock", url: "https://github.com/erikdoe/ocmock.git", .revision("2c0bfd373289f4a7716db5d6db471640f91a6507"))
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"repositoryURL": "https://github.com/erikdoe/ocmock",
"state": {
"branch": null,
"revision": "67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89",
"revision": "2c0bfd373289f4a7716db5d6db471640f91a6507",
"version": null
}
},
Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8908,7 +8908,7 @@
repositoryURL = "https://github.com/erikdoe/ocmock";
requirement = {
kind = revision;
revision = 67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89;
revision = 2c0bfd373289f4a7716db5d6db471640f91a6507;
};
};
39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */ = {
Expand Down

0 comments on commit 483b8f6

Please sign in to comment.