Skip to content

Commit a2ddae1

Browse files
peilinokpeilinok
authored
fix: compile issue of example with lower version of flutter (#2351)
1 parent c5e724b commit a2ddae1

File tree

82 files changed

+3023
-190
lines changed

Some content is hidden

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

82 files changed

+3023
-190
lines changed

‎.github/workflows/run_test.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,34 @@ jobs:
209209
name: iris-logs-macos-${{ matrix.version }}
210210
path: iris-logs-macos/*
211211

212+
integration_test_swiftpm:
213+
name: Run Flutter SwiftPM Integration Tests
214+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
215+
strategy:
216+
fail-fast: false
217+
matrix:
218+
os: ["macos", "ios"]
219+
runs-on: macos-latest
220+
timeout-minutes: 120
221+
steps:
222+
- uses: actions/checkout@v3
223+
- uses: subosito/flutter-action@v2
224+
with:
225+
channel: 'stable'
226+
cache: true
227+
- name: Run flutter integration test swiftpm for ${{ matrix.os }}
228+
if: ${{ matrix.os == 'macos' }}
229+
run: |
230+
flutter pub get
231+
flutter build ${{ matrix.os }}
232+
working-directory: test_shard/integration_test_swiftpm
233+
- name: Run flutter integration test swiftpm for ${{ matrix.os }}
234+
if: ${{ matrix.os == 'ios' }}
235+
run: |
236+
flutter pub get
237+
flutter build ${{ matrix.os }} --no-codesign
238+
working-directory: test_shard/integration_test_swiftpm
239+
212240
integration_test_windows:
213241
name: Run Flutter Windows Integration Tests
214242
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ third_party/
4747
test_shard/**/scripts/iris_web_version.js
4848
test_shard/**/web/iris_web_version.js
4949

50-
artifacts
50+
artifacts
51+
DerivedData

‎example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 18 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
71BBA3BA28AB50E2007B0DBC /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71BBA3B928AB50E2007B0DBC /* ReplayKit.framework */; };
1414
71BBA3BE28AB50E2007B0DBC /* SampleHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBA3BD28AB50E2007B0DBC /* SampleHandler.m */; };
1515
71BBA3C228AB50E2007B0DBC /* ScreenSharing.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 71BBA3B828AB50E2007B0DBC /* ScreenSharing.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
16-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1716
84969AB62B3ABD9500A81666 /* VideoRawDataController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84969AB52B3ABD9500A81666 /* VideoRawDataController.m */; };
1817
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1918
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
@@ -103,7 +102,6 @@
103102
isa = PBXFrameworksBuildPhase;
104103
buildActionMask = 2147483647;
105104
files = (
106-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
107105
9DA4854253E6947D845E2F5D /* Pods_Runner.framework in Frameworks */,
108106
);
109107
runOnlyForDeploymentPostprocessing = 0;
@@ -228,24 +226,21 @@
228226
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
229227
buildPhases = (
230228
7E1B0C30D51B77496A1AE2E1 /* [CP] Check Pods Manifest.lock */,
229+
39CD36047290E845D66DC420 /* [CP] Embed Pods Frameworks */,
231230
71BBA3C328AB50E2007B0DBC /* Embed App Extensions */,
232231
9740EEB61CF901F6004384FC /* Run Script */,
233232
97C146EA1CF9000F007C117D /* Sources */,
234233
97C146EB1CF9000F007C117D /* Frameworks */,
235234
97C146EC1CF9000F007C117D /* Resources */,
236235
9705A1C41CF9048500538489 /* Embed Frameworks */,
237236
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
238-
8E36E3602A499E91F7A0D9EC /* [CP] Embed Pods Frameworks */,
239237
);
240238
buildRules = (
241239
);
242240
dependencies = (
243241
71BBA3C128AB50E2007B0DBC /* PBXTargetDependency */,
244242
);
245243
name = Runner;
246-
packageProductDependencies = (
247-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
248-
);
249244
productName = Runner;
250245
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
251246
productType = "com.apple.product-type.application";
@@ -276,9 +271,6 @@
276271
Base,
277272
);
278273
mainGroup = 97C146E51CF9000F007C117D;
279-
packageReferences = (
280-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
281-
);
282274
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
283275
projectDirPath = "";
284276
projectRoot = "";
@@ -311,6 +303,23 @@
311303
/* End PBXResourcesBuildPhase section */
312304

313305
/* Begin PBXShellScriptBuildPhase section */
306+
39CD36047290E845D66DC420 /* [CP] Embed Pods Frameworks */ = {
307+
isa = PBXShellScriptBuildPhase;
308+
buildActionMask = 2147483647;
309+
files = (
310+
);
311+
inputFileListPaths = (
312+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
313+
);
314+
name = "[CP] Embed Pods Frameworks";
315+
outputFileListPaths = (
316+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
317+
);
318+
runOnlyForDeploymentPostprocessing = 0;
319+
shellPath = /bin/sh;
320+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
321+
showEnvVarsInLog = 0;
322+
};
314323
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
315324
isa = PBXShellScriptBuildPhase;
316325
alwaysOutOfDate = 1;
@@ -349,23 +358,6 @@
349358
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";
350359
showEnvVarsInLog = 0;
351360
};
352-
8E36E3602A499E91F7A0D9EC /* [CP] Embed Pods Frameworks */ = {
353-
isa = PBXShellScriptBuildPhase;
354-
buildActionMask = 2147483647;
355-
files = (
356-
);
357-
inputFileListPaths = (
358-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
359-
);
360-
name = "[CP] Embed Pods Frameworks";
361-
outputFileListPaths = (
362-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
363-
);
364-
runOnlyForDeploymentPostprocessing = 0;
365-
shellPath = /bin/sh;
366-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
367-
showEnvVarsInLog = 0;
368-
};
369361
9740EEB61CF901F6004384FC /* Run Script */ = {
370362
isa = PBXShellScriptBuildPhase;
371363
alwaysOutOfDate = 1;
@@ -833,20 +825,6 @@
833825
defaultConfigurationName = Release;
834826
};
835827
/* End XCConfigurationList section */
836-
837-
/* Begin XCLocalSwiftPackageReference section */
838-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
839-
isa = XCLocalSwiftPackageReference;
840-
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
841-
};
842-
/* End XCLocalSwiftPackageReference section */
843-
844-
/* Begin XCSwiftPackageProductDependency section */
845-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
846-
isa = XCSwiftPackageProductDependency;
847-
productName = FlutterGeneratedPluginSwiftPackage;
848-
};
849-
/* End XCSwiftPackageProductDependency section */
850828
};
851829
rootObject = 97C146E61CF9000F007C117D /* Project object */;
852830
}

‎example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,6 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8-
<PreActions>
9-
<ExecutionAction
10-
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11-
<ActionContent
12-
title = "Run Prepare Flutter Framework Script"
13-
scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
14-
<EnvironmentBuildable>
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
18-
BuildableName = "Runner.app"
19-
BlueprintName = "Runner"
20-
ReferencedContainer = "container:Runner.xcodeproj">
21-
</BuildableReference>
22-
</EnvironmentBuildable>
23-
</ActionContent>
24-
</ExecutionAction>
25-
</PreActions>
268
<BuildActionEntries>
279
<BuildActionEntry
2810
buildForTesting = "YES"
@@ -44,7 +26,6 @@
4426
buildConfiguration = "Debug"
4527
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4628
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47-
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4829
shouldUseLaunchSchemeArgsEnv = "YES">
4930
<MacroExpansion>
5031
<BuildableReference
@@ -62,13 +43,11 @@
6243
buildConfiguration = "Debug"
6344
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6445
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
65-
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
6646
launchStyle = "0"
6747
useCustomWorkingDirectory = "NO"
6848
ignoresPersistentStateOnLaunch = "NO"
6949
debugDocumentVersioning = "YES"
7050
debugServiceExtension = "internal"
71-
enableGPUValidationMode = "1"
7251
allowLocationSimulation = "YES">
7352
<BuildableProductRunnable
7453
runnableDebuggingMode = "0">

0 commit comments

Comments
 (0)