Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[quick_actions]: Bump mockito-core from 3.2.4 to 4.6.1 in /packages/quick_actions/quick_actions_android/android #5899

Merged
merged 5 commits into from
Aug 4, 2022
Merged

[quick_actions]: Bump mockito-core from 3.2.4 to 4.6.1 in /packages/quick_actions/quick_actions_android/android #5899

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29ac28d
[quick_actions]: Bump mockito-core
dependabot[bot] Jul 22, 2022
8b6052e
Merge remote-tracking branch 'upstream/main' into dependabot/gradle/p…
camsim99 Aug 3, 2022
3fbafdd
Remove depcreated fieldsetter
camsim99 Aug 3, 2022
cbc3a0e
Bump
camsim99 Aug 3, 2022
9a0f4f5
Undo bump
camsim99 Aug 4, 2022
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
7 changes: 6 additions & 1 deletion packages/quick_actions/quick_actions_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
## 0.6.3
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Aug 4, 2022

Choose a reason for hiding this comment

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

Since this only affects tests, which don't impact clients of the plugin, you can remove the version bump from the pubspec and just use NEXT here.

publishable may still flag it because of build.gradle, but since it's a testImplementation line that's a false positive that you can override with the label. (Currently it's not doing any line-level analysis of the diff, only looking at files. Eventually we should make it smarter.)

Copy link
Contributor

@camsim99 camsim99 Aug 4, 2022

Choose a reason for hiding this comment

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

Oh I understand now. Ok thanks!


* Updates mockito-core to 4.6.1.
* Removes deprecated FieldSetter from QuickActionsTest.

## 0.6.2

* Update gradle version to 7.2.1 on Android.
* Updates gradle version to 7.2.1.

## 0.6.1

Expand Down
2 changes: 1 addition & 1 deletion packages/quick_actions/quick_actions_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ android {

dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.2.4'
testImplementation 'org.mockito:mockito-core:4.6.1'
}

compileOptions {
Expand Down
8 changes: 3 additions & 5 deletions ...tions_android/android/src/test/java/io/flutter/plugins/quickactions/QuickActionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.nio.ByteBuffer;
import org.junit.After;
import org.junit.Test;
import org.mockito.internal.util.reflection.FieldSetter;

public class QuickActionsTest {
private static class TestBinaryMessenger implements BinaryMessenger {
Expand Down Expand Up @@ -79,10 +78,9 @@ public void onAttachedToActivity_buildVersionSupported_invokesLaunchMethod()
final QuickActionsPlugin plugin = new QuickActionsPlugin();
setUpMessengerAndFlutterPluginBinding(testBinaryMessenger, plugin);
setBuildVersion(SUPPORTED_BUILD);
FieldSetter.setField(
plugin,
QuickActionsPlugin.class.getDeclaredField("handler"),
mock(MethodCallHandlerImpl.class));
Field handler = plugin.getClass().getDeclaredField("handler");
handler.setAccessible(true);
handler.set(plugin, mock(MethodCallHandlerImpl.class));
final Intent mockIntent = createMockIntentWithQuickActionExtra();
final Activity mockMainActivity = mock(Activity.class);
when(mockMainActivity.getIntent()).thenReturn(mockIntent);
Expand Down
2 changes: 1 addition & 1 deletion packages/quick_actions/quick_actions_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: quick_actions_android
description: An implementation for the Android platform of the Flutter `quick_actions` plugin.
repository: https://github.com/flutter/plugins/tree/main/packages/quick_actions/quick_actions_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
version: 0.6.2
version: 0.6.3

environment:
sdk: ">=2.15.0 <3.0.0"
Expand Down