Skip to content

Commit 262fb8f

Browse files
tarrinnealtarrinneal
committed
merge main and fix tests
1 parent d1e8053 commit 262fb8f

File tree

264 files changed

+6560
-1628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+6560
-1628
lines changed

‎.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
077d644bbc5f93350f39fc271e350d375f77be89
1+
f86c529b2cd28886e9e12d658de4d5c294c9de13

‎.ci/legacy_project/README.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
This directory contains a partial snapshot of an old Flutter project; it is
2+
intended to replace the corresponding parts of a newly Flutter-created project
3+
to allow testing plugin builds with a legacy project.
4+
5+
It was originally created with Flutter 2.0.6. In general the guidelines are:
6+
- Pieces here should be largely self-contained rather than portions of
7+
major project components; for instance, it currently contains the entire
8+
`android/` directory from a legacy project, rather than a subset of it
9+
which would be combined with a subset of a new project's `android/`
10+
directory. This is to avoid random breakage in the future due to
11+
conflicts between those subsets. For instance, we could probably get
12+
away with not including android/app/src/main/res for a while, and
13+
instead layer in the versions from a new project, but then someday
14+
if the resources were renamed, there would be dangling references to
15+
the old resources in files that are included here.
16+
- Updates over time should be minimal. We don't expect that an unchanged
17+
project will keep working forever, but this directory should simulate
18+
a developer who has done the bare minimum to keep their project working
19+
as they have updated Flutter.
20+
- Updates should be logged below.
21+
22+
The reason for the hybrid model, rather than checking in a full legacy
23+
project, is to minimize unnecessary maintenance work. E.g., there's no
24+
need to manually keep Dart code updated for Flutter changes just to
25+
test legacy native Android build behaviors.
26+
27+
## Manual changes to files
28+
29+
The following are the changes relative to running:
30+
31+
```bash
32+
flutter create -a java all_packages
33+
```
34+
35+
and then deleting everything but `android/` from it:
36+
37+
- Added license boilerplate.

‎.ci/legacy_project/all_packages/.gitignore

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
6+
.DS_Store
7+
.atom/
8+
.buildlog/
9+
.history
10+
.svn/
11+
12+
# IntelliJ related
13+
*.iml
14+
*.ipr
15+
*.iws
16+
.idea/
17+
18+
# The .vscode folder contains launch configuration and tasks you configure in
19+
# VS Code which you may wish to be included in version control, so this line
20+
# is commented out by default.
21+
#.vscode/
22+
23+
# Flutter/Dart/Pub related
24+
**/doc/api/
25+
**/ios/Flutter/.last_build_id
26+
.dart_tool/
27+
.flutter-plugins
28+
.flutter-plugins-dependencies
29+
.packages
30+
.pub-cache/
31+
.pub/
32+
/build/
33+
34+
# Web related
35+
lib/generated_plugin_registrant.dart
36+
37+
# Symbolication related
38+
app.*.symbols
39+
40+
# Obfuscation related
41+
app.*.map.json
42+
43+
# Android Studio will place build artifacts here
44+
/android/app/debug
45+
/android/app/profile
46+
/android/app/release

‎.ci/legacy_project/all_packages/.metadata

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file tracks properties of this Flutter project.
2+
# Used by Flutter tool to assess capabilities and perform upgrades etc.
3+
#
4+
# This file should be version controlled and should not be manually edited.
5+
6+
version:
7+
revision: 1d9032c7e1d867f071f2277eb1673e8f9b0274e3
8+
channel: unknown
9+
10+
project_type: app

‎.ci/legacy_project/all_packages/android/.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
GeneratedPluginRegistrant.java
8+
9+
# Remember to never publicly share your keystore.
10+
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
key.properties

‎.ci/legacy_project/all_packages/android/app/build.gradle

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
def localProperties = new Properties()
2+
def localPropertiesFile = rootProject.file('local.properties')
3+
if (localPropertiesFile.exists()) {
4+
localPropertiesFile.withReader('UTF-8') { reader ->
5+
localProperties.load(reader)
6+
}
7+
}
8+
9+
def flutterRoot = localProperties.getProperty('flutter.sdk')
10+
if (flutterRoot == null) {
11+
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12+
}
13+
14+
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
15+
if (flutterVersionCode == null) {
16+
flutterVersionCode = '1'
17+
}
18+
19+
def flutterVersionName = localProperties.getProperty('flutter.versionName')
20+
if (flutterVersionName == null) {
21+
flutterVersionName = '1.0'
22+
}
23+
24+
apply plugin: 'com.android.application'
25+
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26+
27+
android {
28+
compileSdkVersion 30
29+
30+
defaultConfig {
31+
applicationId "com.example.all_packages"
32+
minSdkVersion 16
33+
targetSdkVersion 30
34+
versionCode flutterVersionCode.toInteger()
35+
versionName flutterVersionName
36+
}
37+
38+
buildTypes {
39+
release {
40+
signingConfig signingConfigs.debug
41+
}
42+
}
43+
}
44+
45+
flutter {
46+
source '../..'
47+
}

‎.ci/legacy_project/all_packages/android/app/src/debug/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.example.all_packages">
3+
<uses-permission android:name="android.permission.INTERNET"/>
4+
</manifest>

‎.ci/legacy_project/all_packages/android/app/src/main/AndroidManifest.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.example.all_packages">
3+
<application
4+
android:label="all_packages"
5+
android:icon="@mipmap/ic_launcher">
6+
<activity
7+
android:name=".MainActivity"
8+
android:launchMode="singleTop"
9+
android:theme="@style/LaunchTheme"
10+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
11+
android:hardwareAccelerated="true"
12+
android:windowSoftInputMode="adjustResize">
13+
<!-- Specifies an Android theme to apply to this Activity as soon as
14+
the Android process has started. This theme is visible to the user
15+
while the Flutter UI initializes. After that, this theme continues
16+
to determine the Window background behind the Flutter UI. -->
17+
<meta-data
18+
android:name="io.flutter.embedding.android.NormalTheme"
19+
android:resource="@style/NormalTheme"
20+
/>
21+
<!-- Displays an Android View that continues showing the launch screen
22+
Drawable until Flutter paints its first frame, then this splash
23+
screen fades out. A splash screen is useful to avoid any visual
24+
gap between the end of Android's launch screen and the painting of
25+
Flutter's first frame. -->
26+
<meta-data
27+
android:name="io.flutter.embedding.android.SplashScreenDrawable"
28+
android:resource="@drawable/launch_background"
29+
/>
30+
<intent-filter>
31+
<action android:name="android.intent.action.MAIN"/>
32+
<category android:name="android.intent.category.LAUNCHER"/>
33+
</intent-filter>
34+
</activity>
35+
<!-- Don't delete the meta-data below.
36+
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
37+
<meta-data
38+
android:name="flutterEmbedding"
39+
android:value="2" />
40+
</application>
41+
</manifest>

‎.ci/legacy_project/all_packages/android/app/src/main/java/com/example/all_packages/MainActivity.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
package com.example.all_packages;
6+
7+
import io.flutter.embedding.android.FlutterActivity;
8+
9+
public class MainActivity extends FlutterActivity {
10+
}

‎.ci/legacy_project/all_packages/android/app/src/main/res/drawable-v21/launch_background.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Modify this file to customize your launch splash screen -->
3+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
4+
<item android:drawable="?android:colorBackground" />
5+
6+
<!-- You can insert your own image assets here -->
7+
<!-- <item>
8+
<bitmap
9+
android:gravity="center"
10+
android:src="@mipmap/launch_image" />
11+
</item> -->
12+
</layer-list>

‎.ci/legacy_project/all_packages/android/app/src/main/res/drawable/launch_background.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Modify this file to customize your launch splash screen -->
3+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
4+
<item android:drawable="@android:color/white" />
5+
6+
<!-- You can insert your own image assets here -->
7+
<!-- <item>
8+
<bitmap
9+
android:gravity="center"
10+
android:src="@mipmap/launch_image" />
11+
</item> -->
12+
</layer-list>

‎.ci/legacy_project/all_packages/android/app/src/main/res/mipmap-hdpi/ic_launcher.png

544 Bytes
Loading

‎.ci/legacy_project/all_packages/android/app/src/main/res/mipmap-mdpi/ic_launcher.png

442 Bytes
Loading

‎.ci/legacy_project/all_packages/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

721 Bytes
Loading

‎.ci/legacy_project/all_packages/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

1.01 KB
Loading

‎.ci/legacy_project/all_packages/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

1.41 KB
Loading

‎.ci/legacy_project/all_packages/android/app/src/main/res/values-night/styles.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
5+
<!-- Show a splash screen on the activity. Automatically removed when
6+
Flutter draws its first frame -->
7+
<item name="android:windowBackground">@drawable/launch_background</item>
8+
</style>
9+
<!-- Theme applied to the Android Window as soon as the process has started.
10+
This theme determines the color of the Android Window while your
11+
Flutter UI initializes, as well as behind your Flutter UI while its
12+
running.
13+
14+
This Theme is only used starting with V2 of Flutter's Android embedding. -->
15+
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
16+
<item name="android:windowBackground">?android:colorBackground</item>
17+
</style>
18+
</resources>

‎.ci/legacy_project/all_packages/android/app/src/main/res/values/styles.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
5+
<!-- Show a splash screen on the activity. Automatically removed when
6+
Flutter draws its first frame -->
7+
<item name="android:windowBackground">@drawable/launch_background</item>
8+
</style>
9+
<!-- Theme applied to the Android Window as soon as the process has started.
10+
This theme determines the color of the Android Window while your
11+
Flutter UI initializes, as well as behind your Flutter UI while its
12+
running.
13+
14+
This Theme is only used starting with V2 of Flutter's Android embedding. -->
15+
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
16+
<item name="android:windowBackground">?android:colorBackground</item>
17+
</style>
18+
</resources>

‎.ci/legacy_project/all_packages/android/app/src/profile/AndroidManifest.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.example.all_packages">
3+
<!-- Flutter needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>

‎.ci/legacy_project/all_packages/android/build.gradle

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
buildscript {
2+
repositories {
3+
google()
4+
jcenter()
5+
}
6+
7+
dependencies {
8+
classpath 'com.android.tools.build:gradle:4.1.0'
9+
}
10+
}
11+
12+
allprojects {
13+
repositories {
14+
google()
15+
jcenter()
16+
}
17+
}
18+
19+
rootProject.buildDir = '../build'
20+
subprojects {
21+
project.buildDir = "${rootProject.buildDir}/${project.name}"
22+
}
23+
subprojects {
24+
project.evaluationDependsOn(':app')
25+
}
26+
27+
task clean(type: Delete) {
28+
delete rootProject.buildDir
29+
}

‎.ci/legacy_project/all_packages/android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
org.gradle.jvmargs=-Xmx1536M
2+
android.useAndroidX=true
3+
android.enableJetifier=true

‎.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Fri Jun 23 08:50:38 CEST 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

‎.ci/legacy_project/all_packages/android/settings.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
include ':app'
2+
3+
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4+
def properties = new Properties()
5+
6+
assert localPropertiesFile.exists()
7+
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
8+
9+
def flutterSdkPath = properties.getProperty("flutter.sdk")
10+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11+
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

‎.cirrus.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,11 @@ task:
302302
CHANNEL: "master"
303303
CHANNEL: "stable"
304304
<< : *BUILD_ALL_PACKAGES_APP_TEMPLATE
305+
create_all_packages_app_legacy_script:
306+
- $PLUGIN_TOOL_COMMAND create-all-packages-app --legacy-source=.ci/legacy_project/all_packages --output-dir=legacy/ --exclude script/configs/exclude_all_packages_app.yaml
307+
build_all_packages_legacy_script:
308+
- cd legacy/all_packages
309+
- flutter build $BUILD_ALL_ARGS --debug
305310
### Web tasks ###
306311
- name: web-platform_tests
307312
env:

‎.github/dependabot.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ updates:
1717
schedule:
1818
interval: "daily"
1919
reviewers:
20-
- "hixie"
21-
- "godofredoc"
20+
- "keyonghan"
21+
- "yusuf-goog"
22+
- "ricardoamador"
2223
labels:
2324
- "team"
2425
- "team: infra"
26+
- "autosubmit"
2527

2628
- package-ecosystem: "gradle"
2729
directory: "/packages/animations/example/android/app"

‎analysis_options.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ analyzer:
1313
# allow self-reference to deprecated members (we do this because otherwise we have
1414
# to annotate every member in every test, assert, etc, when we deprecate something)
1515
deprecated_member_use_from_same_package: ignore
16-
# Turned off until null-safe rollout is complete.
17-
unnecessary_null_comparison: ignore
1816
exclude: # DIFFERENT FROM FLUTTER/FLUTTER
1917
# Ignore generated files
2018
- '**/*.g.dart'
@@ -185,7 +183,7 @@ linter:
185183
- tighten_type_of_initializing_formals
186184
# - type_annotate_public_apis # subset of always_specify_types
187185
- type_init_formals
188-
# - unawaited_futures # too many false positives, especially with the way AnimationController works
186+
- unawaited_futures # DIFFERENT FROM FLUTTER/FLUTTER: It's disabled there for "too many false positives"; that's not an issue here, and missing awaits have caused production issues in plugins.
189187
- unnecessary_await_in_return
190188
- unnecessary_brace_in_string_interps
191189
- unnecessary_const

‎packages/animations/analysis_options.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This custom rule set only exists to allow opting out of the repository
2+
# default of enabling unawaited_futures. Please do NOT add more changes
3+
# here without consulting with #hackers-ecosystem on Discord.
4+
5+
include: ../../analysis_options.yaml
6+
7+
linter:
8+
rules:
9+
# Matches flutter/flutter, which disables this rule due to false positives.
10+
unawaited_futures: false

0 commit comments

Comments
 (0)