Skip to content

Commit f1fd434

Browse files
Flutter beta (#1952)
1 parent f95f25a commit f1fd434

File tree

189 files changed

+1956
-2041
lines changed

Some content is hidden

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

189 files changed

+1956
-2041
lines changed

analysis_defaults/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Analysis defaults for flutter/samples
33
publish_to: none
44

55
environment:
6-
sdk: ^3.0.0
6+
sdk: ^3.1.0-0
77

88
# NOTE: Code is not allowed in this package. Do not add dependencies.
99
dependencies:

android_splash_screen/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish_to: "none"
66
version: 1.0.0+1
77

88
environment:
9-
sdk: ^3.0.0
9+
sdk: ^3.1.0-0
1010

1111
dependencies:
1212
flutter:

animations/.metadata

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
8-
channel: stable
7+
revision: "ac71592bc605996f9376ec5b7607db52b64cabd0"
8+
channel: "beta"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
17-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
16+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
17+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
1818
- platform: android
19-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
20-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
19+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
20+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
2121
- platform: ios
22-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
23-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
22+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
23+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
2424
- platform: linux
25-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
26-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
25+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
26+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
2727
- platform: macos
28-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
29-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
28+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
29+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
3030
- platform: web
31-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
32-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
31+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
32+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
3333
- platform: windows
34-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
35-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
34+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
35+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
3636

3737
# User provided section
3838

animations/android/app/build.gradle

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

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-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2825
android {
2926
namespace "dev.flutter.animations"
3027
compileSdkVersion flutter.compileSdkVersion
@@ -67,6 +64,4 @@ flutter {
6764
source '../..'
6865
}
6966

70-
dependencies {
71-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
72-
}
67+
dependencies {}

animations/android/settings.gradle

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}
9+
settings.ext.flutterSdkPath = flutterSdkPath()
210

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
11+
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
512

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
13+
plugins {
14+
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
15+
}
16+
}
817

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"
18+
include ":app"
19+
20+
apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"

animations/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@
168168
97C146E61CF9000F007C117D /* Project object */ = {
169169
isa = PBXProject;
170170
attributes = {
171-
LastUpgradeCheck = 1300;
171+
BuildIndependentTargetsInParallel = YES;
172+
LastUpgradeCheck = 1430;
172173
ORGANIZATIONNAME = "";
173174
TargetAttributes = {
174175
331C8080294A63A400263BE5 = {

animations/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

animations/ios/Runner/Info.plist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
<string>UIInterfaceOrientationLandscapeLeft</string>
4242
<string>UIInterfaceOrientationLandscapeRight</string>
4343
</array>
44-
<key>UIViewControllerBasedStatusBarAppearance</key>
45-
<false/>
4644
<key>CADisableMinimumFrameDurationOnPhone</key>
4745
<true/>
4846
<key>UIApplicationSupportsIndirectInputEvents</key>

animations/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
isa = PBXProject;
228228
attributes = {
229229
LastSwiftUpdateCheck = 0920;
230-
LastUpgradeCheck = 1300;
230+
LastUpgradeCheck = 1430;
231231
ORGANIZATIONNAME = "";
232232
TargetAttributes = {
233233
331C80D4294CF70F00263BE5 = {

animations/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

animations/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0+1
44
publish_to: none
55

66
environment:
7-
sdk: ^3.0.0
7+
sdk: ^3.1.0-0
88

99
dependencies:
1010
flutter:

animations/web/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<script>
3636
// The value below is injected by flutter build, do not touch.
37-
var serviceWorkerVersion = null;
37+
const serviceWorkerVersion = null;
3838
</script>
3939
<!-- This script adds the flutter initialization JS code -->
4040
<script src="flutter.js" defer></script>

animations/windows/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(BINARY_NAME "animations")
88

99
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
1010
# versions of CMake.
11-
cmake_policy(SET CMP0063 NEW)
11+
cmake_policy(VERSION 3.14...3.25)
1212

1313
# Define build configuration option.
1414
get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)

animations/windows/runner/flutter_window.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() {
3131
this->Show();
3232
});
3333

34+
// Flutter can complete the first frame before the "show window" callback is
35+
// registered. The following call ensures a frame is pending to ensure the
36+
// window is shown. It is a no-op if the first frame hasn't completed yet.
37+
flutter_controller_->ForceRedraw();
38+
3439
return true;
3540
}
3641

background_isolate_channels/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
66
version: 1.0.0+1
77

88
environment:
9-
sdk: ^3.0.0
9+
sdk: ^3.1.0-0
1010

1111
dependencies:
1212
cupertino_icons: ^1.0.2

code_sharing/client/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: "none"
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.0.0
7+
sdk: ^3.1.0-0
88

99
dependencies:
1010
cupertino_icons: ^1.0.2

code_sharing/server/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0
44
publish_to: "none"
55

66
environment:
7-
sdk: ^3.0.0
7+
sdk: ^3.1.0-0
88

99
dependencies:
1010
args: ^2.0.0

code_sharing/shared/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Common data models required by our client and server
33
version: 1.0.0
44

55
environment:
6-
sdk: ^3.0.0
6+
sdk: ^3.1.0-0
77

88
dependencies:
99
freezed_annotation: ^2.1.0

deeplink_store_example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: ^3.0.0
22+
sdk: ^3.1.0-0
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions

desktop_photo_search/fluent_ui/.metadata

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
8-
channel: stable
7+
revision: "ac71592bc605996f9376ec5b7607db52b64cabd0"
8+
channel: "beta"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
17-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
16+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
17+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
1818
- platform: linux
19-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
20-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
19+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
20+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
2121
- platform: macos
22-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
23-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
22+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
23+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
2424
- platform: windows
25-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
26-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
25+
create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
26+
base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
2727

2828
# User provided section
2929

0 commit comments

Comments
 (0)