Skip to content

Commit d0c1d30

Browse files
authored
Merge branch 'main' into fix-image-loading-error
2 parents 544af38 + e855750 commit d0c1d30

4 files changed

Lines changed: 17 additions & 8 deletions

File tree

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-
<!-- Include Cleartext traffic for the espresso package -->
5-
6-
<application android:usesCleartextTraffic="true" />
7-
3+
<!-- The network security config is needed for Espresso testing since it
4+
uses http cleartext traffic.
5+
-->
6+
<application android:networkSecurityConfig="@xml/network_security_config">
7+
<meta-data android:name="io.flutter.network-policy"
8+
android:resource="@xml/network_security_config"/>
9+
</application>
810
</manifest>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<!-- Cleartext is needed for Espresso testing. -->
4+
<base-config cleartextTrafficPermitted="true">
5+
</base-config>
6+
</network-security-config>

animations/lib/src/misc/animated_list.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class _AnimatedListDemoState extends State<AnimatedListDemo> {
4949
parent: animation,
5050
curve: const Interval(0.0, 1.0),
5151
),
52+
// ignore: deprecated_member_use
5253
axisAlignment: 0.0,
5354
child: _buildItem(user),
5455
),

web_embedding/ng-flutter/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"@angular/cdk": "^21.1.2",
1616
"@angular/common": "^21.1.1",
1717
"@angular/compiler": "^21.1.0",
18-
"@angular/core": "^20.0.3",
18+
"@angular/core": "^21.2.0",
1919
"@angular/forms": "^21.1.0",
2020
"@angular/material": "^21.1.1",
21-
"@angular/platform-browser": "^20.0.3",
21+
"@angular/platform-browser": "^21.2.0",
2222
"@angular/platform-browser-dynamic": "^21.1.2",
2323
"@angular/router": "^21.1.0",
2424
"rxjs": "~7.8.1",
@@ -28,7 +28,7 @@
2828
"devDependencies": {
2929
"@angular-devkit/build-angular": "^21.1.2",
3030
"@angular/cli": "~21.1.1",
31-
"@angular/compiler-cli": "^20.0.3",
31+
"@angular/compiler-cli": "^21.2.0",
3232
"@types/jasmine": "~6.0.0",
3333
"jasmine-core": "~6.0.0",
3434
"karma": "~6.4.2",

0 commit comments

Comments
 (0)