Skip to content

Commit c258b1e

Browse files
authored
chore: updates package to Flutter 3.35 (#111)
1 parent 90efbaa commit c258b1e

12 files changed

Lines changed: 82 additions & 64 deletions

File tree

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ migrate_working_dir/
2626
/pubspec.lock
2727
**/doc/api/
2828
.dart_tool/
29-
.flutter-plugins
3029
.flutter-plugins-dependencies
31-
build/
30+
/build/
31+
/coverage/
3232

3333
# Development Scripts
3434
scripts/

.metadata

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "fcf2c11572af6f390246c056bc905eca609533a0"
7+
revision: "20f82749394e68bcfbbeee96bad384abaae09c13"
88
channel: "stable"
99

1010
project_type: package

example/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ migrate_working_dir/
2727
**/doc/api/
2828
**/ios/Flutter/.last_build_id
2929
.dart_tool/
30-
.flutter-plugins
3130
.flutter-plugins-dependencies
3231
.pub-cache/
3332
.pub/
3433
/build/
34+
/coverage/
3535

3636
# Symbolication related
3737
app.*.symbols

example/.metadata

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "fcf2c11572af6f390246c056bc905eca609533a0"
7+
revision: "20f82749394e68bcfbbeee96bad384abaae09c13"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
17-
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
16+
create_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
17+
base_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
1818
- platform: android
19-
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
20-
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
19+
create_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
20+
base_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
2121
- platform: ios
22-
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
23-
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
22+
create_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
23+
base_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
2424
- platform: linux
25-
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
26-
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
25+
create_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
26+
base_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
2727
- platform: macos
28-
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
29-
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
28+
create_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
29+
base_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
3030
- platform: web
31-
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
32-
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
31+
create_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
32+
base_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
3333
- platform: windows
34-
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
35-
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
34+
create_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
35+
base_revision: 20f82749394e68bcfbbeee96bad384abaae09c13
3636

3737
# User provided section
3838

example/android/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ allprojects {
55
}
66
}
77

8-
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
8+
val newBuildDir: Directory =
9+
rootProject.layout.buildDirectory
10+
.dir("../../build")
11+
.get()
912
rootProject.layout.buildDirectory.value(newBuildDir)
1013

1114
subprojects {

example/android/settings.gradle.kts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
pluginManagement {
2-
val flutterSdkPath = run {
3-
val properties = java.util.Properties()
4-
file("local.properties").inputStream().use { properties.load(it) }
5-
val flutterSdkPath = properties.getProperty("flutter.sdk")
6-
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
7-
flutterSdkPath
8-
}
2+
val flutterSdkPath =
3+
run {
4+
val properties = java.util.Properties()
5+
file("local.properties").inputStream().use { properties.load(it) }
6+
val flutterSdkPath = properties.getProperty("flutter.sdk")
7+
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
8+
flutterSdkPath
9+
}
910

1011
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1112

@@ -18,7 +19,7 @@ pluginManagement {
1819

1920
plugins {
2021
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.3" apply false
22+
id("com.android.application") version "8.9.1" apply false
2223
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
2324
}
2425

example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

example/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ EXTERNAL SOURCES:
5353
:path: ".symlinks/plugins/wakelock_plus/ios"
5454

5555
SPEC CHECKSUMS:
56-
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
56+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
5757
media_kit_video: f3b0d035d89def15cfbbcf7dc2ae278f201e2f83
5858
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
5959
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@
455455
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
456456
GCC_WARN_UNUSED_FUNCTION = YES;
457457
GCC_WARN_UNUSED_VARIABLE = YES;
458-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
458+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
459459
MTL_ENABLE_DEBUG_INFO = NO;
460460
SDKROOT = iphoneos;
461461
SUPPORTED_PLATFORMS = iphoneos;
@@ -584,7 +584,7 @@
584584
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
585585
GCC_WARN_UNUSED_FUNCTION = YES;
586586
GCC_WARN_UNUSED_VARIABLE = YES;
587-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
587+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
588588
MTL_ENABLE_DEBUG_INFO = YES;
589589
ONLY_ACTIVE_ARCH = YES;
590590
SDKROOT = iphoneos;
@@ -635,7 +635,7 @@
635635
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
636636
GCC_WARN_UNUSED_FUNCTION = YES;
637637
GCC_WARN_UNUSED_VARIABLE = YES;
638-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
638+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
639639
MTL_ENABLE_DEBUG_INFO = NO;
640640
SDKROOT = iphoneos;
641641
SUPPORTED_PLATFORMS = iphoneos;

example/linux/runner/my_application.cc

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ struct _MyApplication {
1414

1515
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
1616

17+
// Called when first Flutter frame received.
18+
static void first_frame_cb(MyApplication* self, FlView *view)
19+
{
20+
gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view)));
21+
}
22+
1723
// Implements GApplication::activate.
1824
static void my_application_activate(GApplication* application) {
1925
MyApplication* self = MY_APPLICATION(application);
@@ -48,15 +54,23 @@ static void my_application_activate(GApplication* application) {
4854
}
4955

5056
gtk_window_set_default_size(window, 1280, 720);
51-
gtk_widget_show(GTK_WIDGET(window));
5257

5358
g_autoptr(FlDartProject) project = fl_dart_project_new();
5459
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
5560

5661
FlView* view = fl_view_new(project);
62+
GdkRGBA background_color;
63+
// Background defaults to black, override it here if necessary, e.g. #00000000 for transparent.
64+
gdk_rgba_parse(&background_color, "#000000");
65+
fl_view_set_background_color(view, &background_color);
5766
gtk_widget_show(GTK_WIDGET(view));
5867
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
5968

69+
// Show the window when Flutter renders.
70+
// Requires the view to be realized so we can start rendering.
71+
g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), self);
72+
gtk_widget_realize(GTK_WIDGET(view));
73+
6074
fl_register_plugins(FL_PLUGIN_REGISTRY(view));
6175

6276
gtk_widget_grab_focus(GTK_WIDGET(view));

0 commit comments

Comments
 (0)