Skip to content

Commit 65588b1

Browse files
Merge pull request #105 from Tinder/issue_104
Remove git client
2 parents d29699c + 106f9e0 commit 65588b1

File tree

4 files changed

+8
-103
lines changed

4 files changed

+8
-103
lines changed

constants.bzl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@
22
Various constants used to build bazel-diff
33
"""
44

5-
DEFAULT_JVM_EXTERNAL_TAG = "3.3"
6-
7-
RULES_JVM_EXTERNAL_SHA = "d85951a92c0908c80bd8551002d66cb23c3434409c814179c0ff026b53544dab"
8-
9-
BUILD_PROTO_MESSAGE_SHA = "50b79faec3c4154bed274371de5678b221165e38ab59c6167cc94b922d9d9152"
5+
DEFAULT_JVM_EXTERNAL_TAG = "4.2"
6+
RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"

repositories.bzl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@ def bazel_diff_dependencies(rules_jvm_external_tag=DEFAULT_JVM_EXTERNAL_TAG,
1515
http_archive,
1616
name = "bazel_skylib",
1717
urls = [
18-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
19-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
18+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
19+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
2020
],
21-
sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
21+
sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
2222
)
2323

2424
_maybe(
2525
http_archive,
2626
name = "rules_proto",
27-
sha256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
28-
strip_prefix = "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313",
27+
sha256 = "c22cfcb3f22a0ae2e684801ea8dfed070ba5bed25e73f73580564f250475e72d",
28+
strip_prefix = "rules_proto-4.0.0-3.19.2",
2929
urls = [
30-
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
31-
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
30+
"https://github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0-3.19.2.tar.gz",
3231
],
3332
)
3433

src/main/java/com/bazel_diff/GitClient.java

Lines changed: 0 additions & 81 deletions
This file was deleted.

src/main/java/com/bazel_diff/main.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ public Integer call() throws IOException {
115115
System.out.println("outputPath was not provided! Exiting");
116116
return ExitCode.USAGE;
117117
}
118-
GitClient gitClient = new GitClientImpl(workspacePath);
119118
BazelClient bazelClient = new BazelClientImpl(
120119
workspacePath,
121120
bazelPath,
@@ -125,15 +124,6 @@ public Integer call() throws IOException {
125124
keepGoing
126125
);
127126
TargetHashingClient hashingClient = new TargetHashingClientImpl(bazelClient, new FilesClientImp());
128-
try {
129-
gitClient.ensureAllChangesAreCommitted();
130-
} catch (IOException | InterruptedException e) {
131-
e.printStackTrace();
132-
return ExitCode.SOFTWARE;
133-
} catch (GitClientException e) {
134-
System.out.println(String.format("There are active changes in '%s', please commit these changes before running bazel-diffs", workspacePath));
135-
return ExitCode.USAGE;
136-
}
137127
Gson gson = new Gson();
138128
FileReader startingFileReader;
139129
FileReader finalFileReader;

0 commit comments

Comments
 (0)