Skip to content

Commit ccfaaeb

Browse files
committed
v3.13.0
1 parent 496055c commit ccfaaeb

File tree

14 files changed

+74
-67
lines changed

14 files changed

+74
-67
lines changed

.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: f468f3366c26a5092eb964a230ce7892fda8f2f8
8-
channel: stable
7+
revision: "efbf63d9c66b9f6ec30e9ad4611189aa80003d31"
8+
channel: "stable"
99

1010
project_type: app
1111

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

3737
# User provided section
3838

analysis_options.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ linter:
1313
# The lint rules applied to this project can be customized in the
1414
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
1515
# included above or to enable additional rules. A list of all available lints
16-
# and their documentation is published at
17-
# https://dart-lang.github.io/linter/lints/index.html.
16+
# and their documentation is published at https://dart.dev/lints.
1817
#
1918
# Instead of disabling a lint rule for the entire project in the
2019
# section below, it can also be suppressed for a single line of code

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 "com.example.flutter_evolution"
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 {}

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"

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 = {

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"

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>

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 = {

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"

pubspec.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
40+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.1"
43+
version: "1.17.2"
4444
cupertino_icons:
4545
dependency: "direct main"
4646
description:
@@ -75,14 +75,6 @@ packages:
7575
description: flutter
7676
source: sdk
7777
version: "0.0.0"
78-
js:
79-
dependency: transitive
80-
description:
81-
name: js
82-
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
83-
url: "https://pub.dev"
84-
source: hosted
85-
version: "0.6.7"
8678
lints:
8779
dependency: transitive
8880
description:
@@ -95,18 +87,18 @@ packages:
9587
dependency: transitive
9688
description:
9789
name: matcher
98-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
90+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
9991
url: "https://pub.dev"
10092
source: hosted
101-
version: "0.12.15"
93+
version: "0.12.16"
10294
material_color_utilities:
10395
dependency: transitive
10496
description:
10597
name: material_color_utilities
106-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
98+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
10799
url: "https://pub.dev"
108100
source: hosted
109-
version: "0.2.0"
101+
version: "0.5.0"
110102
meta:
111103
dependency: transitive
112104
description:
@@ -132,10 +124,10 @@ packages:
132124
dependency: transitive
133125
description:
134126
name: source_span
135-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
127+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
136128
url: "https://pub.dev"
137129
source: hosted
138-
version: "1.9.1"
130+
version: "1.10.0"
139131
stack_trace:
140132
dependency: transitive
141133
description:
@@ -172,10 +164,10 @@ packages:
172164
dependency: transitive
173165
description:
174166
name: test_api
175-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
167+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
176168
url: "https://pub.dev"
177169
source: hosted
178-
version: "0.5.1"
170+
version: "0.6.0"
179171
vector_math:
180172
dependency: transitive
181173
description:
@@ -184,5 +176,13 @@ packages:
184176
url: "https://pub.dev"
185177
source: hosted
186178
version: "2.1.4"
179+
web:
180+
dependency: transitive
181+
description:
182+
name: web
183+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
184+
url: "https://pub.dev"
185+
source: hosted
186+
version: "0.1.4-beta"
187187
sdks:
188-
dart: ">=3.0.6 <4.0.0"
188+
dart: ">=3.1.0 <4.0.0"

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.6 <4.0.0'
22+
sdk: '>=3.1.0 <4.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

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>

windows/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(BINARY_NAME "flutter_evolution")
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)

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

0 commit comments

Comments
 (0)