Skip to content

Commit 3edb16e

Browse files
domesticmousedomesticmouse
committed
Merge branch 'main' of https://github.com/flutter/codelabs into Flutter-3.27-beta
2 parents 4031197 + eb40664 commit 3edb16e

File tree

53 files changed

+1064
-447
lines changed

Some content is hidden

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

53 files changed

+1064
-447
lines changed

‎audio_soloud/codelab_rebuild.yaml‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
flutter:
1919
sdk: flutter
2020

21-
+ flutter_soloud: ^2.0.0
21+
+ flutter_soloud: ^2.1.6
2222
+ logging: ^1.2.0
2323
+
2424
dev_dependencies:
@@ -37,6 +37,32 @@ steps:
3737
path: audio_soloud
3838
flutter: pub upgrade --major-versions
3939

40+
- name: Update iOS deployment target
41+
path: audio_soloud/ios/Podfile
42+
patch-u: |
43+
--- b/audio_soloud/ios/Podfile
44+
+++ a/audio_soloud/ios/Podfile
45+
@@ -1,5 +1,5 @@
46+
-# Uncomment this line to define a global platform for your project
47+
-# platform :ios, '12.0'
48+
+# SoLoud requires iOS 13.0 minimum, Flutter only requires 12.0
49+
+platform :ios, '13.0'
50+
51+
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
52+
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
53+
54+
- name: Update macOS deployment target
55+
path: audio_soloud/macos/Podfile
56+
patch-u: |
57+
--- b/audio_soloud/macos/Podfile
58+
+++ a/audio_soloud/macos/Podfile
59+
@@ -1,4 +1,4 @@
60+
-platform :osx, '10.14'
61+
+platform :osx, '10.15'
62+
63+
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
64+
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
65+
4066
- name: Create lib/audio directory
4167
mkdir: audio_soloud/lib/audio
4268

@@ -575,14 +601,14 @@ steps:
575601

576602
void applyFilter() {
577603
- // TODO
578-
+ _soloud!.addGlobalFilter(FilterType.freeverbFilter);
579-
+ _soloud!.setFilterParameter(FilterType.freeverbFilter, 0, 0.2);
580-
+ _soloud!.setFilterParameter(FilterType.freeverbFilter, 2, 0.9);
604+
+ _soloud!.filters.freeverbFilter.activate();
605+
+ _soloud!.filters.freeverbFilter.wet.value = 0.2;
606+
+ _soloud!.filters.freeverbFilter.roomSize.value = 0.9;
581607
}
582608

583609
void removeFilter() {
584610
- // TODO
585-
+ _soloud!.removeGlobalFilter(FilterType.freeverbFilter);
611+
+ _soloud!.filters.freeverbFilter.deactivate();
586612
}
587613
}
588614

‎audio_soloud/step_02/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

‎audio_soloud/step_02/android/settings.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
22-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
21+
id "com.android.application" version "8.1.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
2323
}
2424

2525
include ":app"

‎audio_soloud/step_02/ios/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
1+
# SoLoud requires iOS 13.0 minimum, Flutter only requires 12.0
2+
platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎audio_soloud/step_02/ios/Runner.xcodeproj/project.pbxproj‎

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

‎audio_soloud/step_02/macos/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.14'
1+
platform :osx, '10.15'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎audio_soloud/step_02/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2828
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2929
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
30+
76DFACCE4300C352F2EB8A62 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 664A09801CF281205EE995EF /* Pods_RunnerTests.framework */; };
31+
D6A89633325E62A7FD2FDB22 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA0530D4D5DE80DD5982D5C /* Pods_Runner.framework */; };
3032
/* End PBXBuildFile section */
3133

3234
/* Begin PBXContainerItemProxy section */
@@ -60,11 +62,12 @@
6062
/* End PBXCopyFilesBuildPhase section */
6163

6264
/* Begin PBXFileReference section */
65+
1D416ABD8F5A3399C6DA2EC7 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
6366
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6467
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6568
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
6669
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
67-
33CC10ED2044A3C60003C045 /* audio_soloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "audio_soloud.app"; sourceTree = BUILT_PRODUCTS_DIR; };
70+
33CC10ED2044A3C60003C045 /* audio_soloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = audio_soloud.app; sourceTree = BUILT_PRODUCTS_DIR; };
6871
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
6972
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
7073
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -76,22 +79,31 @@
7679
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
7780
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
7881
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
82+
592E16EE055DFACE2771A0F8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
83+
664A09801CF281205EE995EF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
84+
665D2332FAFD748F393CCDB5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
7985
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
86+
8EB66CFABA6B979CA5E1A44E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
8087
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
88+
C2575B69935ACB50284B89A2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
89+
DA93B1BE801C7281234DB717 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
90+
DDA0530D4D5DE80DD5982D5C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8191
/* End PBXFileReference section */
8292

8393
/* Begin PBXFrameworksBuildPhase section */
8494
331C80D2294CF70F00263BE5 /* Frameworks */ = {
8595
isa = PBXFrameworksBuildPhase;
8696
buildActionMask = 2147483647;
8797
files = (
98+
76DFACCE4300C352F2EB8A62 /* Pods_RunnerTests.framework in Frameworks */,
8899
);
89100
runOnlyForDeploymentPostprocessing = 0;
90101
};
91102
33CC10EA2044A3C60003C045 /* Frameworks */ = {
92103
isa = PBXFrameworksBuildPhase;
93104
buildActionMask = 2147483647;
94105
files = (
106+
D6A89633325E62A7FD2FDB22 /* Pods_Runner.framework in Frameworks */,
95107
);
96108
runOnlyForDeploymentPostprocessing = 0;
97109
};
@@ -125,6 +137,7 @@
125137
331C80D6294CF71000263BE5 /* RunnerTests */,
126138
33CC10EE2044A3C60003C045 /* Products */,
127139
D73912EC22F37F3D000D13A0 /* Frameworks */,
140+
C538B7F78DC03FEF6D876A67 /* Pods */,
128141
);
129142
sourceTree = "<group>";
130143
};
@@ -172,9 +185,25 @@
172185
path = Runner;
173186
sourceTree = "<group>";
174187
};
188+
C538B7F78DC03FEF6D876A67 /* Pods */ = {
189+
isa = PBXGroup;
190+
children = (
191+
C2575B69935ACB50284B89A2 /* Pods-Runner.debug.xcconfig */,
192+
592E16EE055DFACE2771A0F8 /* Pods-Runner.release.xcconfig */,
193+
DA93B1BE801C7281234DB717 /* Pods-Runner.profile.xcconfig */,
194+
8EB66CFABA6B979CA5E1A44E /* Pods-RunnerTests.debug.xcconfig */,
195+
665D2332FAFD748F393CCDB5 /* Pods-RunnerTests.release.xcconfig */,
196+
1D416ABD8F5A3399C6DA2EC7 /* Pods-RunnerTests.profile.xcconfig */,
197+
);
198+
name = Pods;
199+
path = Pods;
200+
sourceTree = "<group>";
201+
};
175202
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
176203
isa = PBXGroup;
177204
children = (
205+
DDA0530D4D5DE80DD5982D5C /* Pods_Runner.framework */,
206+
664A09801CF281205EE995EF /* Pods_RunnerTests.framework */,
178207
);
179208
name = Frameworks;
180209
sourceTree = "<group>";
@@ -186,6 +215,7 @@
186215
isa = PBXNativeTarget;
187216
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
188217
buildPhases = (
218+
D5A04ACAB1D2D44506ACBF95 /* [CP] Check Pods Manifest.lock */,
189219
331C80D1294CF70F00263BE5 /* Sources */,
190220
331C80D2294CF70F00263BE5 /* Frameworks */,
191221
331C80D3294CF70F00263BE5 /* Resources */,
@@ -204,11 +234,13 @@
204234
isa = PBXNativeTarget;
205235
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
206236
buildPhases = (
237+
E1EEAD5D6C44810CB56DE3D6 /* [CP] Check Pods Manifest.lock */,
207238
33CC10E92044A3C60003C045 /* Sources */,
208239
33CC10EA2044A3C60003C045 /* Frameworks */,
209240
33CC10EB2044A3C60003C045 /* Resources */,
210241
33CC110E2044A8840003C045 /* Bundle Framework */,
211242
3399D490228B24CF009A79C7 /* ShellScript */,
243+
AA9CAE603FE596B6C667AEC1 /* [CP] Embed Pods Frameworks */,
212244
);
213245
buildRules = (
214246
);
@@ -329,6 +361,67 @@
329361
shellPath = /bin/sh;
330362
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
331363
};
364+
AA9CAE603FE596B6C667AEC1 /* [CP] Embed Pods Frameworks */ = {
365+
isa = PBXShellScriptBuildPhase;
366+
buildActionMask = 2147483647;
367+
files = (
368+
);
369+
inputFileListPaths = (
370+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
371+
);
372+
name = "[CP] Embed Pods Frameworks";
373+
outputFileListPaths = (
374+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
375+
);
376+
runOnlyForDeploymentPostprocessing = 0;
377+
shellPath = /bin/sh;
378+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
379+
showEnvVarsInLog = 0;
380+
};
381+
D5A04ACAB1D2D44506ACBF95 /* [CP] Check Pods Manifest.lock */ = {
382+
isa = PBXShellScriptBuildPhase;
383+
buildActionMask = 2147483647;
384+
files = (
385+
);
386+
inputFileListPaths = (
387+
);
388+
inputPaths = (
389+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
390+
"${PODS_ROOT}/Manifest.lock",
391+
);
392+
name = "[CP] Check Pods Manifest.lock";
393+
outputFileListPaths = (
394+
);
395+
outputPaths = (
396+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
397+
);
398+
runOnlyForDeploymentPostprocessing = 0;
399+
shellPath = /bin/sh;
400+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
401+
showEnvVarsInLog = 0;
402+
};
403+
E1EEAD5D6C44810CB56DE3D6 /* [CP] Check Pods Manifest.lock */ = {
404+
isa = PBXShellScriptBuildPhase;
405+
buildActionMask = 2147483647;
406+
files = (
407+
);
408+
inputFileListPaths = (
409+
);
410+
inputPaths = (
411+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
412+
"${PODS_ROOT}/Manifest.lock",
413+
);
414+
name = "[CP] Check Pods Manifest.lock";
415+
outputFileListPaths = (
416+
);
417+
outputPaths = (
418+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
419+
);
420+
runOnlyForDeploymentPostprocessing = 0;
421+
shellPath = /bin/sh;
422+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
423+
showEnvVarsInLog = 0;
424+
};
332425
/* End PBXShellScriptBuildPhase section */
333426

334427
/* Begin PBXSourcesBuildPhase section */
@@ -380,6 +473,7 @@
380473
/* Begin XCBuildConfiguration section */
381474
331C80DB294CF71000263BE5 /* Debug */ = {
382475
isa = XCBuildConfiguration;
476+
baseConfigurationReference = 8EB66CFABA6B979CA5E1A44E /* Pods-RunnerTests.debug.xcconfig */;
383477
buildSettings = {
384478
BUNDLE_LOADER = "$(TEST_HOST)";
385479
CURRENT_PROJECT_VERSION = 1;
@@ -394,6 +488,7 @@
394488
};
395489
331C80DC294CF71000263BE5 /* Release */ = {
396490
isa = XCBuildConfiguration;
491+
baseConfigurationReference = 665D2332FAFD748F393CCDB5 /* Pods-RunnerTests.release.xcconfig */;
397492
buildSettings = {
398493
BUNDLE_LOADER = "$(TEST_HOST)";
399494
CURRENT_PROJECT_VERSION = 1;
@@ -408,6 +503,7 @@
408503
};
409504
331C80DD294CF71000263BE5 /* Profile */ = {
410505
isa = XCBuildConfiguration;
506+
baseConfigurationReference = 1D416ABD8F5A3399C6DA2EC7 /* Pods-RunnerTests.profile.xcconfig */;
411507
buildSettings = {
412508
BUNDLE_LOADER = "$(TEST_HOST)";
413509
CURRENT_PROJECT_VERSION = 1;

‎audio_soloud/step_02/macos/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎audio_soloud/step_02/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ dependencies:
1010
flutter:
1111
sdk: flutter
1212

13-
flutter_soloud: ^2.0.0
13+
flutter_soloud: ^2.1.6
1414
logging: ^1.2.0
1515

1616
dev_dependencies:
1717
flutter_test:
1818
sdk: flutter
19-
flutter_lints: ^4.0.0
19+
flutter_lints: ^5.0.0
2020

2121
flutter:
2222
uses-material-design: true

‎audio_soloud/step_03/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

0 commit comments

Comments
 (0)