Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dart 3.7 reformat #2257

Open
wants to merge 107 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
c995981
Update `adaptive_app`
domesticmouse Oct 14, 2024
b416447
Update `animated-responsive-layout`
domesticmouse Oct 14, 2024
5d4d668
Update `animations`
domesticmouse Oct 14, 2024
cbad6d5
Update `boring_to_beautiful`
domesticmouse Oct 14, 2024
980fa08
Update `brick_breaker`
domesticmouse Oct 14, 2024
4f36c6b
Update `dart-patterns-and-records`
domesticmouse Oct 14, 2024
2d1ce1e
Update `ffigen_codelab`
domesticmouse Oct 14, 2024
10a2a75
Update `firebase-emulator-suite`
domesticmouse Oct 14, 2024
30465fc
Update `firebase-get-to-know-flutter`
domesticmouse Oct 15, 2024
0f63b37
Update `forge2d_game`
domesticmouse Oct 15, 2024
7923abc
Update `generate_crossword`
domesticmouse Oct 15, 2024
877023e
Re-enable CI for `next-gen-ui`
domesticmouse Oct 15, 2024
48c57a9
version bump the tool
domesticmouse Oct 15, 2024
66f79de
Update `firebase-auth-flutterfire-ui`
domesticmouse Oct 17, 2024
dea6e8e
Make `adaptive_app` match flutter beta
domesticmouse Oct 17, 2024
d9e7cd1
Update `animated-responsive-layout` for flutter beta
domesticmouse Oct 17, 2024
63f34c4
Update `animations` for flutter beta
domesticmouse Oct 17, 2024
a1e95b8
Update `boring_to_beautiful` for flutter beta
domesticmouse Oct 17, 2024
adbf0f6
Update `brick_breaker` for flutter beta
domesticmouse Oct 17, 2024
8b215ca
Update `dart-patterns-and-records` for flutter beta
domesticmouse Oct 17, 2024
81a5fb8
Update `ffigen_codelab` for flutter beta
domesticmouse Oct 18, 2024
d470224
Update `firebase-emulator-suite` for flutter beta
domesticmouse Oct 18, 2024
cfa0d5a
Update `firebase-get-to-know-flutter` for flutter beta
domesticmouse Oct 18, 2024
4731ae8
Update `forge2d_game` for flutter beta
domesticmouse Oct 18, 2024
b581095
Update `generate_crossword` for flutter beta
domesticmouse Oct 18, 2024
5d52fd2
Update `github-client` for flutter beta
domesticmouse Oct 18, 2024
35003c6
Update `google-maps-in-flutter` for flutter beta
domesticmouse Oct 18, 2024
3180040
Update `namer` for flutter beta
domesticmouse Oct 18, 2024
4031197
Update `next-gen-ui` for flutter beta
domesticmouse Oct 18, 2024
3edb16e
Merge branch 'main' of https://github.com/flutter/codelabs into Flutt…
domesticmouse Oct 18, 2024
b01df2b
Update `audio_soloud` for flutter beta
domesticmouse Oct 18, 2024
3efe5e1
Update `testing_codelab` for flutter beta
domesticmouse Oct 18, 2024
4f07ad3
Update `webview_flutter` for flutter beta
domesticmouse Oct 18, 2024
062f539
Merge branch 'main' into Flutter-3.27-beta
domesticmouse Oct 24, 2024
0ac9f8a
Merge branch 'main' into Flutter-3.27-beta
domesticmouse Oct 25, 2024
610f301
Update `generate_crossword` after `riverpod` fix
domesticmouse Oct 25, 2024
38bbc9a
Merge branch 'flutter:main' into Flutter-3.27-beta
domesticmouse Nov 5, 2024
28a1794
Update `adaptive_app`
domesticmouse Nov 12, 2024
c19e03b
Update `animated-responsive-layout`
domesticmouse Nov 12, 2024
f98624c
Update `animations`
domesticmouse Nov 12, 2024
0a4c510
Update `audio_soloud`
domesticmouse Nov 12, 2024
e9a0544
Update `boring_to_beautiful`
domesticmouse Nov 12, 2024
c73b25e
Update `brick_breaker`
domesticmouse Nov 12, 2024
2d8fc45
Update `dart-patterns-and-records`
domesticmouse Nov 12, 2024
f64e3aa
Update `ffigen_codelab`
domesticmouse Nov 12, 2024
b549277
Update `firebase-emulator-suite`
domesticmouse Nov 12, 2024
d07e8f6
Update `firebase-get-to-know-flutter`
domesticmouse Nov 12, 2024
5907f39
Update `forge2d_game`
domesticmouse Nov 12, 2024
8e1490e
Update `firebase-auth-flutterfire-ui`
domesticmouse Nov 13, 2024
21723d3
Update `generate_crossword`
domesticmouse Nov 13, 2024
da1c25e
Update `github_client`
domesticmouse Nov 13, 2024
7ad49f6
Update `google-maps-in-flutter`
domesticmouse Nov 13, 2024
c561936
Update `namer`
domesticmouse Nov 13, 2024
862d682
Update `next-gen-ui`
domesticmouse Nov 13, 2024
aebc206
Update `testing_codelab`
domesticmouse Nov 13, 2024
9b7f559
Update `webview_flutter`
domesticmouse Nov 13, 2024
47e6cfc
Version bump and format
domesticmouse Nov 13, 2024
c913cc4
Update `adaptive_app`
domesticmouse Nov 13, 2024
d3104b4
Update `animated-responsive-layout`
domesticmouse Nov 13, 2024
be541f7
Merge branch 'main' of https://github.com/flutter/codelabs into Flutt…
domesticmouse Nov 13, 2024
54ce1c8
Update `animations`
domesticmouse Nov 13, 2024
9c76ea1
Merge branch 'main' of https://github.com/flutter/codelabs into Dart-…
domesticmouse Nov 14, 2024
84f59b0
Dart format
domesticmouse Nov 14, 2024
347930e
Update `animations`
domesticmouse Nov 14, 2024
7fa189a
Breaking up Step 5
domesticmouse Nov 14, 2024
f4bb71f
Merge branch 'breaking-up-step-5' of https://github.com/domesticmouse…
domesticmouse Nov 14, 2024
3cb135b
Brea up step 5 of `animations`
domesticmouse Nov 14, 2024
54f171a
Fixup step 5 of `animations`
domesticmouse Nov 14, 2024
fa4deba
Merge branch 'breaking-up-step-5' of https://github.com/domesticmouse…
domesticmouse Nov 14, 2024
4ea91ee
wip
domesticmouse Nov 14, 2024
9333bf2
Fixed up WIP
domesticmouse Nov 14, 2024
e85b6cc
Update `audio_soloud`
domesticmouse Nov 14, 2024
19c4ad4
Update rebuild script for `audio_soloud `
domesticmouse Nov 14, 2024
6a60e43
Updating `boring_to_beautiful`, part 1
domesticmouse Nov 14, 2024
86cef14
Update `boring_to_beautiful`, part 2
domesticmouse Nov 15, 2024
6e7ec67
Merge branch 'main' of https://github.com/domesticmouse/codelabs into…
domesticmouse Nov 15, 2024
4026205
Update `brick_breaker` part 1
domesticmouse Nov 15, 2024
4337448
Update `brick_breaker` part 2
domesticmouse Nov 15, 2024
4c55db4
Update `dart-patterns-and-records`, part 1
domesticmouse Nov 15, 2024
b8a3831
Update `dart-patterns-and-records`, part 2
domesticmouse Nov 15, 2024
f669208
Update `firebase-auth-flutterfire-ui`
domesticmouse Nov 15, 2024
16b50c2
Update `ffigen_codelab`
domesticmouse Nov 15, 2024
0b9aa6e
Update `firebase-emulator-suite`
domesticmouse Nov 15, 2024
08b8968
Update `firebase-get-to-know-flutter`, part 1
domesticmouse Nov 15, 2024
ff5b2e1
Update `firebase-get-to-know-flutter`, part 2
domesticmouse Nov 15, 2024
f9bbe85
Update `forge2d_game`
domesticmouse Nov 15, 2024
6de3e64
Update `generate_crossword`
domesticmouse Nov 17, 2024
eb32694
Update `adaptive_app`
domesticmouse Nov 17, 2024
d18508e
Update `brick_breaker`
domesticmouse Nov 18, 2024
7ae08af
Update github-client
domesticmouse Nov 18, 2024
5b6131e
Update `google-maps-in-flutter`
domesticmouse Nov 18, 2024
aad5e8d
Update `namer`
domesticmouse Nov 18, 2024
0bbc246
Update `next-gen-ui`
domesticmouse Nov 18, 2024
513a05e
Update `testing_codelab`
domesticmouse Nov 19, 2024
fda1e5e
Fixup `generate_crossword`
domesticmouse Nov 19, 2024
7e77da7
Update `webview_flutter`
domesticmouse Nov 19, 2024
58f74e9
Merge branch 'main' of https://github.com/flutter/codelabs into Flutt…
domesticmouse Nov 26, 2024
c6d7f96
Merge branch 'main' of https://github.com/flutter/codelabs into Dart-…
domesticmouse Nov 26, 2024
81e7670
Merge branch 'Flutter-3.27-beta' of https://github.com/domesticmouse/…
domesticmouse Nov 26, 2024
4de7141
Merge branch 'main' of https://github.com/flutter/codelabs into Dart-…
domesticmouse Dec 3, 2024
df74eee
Merge branch 'flutter:main' into Dart-3.7-reformat
domesticmouse Dec 4, 2024
33450de
Merge branch 'flutter:main' into Dart-3.7-reformat
domesticmouse Dec 10, 2024
5c133a8
Merge branch 'main' of https://github.com/flutter/codelabs into Dart-…
domesticmouse Dec 10, 2024
b6e1e4c
Merge branch 'main' of https://github.com/flutter/codelabs into Dart-…
domesticmouse Dec 12, 2024
1b1130b
Merge branch 'main' into Dart-3.7-reformat
domesticmouse Dec 19, 2024
12b11a8
Merge branch 'main' into Dart-3.7-reformat
domesticmouse Dec 19, 2024
ce630cf
Merge branch 'flutter:main' into Dart-3.7-reformat
domesticmouse Dec 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
464 changes: 219 additions & 245 deletions adaptive_app/codelab_rebuild.yaml

Large diffs are not rendered by default.

44 changes: 0 additions & 44 deletions adaptive_app/step_03/android/app/build.gradle

This file was deleted.

44 changes: 44 additions & 0 deletions adaptive_app/step_03/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
plugins {
id("com.android.application")
id("kotlin-android")
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}

android {
namespace = "com.example.adaptive_app"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.example.adaptive_app"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
}
}
}

flutter {
source = "../.."
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package com.example.adaptive_app

import io.flutter.embedding.android.FlutterActivity

class MainActivity: FlutterActivity()
class MainActivity : FlutterActivity()
18 changes: 0 additions & 18 deletions adaptive_app/step_03/android/build.gradle

This file was deleted.

21 changes: 21 additions & 0 deletions adaptive_app/step_03/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
allprojects {
repositories {
google()
mavenCentral()
}
}

val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
rootProject.layout.buildDirectory.value(newBuildDir)

subprojects {
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
project.layout.buildDirectory.value(newSubprojectBuildDir)
}
subprojects {
project.evaluationDependsOn(":app")
}

tasks.register<Delete>("clean") {
delete(rootProject.layout.buildDirectory)
}
2 changes: 1 addition & 1 deletion adaptive_app/step_03/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
25 changes: 0 additions & 25 deletions adaptive_app/step_03/android/settings.gradle

This file was deleted.

25 changes: 25 additions & 0 deletions adaptive_app/step_03/android/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
pluginManagement {
val flutterSdkPath = run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}

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

repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.0" apply false
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
}

include(":app")
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
12 changes: 7 additions & 5 deletions adaptive_app/step_03/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ class ResizeablePage extends StatelessWidget {
_fillTableRow(
context: context,
property: 'Window Size',
value: '${mediaQuery.size.width.toStringAsFixed(1)} x '
value:
'${mediaQuery.size.width.toStringAsFixed(1)} x '
'${mediaQuery.size.height.toStringAsFixed(1)}',
),
_fillTableRow(
Expand All @@ -78,10 +79,11 @@ class ResizeablePage extends StatelessWidget {
);
}

TableRow _fillTableRow(
{required BuildContext context,
required String property,
required String value}) {
TableRow _fillTableRow({
required BuildContext context,
required String property,
required String value,
}) {
return TableRow(
children: [
TableCell(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
2 changes: 1 addition & 1 deletion adaptive_app/step_03/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ^3.6.0-0
sdk: ^3.7.0-0

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down
44 changes: 0 additions & 44 deletions adaptive_app/step_04/android/app/build.gradle

This file was deleted.

44 changes: 44 additions & 0 deletions adaptive_app/step_04/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
plugins {
id("com.android.application")
id("kotlin-android")
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}

android {
namespace = "com.example.adaptive_app"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.example.adaptive_app"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
}
}
}

flutter {
source = "../.."
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package com.example.adaptive_app

import io.flutter.embedding.android.FlutterActivity

class MainActivity: FlutterActivity()
class MainActivity : FlutterActivity()
18 changes: 0 additions & 18 deletions adaptive_app/step_04/android/build.gradle

This file was deleted.

21 changes: 21 additions & 0 deletions adaptive_app/step_04/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
allprojects {
repositories {
google()
mavenCentral()
}
}

val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
rootProject.layout.buildDirectory.value(newBuildDir)

subprojects {
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
project.layout.buildDirectory.value(newSubprojectBuildDir)
}
subprojects {
project.evaluationDependsOn(":app")
}

tasks.register<Delete>("clean") {
delete(rootProject.layout.buildDirectory)
}
2 changes: 1 addition & 1 deletion adaptive_app/step_04/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
Loading
Loading