Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
target
caliper/target
caliper-api/target
caliper-core/target
caliper-examples/target
caliper-runner/target
caliper-util/target
caliper-worker/target
caliper-worker-android/target
caliper-worker-jvm/target
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.5.0
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@ out/
.factorypath
.project
.settings/

# Bazel
bazel-*
.aswb
.ijwb
21 changes: 14 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
sudo: false

language: java

language: android
android:
components:
- build-tools-26.0.2
- android-26
jdk:
- openjdk8

before_install:
# Travis sets this and it causes issues with workers.
- unset _JAVA_OPTIONS
# Not actually used since we aren't building/testing the Android version, but
# Maven still needs an absolute path or it complains.
- export ANDROID_HOME=/

install: mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn install -U -DskipTests=true -am -pl caliper
install:
- wget https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-amd64
- install bazelisk-linux-amd64 ${HOME}/bin/bazel
- mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn install -U -DskipTests=true -am -pl caliper

script: mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify -U -Dmaven.javadoc.skip=true -am -pl caliper
script:
- mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify -U -Dmaven.javadoc.skip=true -am -pl caliper
- ${HOME}/bin/bazel build //...
- ${HOME}/bin/bazel test //...

cache:
directories:
- $HOME/.m2
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note - this stays if we use bazel_maven_repository, as it uses maven-archeologist as its resolving library, which makes use of ~/.m2/repository.

- $HOME/.cache/bazel

branches:
only:
Expand Down
Empty file added BUILD.bazel
Empty file.
29 changes: 29 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
workspace(name = "caliper")

load("//:maven_artifacts.bzl", "MAVEN_ARTIFACTS")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

MAVEN_REPOSITORY_RULES_VERSION = "2.0.0-alpha-4"

MAVEN_REPOSITORY_RULES_SHA = "a6484fec8d1aebd4affff7ae1ee9b59141858b2c636222bdb619526ccd8b3358"

http_archive(
name = "maven_repository_rules",
sha256 = MAVEN_REPOSITORY_RULES_SHA,
strip_prefix = "bazel_maven_repository-%s" % MAVEN_REPOSITORY_RULES_VERSION,
type = "zip",
urls = ["https://github.com/square/bazel_maven_repository/archive/%s.zip" % MAVEN_REPOSITORY_RULES_VERSION],
)

# Setup maven repository handling.
load("@maven_repository_rules//maven:maven.bzl", "maven_repository_specification")

maven_repository_specification(
name = "maven",
artifacts = MAVEN_ARTIFACTS,
dependency_target_substitutes = {
"com.google.dagger": {"@maven//com/google/dagger:dagger": "@maven//com/google/dagger:dagger-api"},
},
)

android_sdk_repository(name = "androidsdk")
9 changes: 9 additions & 0 deletions caliper-api/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
java_library(
name = "caliper-api",
srcs = glob(["src/main/**/*.java"]),
deps = [
"@maven//com/google/guava",
"@maven//joda-time",
],
visibility = ["//:__subpackages__"],
)
12 changes: 12 additions & 0 deletions caliper-api/src/test/java/com/google/caliper/model/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
java_test(
name = "HostTest",
srcs = ["HostTest.java"],
deps = [
"//caliper-api",
"//caliper-util",
"@maven//com/google/code/gson",
"@maven//com/google/dagger",
"@maven//com/google/truth",
"@maven//junit",
],
)
22 changes: 22 additions & 0 deletions caliper-core/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
java_library(
name = "caliper-core",
srcs = glob(["src/main/java/**/*.java"]),
deps = [
"//caliper-api",
"//caliper-util",
"@maven//com/google/code/findbugs:jsr305",
"@maven//com/google/auto/value",
"@maven//com/google/dagger",
"@maven//com/google/guava",
"@maven//com/squareup/okhttp",
"@maven//joda-time",
],
resources = glob(["src/main/resources/**"]),
visibility = ["//:__subpackages__"]
)

filegroup(
name = "test_resources",
srcs = glob(["src/test/resources/**"]),
visibility = ["//:__subpackages__"],
)
14 changes: 14 additions & 0 deletions caliper-core/src/test/java/com/google/caliper/bridge/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
java_test(
name = "LogMessageParserTest",
srcs = [
"GcLogMessageGenerator.java",
"LogMessageParserTest.java"
],
deps = [
"//caliper-core",
"//caliper-util",
"@maven//com/google/truth",
"@maven//junit",
],
resources = ["//caliper-core:test_resources"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
java_test(
name = "ObjectGraphMeasurerTest",
srcs = ["ObjectGraphMeasurerTest.java"],
deps = [
"//caliper-core",
"@maven//com/google/truth",
"@maven//junit",
],
)
10 changes: 10 additions & 0 deletions caliper-examples/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
java_library(
name = "caliper-examples",
srcs = glob(["src/main/**/*.java"]),
visibility = ["//:__subpackages__"],
deps = [
"//caliper:caliper-lib",
"//caliper-api",
"//caliper-util",
],
)
18 changes: 18 additions & 0 deletions caliper-runner/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
java_library(
name = "caliper-runner",
srcs = glob(["src/main/**/*.java"]),
deps = [
"//caliper-api",
"//caliper-core",
"//caliper-util",
"@maven//com/google/code/findbugs:jsr305",
"@maven//com/google/auto/value",
"@maven//com/google/dagger",
"@maven//com/google/dagger:dagger-producers",
"@maven//com/google/code/gson",
"@maven//com/google/guava",
"@maven//com/squareup/okhttp",
"@maven//joda-time",
],
visibility = ["//:__subpackages__"]
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
java_test(
name = "LoggingConfigLoaderTest",
srcs = ["LoggingConfigLoaderTest.java"],
deps = [
"//caliper-api",
"//caliper-runner",
"@maven//com/google/truth",
"@maven//joda-time",
"@maven//junit",
"@maven//org/mockito:mockito-all",
],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
java_test(
name = "ExperimentTest",
srcs = ["ExperimentTest.java"],
deps = [
"//caliper-api",
"//caliper-core",
"//caliper-runner",
"//caliper-util",
"@maven//com/google/truth",
"@maven//junit",
],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
java_test(
name = "InstrumentModuleTest",
srcs = ["InstrumentModuleTest.java"],
deps = [
"//caliper-api",
"//caliper-core",
"//caliper-runner",
"@maven//com/google/truth",
"@maven//junit",
"@maven//org/mockito:mockito-all",
],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
java_test(
name = "ParsedOptionsTest",
srcs = ["ParsedOptionsTest.java"],
deps = [
"//caliper-runner",
"//caliper-util",
"@maven//com/google/truth",
"@maven//junit",
],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
java_test(
name = "ResultProcessorCreatorTest",
srcs = ["ResultProcessorCreatorTest.java"],
deps = [
"//caliper-api",
"//caliper-core",
"//caliper-runner",
"@maven//com/google/truth",
"@maven//junit",
],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
java_test(
name = "ServerSocketServiceTest",
srcs = ["ServerSocketServiceTest.java"],
deps = [
"//caliper-core",
"//caliper-runner",
"//caliper-util",
"@maven//com/google/truth",
"@maven//junit",
"@maven//org/mockito:mockito-all",
],
)
13 changes: 13 additions & 0 deletions caliper-util/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
java_library(
name = "caliper-util",
srcs = glob(["src/main/**/*.java"]),
deps = [
"@maven//com/google/code/findbugs:jsr305", # provided
"@maven//com/google/guava",
"@maven//javax/inject:javax_inject",
"@maven//joda-time",
"@maven//com/google/dagger",
"@maven//com/google/code/gson",
],
visibility = ["//:__subpackages__"],
)
19 changes: 19 additions & 0 deletions caliper-util/src/test/java/com/google/caliper/util/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
java_test(
name = "ShortDurationTest",
srcs = ["ShortDurationTest.java"],
deps = [
"//caliper-util",
"@maven//com/google/truth",
"@maven//junit",
],
)

java_test(
name = "UuidsTest",
srcs = ["UuidsTest.java"],
deps = [
"//caliper-util",
"@maven//com/google/truth",
"@maven//junit",
],
)
18 changes: 18 additions & 0 deletions caliper-worker-android/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
java_library(
name = "caliper-worker-android",
srcs = glob(["src/main/java/**/*.java"]),
deps = [
":androidsdk",
"//caliper-core",
"//caliper-util",
"//caliper-worker",
"@maven//com/google/dagger",
"@maven//com/google/guava",
],
)

java_import(
name = "androidsdk",
jars = ["@bazel_tools//tools/android:android_jar"],
neverlink = True,
)
16 changes: 16 additions & 0 deletions caliper-worker-jvm/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
java_library(
name = "caliper-worker-jvm",
srcs = glob(["src/main/**/*.java"]),
deps = [
"//caliper-api",
"//caliper-core",
"//caliper-util",
"//caliper-worker",
"@maven//com/google/code/findbugs:jsr305",
"@maven//com/google/code/java-allocation-instrumenter:java-allocation-instrumenter",
"@maven//com/sun/jersey:jersey-client",
"@maven//com/google/dagger",
"@maven//com/google/guava",
],
visibility = ["//:__subpackages__"]
)
16 changes: 0 additions & 16 deletions caliper-worker-jvm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,5 @@
<groupId>com.google.code.java-allocation-instrumenter</groupId>
<artifactId>java-allocation-instrumenter</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
15 changes: 15 additions & 0 deletions caliper-worker/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
java_library(
name = "caliper-worker",
srcs = glob(["src/main/**/*.java"]),
deps = [
"//caliper-api",
"//caliper-core",
"//caliper-util",
"@maven//com/google/code/findbugs:jsr305",
"@maven//com/google/dagger",
"@maven//com/google/guava",
"@maven//com/squareup/okhttp",
"@maven//joda-time",
],
visibility = ["//:__subpackages__"]
)
Loading