From 412d49b97ca61a0995820378e71b0aa62112ba8a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 6 Mar 2024 00:20:55 +0100 Subject: [PATCH] test(deps): update dependency com.google.truth:truth to v1.4.1 (#2483) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.truth:truth](https://togithub.com/google/truth) | `1.2.0` -> `1.4.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.truth:truth/1.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.truth:truth/1.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.truth:truth/1.2.0/1.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.truth:truth/1.2.0/1.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
google/truth (com.google.truth:truth) ### [`v1.4.1`](https://togithub.com/google/truth/releases/tag/v1.4.1): 1.4.1 This release deprecates `Truth8`. All its methods have become available on the main `Truth` class. In most cases, you can migrate your whole project mechanically: `git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'` While we do not plan to delete `Truth8`, we recommend migrating off it, at least if you static import `assertThat`: If you do not migrate, such static imports will become ambiguous in Truth 1.4.2, breaking your build. ### [`v1.4.0`](https://togithub.com/google/truth/releases/tag/v1.4.0): 1.4.0 In this release, our assertions on Java 8 types continue to move from the `Truth8` class to the main `Truth` class. This change should not break compatibility for any supported JDK or Android version, even users who test under old versions of Android without [API desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring). Additionally, we will never break binary compatibility, though some users will have to make changes to their source code in order for it to compile against newer versions. This release is likely to lead to more **build failures** than [1.3.0](https://togithub.com/google/truth/releases/tag/v1.3.0) did. However, those failures should be **straightforward to fix**. #### Example build failure Foo.java:152: error: reference to assertThat is ambiguous assertThat(repo.findFileWithName("foo")).isNull(); ^ both method assertThat(@​org.jspecify.nullness.Nullable Path) in Truth8 and method assertThat(@​org.jspecify.nullness.Nullable Path) in Truth match #### Simplest upgrade strategy (if you can update all your code atomically in the same commit as the Truth upgrade) In the same commit: 1. Upgrade Truth to 1.4.0. 2. Replace `import static com.google.common.truth.Truth8.assertThat;` with `import static com.google.common.truth.Truth.assertThat;`. - If you use Kotlin, replace `import com.google.common.truth.Truth8.assertThat` with `import com.google.common.truth.Truth.assertThat`. 3. Replace `import com.google.common.truth.Truth8;` with `import com.google.common.truth.Truth;`. - again, similarly for Kotlin if needed 4. Optionally replace remaining references to `Truth8` with references to `Truth`. - For example, replace `Truth8.assertThat(optional).isPresent()` with `Truth.assertThat(optional).isPresent()`. If you're feeling lucky, you can try this one-liner for the code updates: ```sh git grep -l Truth8 | xargs perl -pi -e 's/import static com.google.common.truth.Truth8.assertThat;/import static com.google.common.truth.Truth.assertThat;/g; s/import com.google.common.truth.Truth8.assertThat/import com.google.common.truth.Truth.assertThat/g; s/import com.google.common.truth.Truth8/import com.google.common.truth.Truth/g; s/\bTruth8[.]/Truth./g;' ``` In most cases, that can be further simplified to: ```sh git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;' ``` After that process, it is possible that you'll still see build errors from ambiguous usages of `assertThat` static imports. If so, you can find a workaround in the section about overload ambiguity in the release notes for [1.3.0](https://togithub.com/google/truth/releases/tag/v1.3.0). Alternatively, you can wait to upgrade until after a future Truth release, which will eliminate the ambiguity by changing the signatures of some `Truth.assertThat` overloads. #### Incremental upgrade strategy If you have a very large repo or you have other reasons to prefer to upgrade incrementally, you can use the approach that we used inside Google. Roughly, that approach was: 1. Make the optional changes discussed in the release notes for [1.3.0](https://togithub.com/google/truth/releases/tag/v1.3.0). 2. For any remaining calls to `Truth8.assertThat`, change them to *avoid* static import. - That is, replace `assertThat(optional).isPresent()` with `Truth8.assertThat(optional).isPresent()`. 3. Upgrade Truth to 1.4.0. 4. Optionally replace references to `Truth8` with references to `Truth` (including restoring static imports if desired), as discussed in section about the simple upgrade strategy above. #### Optional additional changes - If you use `assertWithMessage(...).about(intStreams()).that(...)`, `expect.about(optionalLongs()).that(...)`, or similar, you can remove your call to `about`. This change will never be necessary; it is just a simplification. - This is similar to a previous optional change from [1.3.0](https://togithub.com/google/truth/releases/tag/v1.3.0), except that 1.3.0 solved this problem for `streams` and `optionals`, whereas 1.4.0 solves it for the other `Truth8` types. #### For help Please feel welcome to [open an issue](https://togithub.com/google/truth/issues/new) to report problems or request help. #### Changelog - Added the remaining `Truth8.assertThat` overloads to the main `Truth` class. ([`9be8e77`](https://togithub.com/google/truth/commit/9be8e774c), [`1f81827`](https://togithub.com/google/truth/commit/1f81827f1)) - Added more `that` overloads to make it possible to write type-specific assertions when using the remaining Java 8 types. ([`7c65fc6`](https://togithub.com/google/truth/commit/7c65fc611)) ### [`v1.3.0`](https://togithub.com/google/truth/releases/tag/v1.3.0): 1.3.0 In this release, our assertions on Java 8 types begin to move from the `truth-java8-extensions` artifact and the `Truth8` class to the main `truth` artifact and the `Truth` class. This change should not break compatibility for anyone, even users who test under old versions of Android without [API desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring). Additionally, we will never break binary compatibility, though some users will have to make changes to their source code in order for it to compile against newer versions. This change will be routine for most users, but we're providing as much information as we can for any users who do encounter problems. We will post fuller instructions for migration later on, once we've learned more from our internal migration efforts. For now, you may find that you need to make one kind of change, and you may elect to make others. (If we missed anything, please [open an issue](https://togithub.com/google/truth/issues/new) to report problems or request help.) The change you might need to make: - By adding new overloads of `Truth.assertThat`, we cause some code to fail to compile because of an overload ambiguity. This is rare, but it can happen if you static import both `Truth.assertThat` and some other `assertThat` method that includes overloads for `Optional` or `Stream`. (It does *not* happen for `Truth8.assertThat`, though, except with the Eclipse compiler. Nor it does *necessarily* happen for other `assertThat(Stream)` and `assertThat(Optional)` methods.) If this happens to you, you'll need to remove one of the static imports, changing the corresponding call sites from "`assertThat`" to "`FooSubject.assertThat`." - Alternatively, you may choose to wait until we make further changes to the new `Truth.assertThat` overloads. Once we make those further changes, you may be able to simultaneously replace all your imports of `Truth8.assertThat` with imports of `Truth.assertThat` as you upgrade to the new version, likely without introducing overload ambiguities. The changes you might elect to make: - If you use `Truth8.assertThat(Stream)` or `Truth8.assertThat(Optional)`, you can migrate to the new overloads in `Truth`. If you static import `Truth8.assertThat`, you can usually make this change simply by replacing that static import with a static import of `Truth.assertThat`β€”or, if you already have an import of `Truth.assertThat`, by just removing the import of `Truth8.assertThat`. (If you additionally use less common assertion methods, like `assertThat(OptionalInt)`, you'll want to use *both* imports for now. Later, we'll move `assertThat(OptionalInt)` and friends, too.) We recommend making this change now, since your calls to `Truth8.assertThat` will fail to compile against some future version of Truth, unless you plan to wait to update your Truth dependency until we've made all our changes for Java 8 types. - If you use `assertWithMessage(...).about(streams()).that(...)`, `expect.about(optionals()).that(...)`, or similar, you can remove your call to `about`. This change will never be necessary; it is just a simplification. - If you depend on `truth-java8-extension`, you may remove it. All its classes are now part of the main `truth` artifact. This change, too, is not necessary; it is just a simplification. (OK, if your build system has a concept of [strict deps](https://blog.bazel.build/2017/06/28/sjd-unused_deps.html), there is a chance that you'll *need* to add deps on `truth` to replace your deps on `truth-java8-extension`.) Finally, the changelog for this release: - Made `StreamSubject` avoid collecting the `Stream` until necessary, and made its `isEqualTo` and `isNotEqualTo` methods no longer always throw. ([`f8ecaec`](https://togithub.com/google/truth/commit/f8ecaec69)) - Added `assertThat` overloads for `Optional` and `Stream` to the main `Truth` class. ([`37fd8be`](https://togithub.com/google/truth/commit/37fd8bea9)) - Added `that` overloads to make it possible to write type-specific assertions when using `expect.that(optional)` and `expect.that(stream)`. ([`ca7e8f4`](https://togithub.com/google/truth/commit/ca7e8f4c5)) - Moved the `truth-java8-extension` classes into the main `truth` artifact. There is no longer any need to depend on `truth-java8-extension`, which is now empty. (We've also removed the `Truth8` [GWT](https://www.gwtproject.org/) module.) ([`eb0426e`](https://togithub.com/google/truth/commit/eb0426eb7)) Again, if you have any problems, please [let us know](https://togithub.com/google/truth/issues/new).
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). Co-authored-by: Min Zhu --- api-common-java/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- gax-java/pom.xml | 2 +- java-core/pom.xml | 2 +- java-shared-dependencies/unmanaged-dependency-check/pom.xml | 2 +- showcase/gapic-showcase/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 2235d47560..dfbf3a5758 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -77,7 +77,7 @@ com.google.truth truth - 1.2.0 + 1.4.1 test diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 82c0b545cb..ca907d6faa 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -467,7 +467,7 @@ com.google.truth truth - 1.2.0 + 1.4.1 test diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 0438c2a50d..8bddee82c1 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -80,7 +80,7 @@ maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.5 maven.junit_junit=junit:junit:4.13.2 maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 -maven.com_google_truth_truth=com.google.truth:truth:1.2.0 +maven.com_google_truth_truth=com.google.truth:truth:1.4.1 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0 maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.11 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index ee254e0304..a86c60f41b 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -176,7 +176,7 @@ com.google.truth truth - 1.2.0 + 1.4.1 org.checkerframework diff --git a/java-core/pom.xml b/java-core/pom.xml index 28a58aa212..55f3d6d28c 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -47,7 +47,7 @@ com.google.truth truth - 1.2.0 + 1.4.1 test diff --git a/java-shared-dependencies/unmanaged-dependency-check/pom.xml b/java-shared-dependencies/unmanaged-dependency-check/pom.xml index 6796ef6ba6..7b658524f9 100644 --- a/java-shared-dependencies/unmanaged-dependency-check/pom.xml +++ b/java-shared-dependencies/unmanaged-dependency-check/pom.xml @@ -67,7 +67,7 @@ com.google.truth truth - 1.2.0 + 1.4.1 test diff --git a/showcase/gapic-showcase/pom.xml b/showcase/gapic-showcase/pom.xml index 582db4d93c..1f00504c7a 100644 --- a/showcase/gapic-showcase/pom.xml +++ b/showcase/gapic-showcase/pom.xml @@ -139,7 +139,7 @@ com.google.truth truth - 1.2.0 + 1.4.1 test