Skip to content

Commit 6ddd155

Browse files
Merge pull request #16 from Tinder/maven_fixes
Ensure project follows Maven patterns
2 parents 4b64253 + 4760439 commit 6ddd155

14 files changed

+28
-8
lines changed

BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
alias(
22
name = "bazel-diff",
3-
actual = "//src/main/java/com/bazel-diff:bazel-diff"
3+
actual = "//src/main/java/com/bazel_diff:bazel-diff"
44
)

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ bazel run :bazel-diff -- bazel-diff -h
138138
### Build your own deployable JAR
139139

140140
```
141-
bazel build //src/main/java/com/bazel-diff:bazel-diff_deploy.jar
142-
java -jar bazel-bin/src/main/java/com/bazel-diff/bazel-diff_deploy.jar # This JAR can be run anywhere
141+
bazel build //src/main/java/com/bazel_diff:bazel-diff_deploy.jar
142+
java -jar bazel-bin/src/main/java/com/bazel_diff/bazel-diff_deploy.jar # This JAR can be run anywhere
143143
```
144144

145145
### Integrate directly into your Bazel Project

src/main/java/com/bazel-diff/BUILD renamed to src/main/java/com/bazel_diff/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@rules_proto//proto:defs.bzl", "proto_library")
33

44
java_binary(
55
name = "bazel-diff",
6-
main_class = "BazelDiff",
6+
main_class = "com.bazel_diff.BazelDiff",
77
runtime_deps = [":java-bazel-diff-lib"],
88
visibility = ["//visibility:public"]
99
)
@@ -18,7 +18,7 @@ java_library(
1818
"@bazel_diff_maven//:com_google_code_gson_gson",
1919
"@bazel_diff_maven//:com_google_guava_guava"
2020
],
21-
visibility = ["//test/java/com/bazel-diff:__pkg__"]
21+
visibility = ["//test/java/com/bazel_diff:__pkg__"]
2222
)
2323

2424
java_proto_library(

src/main/java/com/bazel-diff/BazelClient.java renamed to src/main/java/com/bazel_diff/BazelClient.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import com.google.devtools.build.lib.query2.proto.proto2api.Build;
24

35
import com.google.common.collect.Iterables;

src/main/java/com/bazel-diff/BazelRule.java renamed to src/main/java/com/bazel_diff/BazelRule.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import java.security.MessageDigest;
24
import java.security.NoSuchAlgorithmException;
35
import java.util.List;
@@ -37,4 +39,4 @@ public List<String> getRuleInputList() {
3739
public String getName() {
3840
return rule.getName();
3941
}
40-
}
42+
}

src/main/java/com/bazel-diff/BazelSourceFileTarget.java renamed to src/main/java/com/bazel_diff/BazelSourceFileTarget.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import java.security.MessageDigest;
24

35
interface BazelSourceFileTarget {

src/main/java/com/bazel-diff/BazelTarget.java renamed to src/main/java/com/bazel_diff/BazelTarget.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import com.google.devtools.build.lib.query2.proto.proto2api.Build;
24

35
interface BazelTarget {
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
public class Constants {
24
public static final String Version = "1.0";
35
}

src/main/java/com/bazel-diff/GitClient.java renamed to src/main/java/com/bazel_diff/GitClient.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import java.io.BufferedReader;
24
import java.io.File;
35
import java.io.IOException;

src/main/java/com/bazel-diff/TargetHashingClient.java renamed to src/main/java/com/bazel_diff/TargetHashingClient.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import java.io.IOException;
24
import java.nio.file.Path;
35
import java.security.MessageDigest;

src/main/java/com/bazel-diff/VersionProvider.java renamed to src/main/java/com/bazel_diff/VersionProvider.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import picocli.CommandLine.IVersionProvider;
24

35
class VersionProvider implements IVersionProvider {

src/main/java/com/bazel-diff/main.java renamed to src/main/java/com/bazel_diff/main.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import picocli.CommandLine;
24
import picocli.CommandLine.Option;
35
import picocli.CommandLine.Parameters;

test/java/com/bazel-diff/BUILD renamed to test/java/com/bazel_diff/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ load("@rules_java//java:defs.bzl", "java_library", "java_test")
33
java_test(
44
name = "java-bazel-diff-tests",
55
runtime_deps = [":java-bazel-diff-test-lib"],
6-
test_class = "TargetHashingClientImplTests"
6+
test_class = "com.bazel_diff.TargetHashingClientImplTests"
77
)
88

99
java_library(
1010
name = "java-bazel-diff-test-lib",
1111
srcs = glob(["*.java"]),
1212
deps = [
13-
"//src/main/java/com/bazel-diff:java-bazel-diff-lib",
13+
"//src/main/java/com/bazel_diff:java-bazel-diff-lib",
1414
"@bazel_diff_maven//:org_mockito_mockito_core",
1515
"@bazel_diff_maven//:junit_junit"
1616
]

test/java/com/bazel-diff/TargetHashingClientImplTests.java renamed to test/java/com/bazel_diff/TargetHashingClientImplTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.bazel_diff;
2+
13
import org.junit.Before;
24
import org.junit.Rule;
35
import org.junit.Test;

0 commit comments

Comments
 (0)