Skip to content

Commit 18cd906

Browse files
domesticmousedomesticmouse
committed
Run codelab rebuild
1 parent 7b0fe46 commit 18cd906

File tree

105 files changed

+448
-376
lines changed

Some content is hidden

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

105 files changed

+448
-376
lines changed

‎intro_flutter_gpu/codelab_rebuild.yaml‎

Lines changed: 121 additions & 121 deletions
Large diffs are not rendered by default.

‎intro_flutter_gpu/step_01/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 {

‎intro_flutter_gpu/step_01/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

‎intro_flutter_gpu/step_01/hook/build.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:native_assets_cli/native_assets_cli.dart';
88
void main(List<String> args) async {
99
await build(args, (config, output) async {
1010
await buildShaderBundleJson(
11-
buildConfig: config,
11+
buildInput: config,
1212
buildOutput: output,
1313
manifestFileName: 'my_first_triangle.shaderbundle.json',
1414
);

‎intro_flutter_gpu/step_01/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>

‎intro_flutter_gpu/step_01/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
347347
GCC_WARN_UNUSED_FUNCTION = YES;
348348
GCC_WARN_UNUSED_VARIABLE = YES;
349-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
349+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
350350
MTL_ENABLE_DEBUG_INFO = NO;
351351
SDKROOT = iphoneos;
352352
SUPPORTED_PLATFORMS = iphoneos;
@@ -472,7 +472,7 @@
472472
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
473473
GCC_WARN_UNUSED_FUNCTION = YES;
474474
GCC_WARN_UNUSED_VARIABLE = YES;
475-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
475+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
476476
MTL_ENABLE_DEBUG_INFO = YES;
477477
ONLY_ACTIVE_ARCH = YES;
478478
SDKROOT = iphoneos;
@@ -523,7 +523,7 @@
523523
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
524524
GCC_WARN_UNUSED_FUNCTION = YES;
525525
GCC_WARN_UNUSED_VARIABLE = YES;
526-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
526+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
527527
MTL_ENABLE_DEBUG_INFO = NO;
528528
SDKROOT = iphoneos;
529529
SUPPORTED_PLATFORMS = iphoneos;

‎intro_flutter_gpu/step_01/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -54,6 +55,7 @@
5455
buildConfiguration = "Debug"
5556
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5657
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
5759
launchStyle = "0"
5860
useCustomWorkingDirectory = "NO"
5961
ignoresPersistentStateOnLaunch = "NO"

‎intro_flutter_gpu/step_01/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
462462
GCC_WARN_UNUSED_FUNCTION = YES;
463463
GCC_WARN_UNUSED_VARIABLE = YES;
464-
MACOSX_DEPLOYMENT_TARGET = 10.14;
464+
MACOSX_DEPLOYMENT_TARGET = 10.15;
465465
MTL_ENABLE_DEBUG_INFO = NO;
466466
SDKROOT = macosx;
467467
SWIFT_COMPILATION_MODE = wholemodule;
@@ -543,7 +543,7 @@
543543
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
544544
GCC_WARN_UNUSED_FUNCTION = YES;
545545
GCC_WARN_UNUSED_VARIABLE = YES;
546-
MACOSX_DEPLOYMENT_TARGET = 10.14;
546+
MACOSX_DEPLOYMENT_TARGET = 10.15;
547547
MTL_ENABLE_DEBUG_INFO = YES;
548548
ONLY_ACTIVE_ARCH = YES;
549549
SDKROOT = macosx;
@@ -593,7 +593,7 @@
593593
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
594594
GCC_WARN_UNUSED_FUNCTION = YES;
595595
GCC_WARN_UNUSED_VARIABLE = YES;
596-
MACOSX_DEPLOYMENT_TARGET = 10.14;
596+
MACOSX_DEPLOYMENT_TARGET = 10.15;
597597
MTL_ENABLE_DEBUG_INFO = NO;
598598
SDKROOT = macosx;
599599
SWIFT_COMPILATION_MODE = wholemodule;

‎intro_flutter_gpu/step_01/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.8.0-0
7+
sdk: ^3.9.0-0
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
1212
flutter_gpu:
1313
sdk: flutter
14-
flutter_gpu_shaders: ^0.2.0
15-
native_assets_cli: ^0.9.0
14+
flutter_gpu_shaders: ^0.3.0
15+
native_assets_cli: ^0.13.0
1616
vector_math: ^2.1.4
1717

1818
dev_dependencies:

‎intro_flutter_gpu/step_02/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 {

0 commit comments

Comments
 (0)