diff --git a/.gitignore b/.gitignore index 0c113f7d8..6e8600dd8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,9 @@ bazel-* .idea out +# Vim. +*.sw* +*.vim + # Auto-generated files. gax/src/main/resources/dependencies.properties diff --git a/.travis.yml b/.travis.yml index 7724d756c..d80ac127a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,34 @@ addons: hosts: - fake-hostname-to-work-around-travis-bug hostname: fake-hostname-to-work-around-travis-bug -jdk: - - openjdk8 - - openjdk7 -install: ./gradlew assemble -script: ./gradlew build install -after_success: - - bash <(curl -s https://codecov.io/bash) + +jobs: + include: + - name: Java 7 Gradle Build + jdk: openjdk7 + install: ./gradlew assemble + script: ./gradlew build install + after_success: + - bash <(curl -s https://codecov.io/bash) + + - name: Java 8 Gradle Build + jdk: openjdk8 + install: ./gradlew assemble + script: + - ./gradlew build install + after_success: + - bash <(curl -s https://codecov.io/bash) + + - name: Java 8 Bazel Build + jdk: openjdk8 + before_install: + - BAZEL_VERSION="3.5.0" + - BAZEL_BINARY="bazel_$BAZEL_VERSION-linux-x86_64.deb" + - wget "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/$BAZEL_BINARY" + - wget "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/$BAZEL_BINARY.sha256" + - sha256sum -c "$BAZEL_BINARY.sha256" + - sudo dpkg -i "$BAZEL_BINARY" + # The Bazel flags below are the best we can do to optimize build speed, since caching on Travis + # is suboptimal for various reasons (see https://kevin.burke.dev/kevin/bazel-tests-on-travis-ci/). + script: + - bazel --batch test //... --noshow_progress --test_output=errors diff --git a/CHANGELOG.md b/CHANGELOG.md index b77b62bdc..ab9326833 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [1.58.3](https://www.github.com/googleapis/gax-java/compare/v1.58.2...v1.58.3) (2020-09-15) + + +### Bug Fixes + +* [gax-java] Add speedy Bazel builds to Travis ([#1181](https://www.github.com/googleapis/gax-java/issues/1181)) ([2fb85fe](https://www.github.com/googleapis/gax-java/commit/2fb85fed095c6043ee39b63a0f7dff3fd93cbd7b)) +* [gax-java] add Vim files to .gitignore ([#1179](https://www.github.com/googleapis/gax-java/issues/1179)) ([2de22b6](https://www.github.com/googleapis/gax-java/commit/2de22b6645fbfd7ada7d0067e5cdd3c2039ec190)) +* [gax-java] Fix broken Bazel build ([#1180](https://www.github.com/googleapis/gax-java/issues/1180)) ([834c05e](https://www.github.com/googleapis/gax-java/commit/834c05e1d35a17f90bf8cd1b2cdce40bea451c95)) + ### [1.58.2](https://www.github.com/googleapis/gax-java/compare/v1.58.1...v1.58.2) (2020-08-07) diff --git a/README.md b/README.md index cf658d123..dcef50c0c 100644 --- a/README.md +++ b/README.md @@ -31,27 +31,27 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 1.58.2 + 1.58.3 com.google.api gax-grpc - 1.58.2 + 1.58.3 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:1.58.2', - 'com.google.api:gax-grpc:1.58.2' +compile 'com.google.api:gax:1.58.3', + 'com.google.api:gax-grpc:1.58.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "1.58.2" -libraryDependencies += "com.google.api" % "gax-grpc" % "1.58.2" +libraryDependencies += "com.google.api" % "gax" % "1.58.3" +libraryDependencies += "com.google.api" % "gax-grpc" % "1.58.3" ``` [//]: # ({x-version-update-end}) diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 8b0d25b59..774356d77 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -1,4 +1,4 @@ -project.version = "0.60.2" // {x-version-update:benchmark:current} +project.version = "0.60.3" // {x-version-update:benchmark:current} buildscript { repositories { diff --git a/build.gradle b/build.gradle index c8c1e7e8a..95b1e869d 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'io.codearte.nexus-staging' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "1.58.2" // {x-version-update:gax:current} +project.version = "1.58.3" // {x-version-update:gax:current} ext { // Project names not used for release diff --git a/dependencies.properties b/dependencies.properties index 72fc11a42..9cd655be4 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=1.58.2 +version.gax=1.58.3 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=1.58.2 +version.gax_grpc=1.58.3 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=1.58.2 +version.gax_bom=1.58.3 # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.75.2 +version.gax_httpjson=0.75.3 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. @@ -45,6 +45,7 @@ maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2 maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.3.4 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.4 +maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2 maven.com_google_api_api_common=com.google.api:api-common:1.9.3 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.4.1 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:0.13.0 diff --git a/gax-bom/build.gradle b/gax-bom/build.gradle index c8de82c61..3a69a3016 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -12,7 +12,7 @@ buildscript { archivesBaseName = "gax-bom" -project.version = "1.58.2" // {x-version-update:gax-bom:current} +project.version = "1.58.3" // {x-version-update:gax-bom:current} ext { mavenJavaDir = "$project.buildDir/publications/mavenJava" diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index b390ae471..b4af24ed1 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 1.58.2 + 1.58.3 pom GAX (Google Api eXtensions) for Java Google Api eXtensions for Java @@ -33,34 +33,34 @@ com.google.api gax - 1.58.2 + 1.58.3 com.google.api gax - 1.58.2 + 1.58.3 testlib com.google.api gax-grpc - 1.58.2 + 1.58.3 com.google.api gax-grpc - 1.58.2 + 1.58.3 testlib com.google.api gax-httpjson - 0.75.2 + 0.75.3 com.google.api gax-httpjson - 0.75.2 + 0.75.3 testlib diff --git a/gax-grpc/BUILD.bazel b/gax-grpc/BUILD.bazel index 53b09f14f..b4071cccd 100644 --- a/gax-grpc/BUILD.bazel +++ b/gax-grpc/BUILD.bazel @@ -1,4 +1,4 @@ -load("//:gax_java.bzl", "java_tests", "google_java_format", "google_java_format_verification") +load("//:gax_java.bzl", "google_java_format", "google_java_format_verification", "java_tests") _JAVA_COPTS = [ "-source", @@ -21,6 +21,7 @@ _COMPILE_DEPS = [ "@com_google_api_grpc_proto_google_common_protos//jar", "@com_google_api_api_common//jar", "@com_google_auto_value_auto_value//jar", + "@com_google_auto_value_auto_value_annotations//jar", "@com_google_http_client_google_http_client//jar", "@io_grpc_grpc_java//context:context", "@io_grpc_grpc_netty_shaded//jar", diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index a669e5f74..a8451e8b1 100644 --- a/gax-grpc/build.gradle +++ b/gax-grpc/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "gax-grpc" // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "1.58.2" // {x-version-update:gax-grpc:current} +project.version = "1.58.3" // {x-version-update:gax-grpc:current} dependencies { compile project(':gax'), diff --git a/gax-httpjson/BUILD.bazel b/gax-httpjson/BUILD.bazel index e53beacd4..2f230993c 100644 --- a/gax-httpjson/BUILD.bazel +++ b/gax-httpjson/BUILD.bazel @@ -1,4 +1,4 @@ -load("//:gax_java.bzl", "java_tests", "google_java_format", "google_java_format_verification") +load("//:gax_java.bzl", "google_java_format", "google_java_format_verification", "java_tests") _JAVA_COPTS = [ "-source", @@ -17,6 +17,7 @@ _COMPILE_DEPS = [ "@com_google_auth_google_auth_library_credentials//jar", "@com_google_api_api_common//jar", "@com_google_auto_value_auto_value//jar", + "@com_google_auto_value_auto_value_annotations//jar", "@com_google_http_client_google_http_client_jackson2//jar", "@javax_annotation_javax_annotation_api//jar", "//gax:gax", @@ -27,7 +28,7 @@ _TEST_COMPILE_DEPS = [ "@org_mockito_mockito_core//jar", "@com_google_truth_truth//jar", "//gax:gax_testlib", - "@com_googlecode_java_diff_utils_diffutils//jar", + "@com_googlecode_java_diff_utils_diffutils//jar", ] java_library( diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index f68c4da2a..c725878b0 100644 --- a/gax-httpjson/build.gradle +++ b/gax-httpjson/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "gax-httpjson" // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "0.75.2" // {x-version-update:gax-httpjson:current} +project.version = "0.75.3" // {x-version-update:gax-httpjson:current} dependencies { compile project(':gax'), diff --git a/gax/BUILD.bazel b/gax/BUILD.bazel index a2ee5d222..e4ac02524 100644 --- a/gax/BUILD.bazel +++ b/gax/BUILD.bazel @@ -1,4 +1,4 @@ -load("//:gax_java.bzl", "java_tests", "google_java_format", "google_java_format_verification") +load("//:gax_java.bzl", "google_java_format", "google_java_format_verification", "java_tests") _JAVA_COPTS = [ "-source", @@ -12,6 +12,7 @@ _COMPILE_DEPS = [ "@com_google_auth_google_auth_library_credentials//jar", "@com_google_auth_google_auth_library_oauth2_http//jar", "@com_google_auto_value_auto_value//jar", + "@com_google_auto_value_auto_value_annotations//jar", "@com_google_code_findbugs_jsr305//jar", "@com_google_guava_guava//jar", "@io_opencensus_opencensus_api//jar", diff --git a/gax/build.gradle b/gax/build.gradle index f6fc4c8e9..3ce942147 100644 --- a/gax/build.gradle +++ b/gax/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "gax" // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "1.58.2" // {x-version-update:gax:current} +project.version = "1.58.3" // {x-version-update:gax:current} dependencies { compile libraries['maven.com_google_guava_guava'], diff --git a/repositories.bzl b/repositories.bzl index 4d9a429ff..0f909e131 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -64,11 +64,12 @@ def com_google_api_gax_java_repositories(): strip_prefix = "grpc-java-%s" % _grpc_version, ) + _bazel_skylib_version = "1.0.3" _maybe( http_archive, name = "bazel_skylib", - strip_prefix = "bazel-skylib-0.7.0", - urls = ["https://github.com/bazelbuild/bazel-skylib/archive/0.7.0.zip"], + strip_prefix = "bazel-skylib-%s" % _bazel_skylib_version, + urls = ["https://github.com/bazelbuild/bazel-skylib/archive/%s.zip" % _bazel_skylib_version], ) _maybe( diff --git a/samples/pom.xml b/samples/pom.xml index 8b4ce0cb3..b94a56c15 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -14,13 +14,13 @@ com.google.api gax - 1.58.2 + 1.58.3 com.google.api gax-grpc - 1.58.2 + 1.58.3 com.google.auto.value @@ -73,7 +73,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -88,7 +88,7 @@ maven-compiler-plugin - 3.5.1 + 3.8.1 1.7 1.7 diff --git a/versions.txt b/versions.txt index 29330cb4b..4e8e0a28d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -gax:1.58.2:1.58.2 -gax-bom:1.58.2:1.58.2 -gax-grpc:1.58.2:1.58.2 -gax-httpjson:0.75.2:0.75.2 -benchmark:0.60.2:0.60.2 +gax:1.58.3:1.58.3 +gax-bom:1.58.3:1.58.3 +gax-grpc:1.58.3:1.58.3 +gax-httpjson:0.75.3:0.75.3 +benchmark:0.60.3:0.60.3