Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/camera/camera_web/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT
## 0.2.1+4

* Migrates from `ui.hash*` to `Object.hash*`.
* Updates minimum Flutter version for changes in 0.2.1+3.

## 0.2.1+3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'package:flutter/foundation.dart';

/// Metadata used along the camera description
Expand Down Expand Up @@ -38,5 +36,5 @@ class CameraMetadata {
}

@override
int get hashCode => hashValues(deviceId.hashCode, facingMode.hashCode);
int get hashCode => Object.hash(deviceId.hashCode, facingMode.hashCode);
}
10 changes: 4 additions & 6 deletions packages/camera/camera_web/lib/src/types/camera_options.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'package:flutter/foundation.dart';

/// Options used to create a camera with the given
Expand Down Expand Up @@ -50,7 +48,7 @@ class CameraOptions {
}

@override
int get hashCode => hashValues(audio, video);
int get hashCode => Object.hash(audio, video);
}

/// Indicates whether the audio track is requested.
Expand Down Expand Up @@ -140,7 +138,7 @@ class VideoConstraints {
}

@override
int get hashCode => hashValues(facingMode, width, height, deviceId);
int get hashCode => Object.hash(facingMode, width, height, deviceId);
}

/// The camera type used in [FacingModeConstraint].
Expand Down Expand Up @@ -213,7 +211,7 @@ class FacingModeConstraint {
}

@override
int get hashCode => hashValues(ideal, exact);
int get hashCode => Object.hash(ideal, exact);
}

/// The size of the requested video track used in
Expand Down Expand Up @@ -272,5 +270,5 @@ class VideoSizeConstraint {
}

@override
int get hashCode => hashValues(minimum, ideal, maximum);
int get hashCode => Object.hash(minimum, ideal, maximum);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// found in the LICENSE file.

import 'dart:html' as html;
import 'dart:ui' show hashValues;

import 'package:flutter/foundation.dart';

Expand Down Expand Up @@ -46,5 +45,5 @@ class ZoomLevelCapability {
}

@override
int get hashCode => hashValues(minimum, maximum, videoTrack);
int get hashCode => Object.hash(minimum, maximum, videoTrack);
}
2 changes: 1 addition & 1 deletion packages/camera/camera_web/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_web
description: A Flutter plugin for getting information about and controlling the camera on Web.
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_web
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.2.1+3
version: 0.2.1+4

environment:
sdk: ">=2.12.0 <3.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 2.1.6

* Migrates from `ui.hash*` to `Object.hash*`.
* Updates minimum Flutter version to 2.5.0.

## 2.1.5

Removes dependency on `meta`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues, Offset;
import 'dart:ui' show Offset;

import 'types.dart';

Expand Down Expand Up @@ -99,7 +99,7 @@ class CameraPosition {
}

@override
int get hashCode => hashValues(bearing, target, tilt, zoom);
int get hashCode => Object.hash(bearing, target, tilt, zoom);

@override
String toString() =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'package:flutter/foundation.dart' show visibleForTesting;

/// A pair of latitude and longitude coordinates, stored as degrees.
Expand Down Expand Up @@ -55,7 +53,7 @@ class LatLng {
}

@override
int get hashCode => hashValues(latitude, longitude);
int get hashCode => Object.hash(latitude, longitude);
}

/// A latitude/longitude aligned rectangle.
Expand Down Expand Up @@ -132,5 +130,5 @@ class LatLngBounds {
}

@override
int get hashCode => hashValues(southwest, northeast);
int get hashCode => Object.hash(southwest, northeast);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues, hashList;

import 'package:flutter/foundation.dart' show objectRuntimeType, setEquals;

import 'maps_object.dart';
Expand Down Expand Up @@ -114,8 +112,8 @@ class MapsObjectUpdates<T extends MapsObject> {
}

@override
int get hashCode => hashValues(hashList(_objectsToAdd),
hashList(_objectIdsToRemove), hashList(_objectsToChange));
int get hashCode => Object.hash(Object.hashAll(_objectsToAdd),
Object.hashAll(_objectIdsToRemove), Object.hashAll(_objectsToChange));

@override
String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues, Offset;
import 'dart:ui' show Offset;

import 'package:flutter/foundation.dart'
show immutable, ValueChanged, VoidCallback;
Expand Down Expand Up @@ -90,7 +90,7 @@ class InfoWindow {
}

@override
int get hashCode => hashValues(title.hashCode, snippet, anchor);
int get hashCode => Object.hash(title.hashCode, snippet, anchor);

@override
String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'package:flutter/foundation.dart' show immutable;

/// Represents a point coordinate in the [GoogleMap]'s view.
Expand Down Expand Up @@ -42,5 +40,5 @@ class ScreenCoordinate {
}

@override
int get hashCode => hashValues(x, y);
int get hashCode => Object.hash(x, y);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'package:flutter/foundation.dart' show immutable;

import 'types.dart';
Expand Down Expand Up @@ -146,6 +144,6 @@ class TileOverlay implements MapsObject {
}

@override
int get hashCode => hashValues(tileOverlayId, fadeIn, tileProvider,
int get hashCode => Object.hash(tileOverlayId, fadeIn, tileProvider,
transparency, zIndex, visible, tileSize);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'types.dart';

/// Type of map tiles to display.
Expand Down Expand Up @@ -97,7 +95,7 @@ class MinMaxZoomPreference {
}

@override
int get hashCode => hashValues(minZoom, maxZoom);
int get hashCode => Object.hash(minZoom, maxZoom);

@override
String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_fl
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
# NOTE: We strongly prefer non-breaking changes, even at the expense of a
# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
version: 2.1.5
version: 2.1.6

environment:
sdk: '>=2.12.0 <3.0.0'
flutter: ">=2.0.0"
flutter: ">=2.5.0"

dependencies:
collection: ^1.15.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues, hashList;

import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:google_maps_flutter_platform_interface/src/types/maps_object.dart';
import 'package:google_maps_flutter_platform_interface/src/types/maps_object_updates.dart';
Expand Down Expand Up @@ -129,10 +126,10 @@ void main() {
TestMapsObjectUpdate.from(previous, current);
expect(
updates.hashCode,
hashValues(
hashList(updates.objectsToAdd),
hashList(updates.objectIdsToRemove),
hashList(updates.objectsToChange)));
Object.hash(
Object.hashAll(updates.objectsToAdd),
Object.hashAll(updates.objectIdsToRemove),
Object.hashAll(updates.objectsToChange)));
});

test('toString', () async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'package:flutter/rendering.dart';
import 'package:google_maps_flutter_platform_interface/src/types/maps_object.dart';
import 'package:google_maps_flutter_platform_interface/src/types/maps_object_updates.dart';

Expand Down Expand Up @@ -37,7 +34,7 @@ class TestMapsObject implements MapsObject {
}

@override
int get hashCode => hashValues(mapsId, data);
int get hashCode => Object.hash(mapsId, data);
}

class TestMapsObjectUpdate extends MapsObjectUpdates<TestMapsObject> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues;

import 'package:flutter_test/flutter_test.dart';
import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';

Expand Down Expand Up @@ -130,7 +128,7 @@ void main() {
tileSize: 128);
expect(
tileOverlay.hashCode,
hashValues(
Object.hash(
tileOverlay.tileOverlayId,
tileOverlay.fadeIn,
tileOverlay.tileProvider,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui' show hashValues, hashList;

import 'package:flutter_test/flutter_test.dart';
import 'package:google_maps_flutter_platform_interface/src/types/tile_overlay.dart';
import 'package:google_maps_flutter_platform_interface/src/types/tile_overlay_updates.dart';
Expand Down Expand Up @@ -98,10 +96,10 @@ void main() {
TileOverlayUpdates.from(previous, current);
expect(
updates.hashCode,
hashValues(
hashList(updates.tileOverlaysToAdd),
hashList(updates.tileOverlayIdsToRemove),
hashList(updates.tileOverlaysToChange)));
Object.hash(
Object.hashAll(updates.tileOverlaysToAdd),
Object.hashAll(updates.tileOverlayIdsToRemove),
Object.hashAll(updates.tileOverlaysToChange)));
});

test('toString', () async {
Expand Down
3 changes: 2 additions & 1 deletion packages/google_sign_in/google_sign_in/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT
## 5.2.5

* Migrates from `ui.hash*` to `Object.hash*`.
* Adds OS version support information to README.

## 5.2.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// found in the LICENSE file.

import 'dart:async';
import 'dart:ui' show hashValues;

import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart' show PlatformException;
Expand Down Expand Up @@ -148,7 +147,7 @@ class GoogleSignInAccount implements GoogleIdentity {

@override
int get hashCode =>
hashValues(displayName, email, id, photoUrl, _idToken, serverAuthCode);
Object.hash(displayName, email, id, photoUrl, _idToken, serverAuthCode);

@override
String toString() {
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
for signing in with a Google account on Android and iOS.
repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
version: 5.2.4
version: 5.2.5

environment:
sdk: ">=2.14.0 <3.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.2.2+3

* Migrates from `ui.hash*` to `Object.hash*`.
* Updates minimum Flutter version to 2.5.0.

## 0.2.2+2

* Internal code cleanup for stricter analysis options.
Expand Down
Loading