Skip to content

[google_maps_flutter_android, url_launcher_android] bump roboelectric version #3372

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.

Sign up for GitHub

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

Merged
auto-submit merged 4 commits into from
Mar 21, 2023
Merged

[google_maps_flutter_android, url_launcher_android] bump roboelectric version #3372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
113ad8f
bump roboelectric version
asaarnak Mar 4, 2023
c9d2ab0
update examples
asaarnak Mar 4, 2023
212a38a
[google_maps_flutter_android] Fix native_test after RoboElectric bump
asaarnak Mar 9, 2023
0ac3661
Merge remote-tracking branch 'origin/main' into update-robolectric
asaarnak Mar 9, 2023
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
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.4.10

* Bump RoboElectric dependency to 4.4.1 to support AndroidX.

## 2.4.9

* Clarifies explanation of endorsement in README.
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.1.1'
testImplementation 'androidx.test:core:1.2.0'
testImplementation "org.robolectric:robolectric:4.3.1"
testImplementation "org.robolectric:robolectric:4.4.1"
}

compileOptions {
Expand Down
4 changes: 4 additions & 0 deletions ..._android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import android.content.Context;
import android.os.Build;
import android.os.Looper;
import androidx.activity.ComponentActivity;
import androidx.test.core.app.ApplicationProvider;
import com.google.android.gms.maps.GoogleMap;
Expand All @@ -32,6 +33,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;

@RunWith(RobolectricTestRunner.class)
Expand Down Expand Up @@ -118,6 +120,7 @@ public void InvalidateMapAfterMethodCalls() throws InterruptedException {

verify(mapView, never()).invalidate();
argument.getValue().onMapLoaded();
Shadows.shadowOf(Looper.getMainLooper()).idle();
verify(mapView).invalidate();
}
}
Expand All @@ -141,6 +144,7 @@ public void InvalidateMapOnceAfterMethodCall() throws InterruptedException {

verify(mapView, never()).invalidate();
argument.getValue().onMapLoaded();
Shadows.shadowOf(Looper.getMainLooper()).idle();
verify(mapView).invalidate();
}

Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_android/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_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: google_maps_flutter_android
description: Android implementation of the google_maps_flutter plugin.
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
version: 2.4.9
version: 2.4.10

environment:
sdk: ">=2.17.0 <3.0.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/url_launcher/url_launcher_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 6.0.26

* Bump RoboElectric dependency to 4.4.1 to support AndroidX.

## 6.0.25

* Clarifies explanation of endorsement in README.
Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.1.1'
testImplementation 'androidx.test:core:1.0.0'
testImplementation 'org.robolectric:robolectric:4.3'
testImplementation 'org.robolectric:robolectric:4.4.1'
}
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_android/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_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: url_launcher_android
description: Android implementation of the url_launcher plugin.
repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
version: 6.0.25
version: 6.0.26

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