Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump com.google.googlejavaformat:google-java-format from 1.16.0 to 1.17.0 #2996

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -13,7 +13,7 @@ buildscript {
classpath 'org.shipkit:shipkit-changelog:1.2.0'
classpath 'org.shipkit:shipkit-auto-version:1.2.2'

classpath 'com.google.googlejavaformat:google-java-format:1.16.0'
classpath 'com.google.googlejavaformat:google-java-format:1.17.0'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21"
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/mockito/MockMakers.java
Expand Up @@ -23,12 +23,14 @@ public final class MockMakers {
* @see <a href="Mockito.html#39">Mocking final types, enums and final methods</a>
*/
public static final String INLINE = "mock-maker-inline";

/**
* Proxy mock maker which avoids code generation, but can only mock interfaces.
*
* @see <a href="Mockito.html#50">Avoiding code generation when restricting mocks to interfaces</a>
*/
public static final String PROXY = "mock-maker-proxy";

/**
* Subclass mock maker which mocks types by creating subclasses.
* This is the first built-in mock maker which has been provided by Mockito.
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/mockito/internal/util/StringUtil.java
Expand Up @@ -15,6 +15,7 @@ public class StringUtil {
private static final Pattern CAPS = Pattern.compile("([A-Z\\d][^A-Z\\d]*)");

private StringUtil() {}

/**
* @param text
* to have the first line removed
Expand Down
Expand Up @@ -21,6 +21,7 @@
public class ArgumentMatchingTool {

private ArgumentMatchingTool() {}

/**
* Suspiciously not matching arguments are those that don't match, the toString() representation is the same but types are different.
*/
Expand Down