Skip to content

Commit 1c3960b

Browse files
authored
chore: update macos dep files (#44)
1 parent 6f41b1f commit 1c3960b

File tree

9 files changed

+217
-64
lines changed

9 files changed

+217
-64
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "ephemeral/Flutter-Generated.xcconfig"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "ephemeral/Flutter-Generated.xcconfig"

macos/Podfile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
platform :osx, '10.14'
2+
3+
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
4+
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
5+
6+
project 'Runner', {
7+
'Debug' => :debug,
8+
'Profile' => :release,
9+
'Release' => :release,
10+
}
11+
12+
def flutter_root
13+
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
14+
unless File.exist?(generated_xcode_build_settings_path)
15+
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
16+
end
17+
18+
File.foreach(generated_xcode_build_settings_path) do |line|
19+
matches = line.match(/FLUTTER_ROOT\=(.*)/)
20+
return matches[1].strip if matches
21+
end
22+
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
23+
end
24+
25+
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
26+
27+
flutter_macos_podfile_setup
28+
29+
target 'Runner' do
30+
use_frameworks!
31+
use_modular_headers!
32+
33+
flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
34+
end
35+
36+
post_install do |installer|
37+
installer.pods_project.targets.each do |target|
38+
flutter_additional_macos_build_settings(target)
39+
end
40+
end

macos/Podfile.lock

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
PODS:
2+
- desktop_drop (0.0.1):
3+
- FlutterMacOS
4+
- file_selector_macos (0.0.1):
5+
- FlutterMacOS
6+
- FlutterMacOS (1.0.0)
7+
- path_provider_macos (0.0.1):
8+
- FlutterMacOS
9+
- url_launcher_macos (0.0.1):
10+
- FlutterMacOS
11+
- window_size (0.0.2):
12+
- FlutterMacOS
13+
14+
DEPENDENCIES:
15+
- desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
16+
- file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
17+
- FlutterMacOS (from `Flutter/ephemeral`)
18+
- path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
19+
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
20+
- window_size (from `Flutter/ephemeral/.symlinks/plugins/window_size/macos`)
21+
22+
EXTERNAL SOURCES:
23+
desktop_drop:
24+
:path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
25+
file_selector_macos:
26+
:path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
27+
FlutterMacOS:
28+
:path: Flutter/ephemeral
29+
path_provider_macos:
30+
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
31+
url_launcher_macos:
32+
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
33+
window_size:
34+
:path: Flutter/ephemeral/.symlinks/plugins/window_size/macos
35+
36+
SPEC CHECKSUMS:
37+
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
38+
file_selector_macos: ff6dc948d4ddd34e8602a1f60b7d0b4cc6051a47
39+
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
40+
path_provider_macos: a0a3fd666cb7cd0448e936fb4abad4052961002b
41+
url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4
42+
window_size: 339dafa0b27a95a62a843042038fa6c3c48de195
43+
44+
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
45+
46+
COCOAPODS: 1.11.3

macos/Runner.xcodeproj/project.pbxproj

Lines changed: 67 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -26,6 +26,7 @@
2626
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2727
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2828
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
29+
B12AD46A2AD42B9654D64F79 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1563CA553584BA92FC8B45BF /* Pods_Runner.framework */; };
2930
/* End PBXBuildFile section */
3031

3132
/* Begin PBXContainerItemProxy section */
@@ -52,9 +53,11 @@
5253
/* End PBXCopyFilesBuildPhase section */
5354

5455
/* Begin PBXFileReference section */
56+
1563CA553584BA92FC8B45BF /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
57+
2F80AFCC8F9EEF441B2E77AE /* 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>"; };
5558
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
5659
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
57-
33CC10ED2044A3C60003C045 /* ccxgui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ccxgui.app"; sourceTree = BUILT_PRODUCTS_DIR; };
60+
33CC10ED2044A3C60003C045 /* ccxgui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ccxgui.app; sourceTree = BUILT_PRODUCTS_DIR; };
5861
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5962
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
6063
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -68,13 +71,16 @@
6871
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
6972
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
7073
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
74+
9BAC6A9EA3E4E2B0221143FB /* 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>"; };
75+
E2E3BE57FF385FDEAAD99990 /* 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>"; };
7176
/* End PBXFileReference section */
7277

7378
/* Begin PBXFrameworksBuildPhase section */
7479
33CC10EA2044A3C60003C045 /* Frameworks */ = {
7580
isa = PBXFrameworksBuildPhase;
7681
buildActionMask = 2147483647;
7782
files = (
83+
B12AD46A2AD42B9654D64F79 /* Pods_Runner.framework in Frameworks */,
7884
);
7985
runOnlyForDeploymentPostprocessing = 0;
8086
};
@@ -99,6 +105,7 @@
99105
33CEB47122A05771004F2AC0 /* Flutter */,
100106
33CC10EE2044A3C60003C045 /* Products */,
101107
D73912EC22F37F3D000D13A0 /* Frameworks */,
108+
ACAAED9EE30CD305EE1C20A8 /* Pods */,
102109
);
103110
sourceTree = "<group>";
104111
};
@@ -145,9 +152,21 @@
145152
path = Runner;
146153
sourceTree = "<group>";
147154
};
155+
ACAAED9EE30CD305EE1C20A8 /* Pods */ = {
156+
isa = PBXGroup;
157+
children = (
158+
E2E3BE57FF385FDEAAD99990 /* Pods-Runner.debug.xcconfig */,
159+
9BAC6A9EA3E4E2B0221143FB /* Pods-Runner.release.xcconfig */,
160+
2F80AFCC8F9EEF441B2E77AE /* Pods-Runner.profile.xcconfig */,
161+
);
162+
name = Pods;
163+
path = Pods;
164+
sourceTree = "<group>";
165+
};
148166
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
149167
isa = PBXGroup;
150168
children = (
169+
1563CA553584BA92FC8B45BF /* Pods_Runner.framework */,
151170
);
152171
name = Frameworks;
153172
sourceTree = "<group>";
@@ -159,11 +178,13 @@
159178
isa = PBXNativeTarget;
160179
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
161180
buildPhases = (
181+
285931949A73586B3076E5F6 /* [CP] Check Pods Manifest.lock */,
162182
33CC10E92044A3C60003C045 /* Sources */,
163183
33CC10EA2044A3C60003C045 /* Frameworks */,
164184
33CC10EB2044A3C60003C045 /* Resources */,
165185
33CC110E2044A8840003C045 /* Bundle Framework */,
166186
3399D490228B24CF009A79C7 /* ShellScript */,
187+
844E52177120566E7B15E1C8 /* [CP] Embed Pods Frameworks */,
167188
);
168189
buildRules = (
169190
);
@@ -182,7 +203,7 @@
182203
isa = PBXProject;
183204
attributes = {
184205
LastSwiftUpdateCheck = 0920;
185-
LastUpgradeCheck = 0930;
206+
LastUpgradeCheck = 1300;
186207
ORGANIZATIONNAME = "";
187208
TargetAttributes = {
188209
33CC10EC2044A3C60003C045 = {
@@ -233,8 +254,31 @@
233254
/* End PBXResourcesBuildPhase section */
234255

235256
/* Begin PBXShellScriptBuildPhase section */
257+
285931949A73586B3076E5F6 /* [CP] Check Pods Manifest.lock */ = {
258+
isa = PBXShellScriptBuildPhase;
259+
buildActionMask = 2147483647;
260+
files = (
261+
);
262+
inputFileListPaths = (
263+
);
264+
inputPaths = (
265+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
266+
"${PODS_ROOT}/Manifest.lock",
267+
);
268+
name = "[CP] Check Pods Manifest.lock";
269+
outputFileListPaths = (
270+
);
271+
outputPaths = (
272+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
273+
);
274+
runOnlyForDeploymentPostprocessing = 0;
275+
shellPath = /bin/sh;
276+
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";
277+
showEnvVarsInLog = 0;
278+
};
236279
3399D490228B24CF009A79C7 /* ShellScript */ = {
237280
isa = PBXShellScriptBuildPhase;
281+
alwaysOutOfDate = 1;
238282
buildActionMask = 2147483647;
239283
files = (
240284
);
@@ -270,6 +314,23 @@
270314
shellPath = /bin/sh;
271315
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
272316
};
317+
844E52177120566E7B15E1C8 /* [CP] Embed Pods Frameworks */ = {
318+
isa = PBXShellScriptBuildPhase;
319+
buildActionMask = 2147483647;
320+
files = (
321+
);
322+
inputFileListPaths = (
323+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
324+
);
325+
name = "[CP] Embed Pods Frameworks";
326+
outputFileListPaths = (
327+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
328+
);
329+
runOnlyForDeploymentPostprocessing = 0;
330+
shellPath = /bin/sh;
331+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
332+
showEnvVarsInLog = 0;
333+
};
273334
/* End PBXShellScriptBuildPhase section */
274335

275336
/* Begin PBXSourcesBuildPhase section */
@@ -344,7 +405,7 @@
344405
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
345406
GCC_WARN_UNUSED_FUNCTION = YES;
346407
GCC_WARN_UNUSED_VARIABLE = YES;
347-
MACOSX_DEPLOYMENT_TARGET = 10.11;
408+
MACOSX_DEPLOYMENT_TARGET = 10.14;
348409
MTL_ENABLE_DEBUG_INFO = NO;
349410
SDKROOT = macosx;
350411
SWIFT_COMPILATION_MODE = wholemodule;
@@ -423,7 +484,7 @@
423484
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
424485
GCC_WARN_UNUSED_FUNCTION = YES;
425486
GCC_WARN_UNUSED_VARIABLE = YES;
426-
MACOSX_DEPLOYMENT_TARGET = 10.11;
487+
MACOSX_DEPLOYMENT_TARGET = 10.14;
427488
MTL_ENABLE_DEBUG_INFO = YES;
428489
ONLY_ACTIVE_ARCH = YES;
429490
SDKROOT = macosx;
@@ -470,7 +531,7 @@
470531
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
471532
GCC_WARN_UNUSED_FUNCTION = YES;
472533
GCC_WARN_UNUSED_VARIABLE = YES;
473-
MACOSX_DEPLOYMENT_TARGET = 10.11;
534+
MACOSX_DEPLOYMENT_TARGET = 10.14;
474535
MTL_ENABLE_DEBUG_INFO = NO;
475536
SDKROOT = macosx;
476537
SWIFT_COMPILATION_MODE = wholemodule;

macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

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.

pubspec.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,13 +619,13 @@ packages:
619619
source: hosted
620620
version: "2.0.0"
621621
pedantic:
622-
dependency: transitive
622+
dependency: "direct main"
623623
description:
624624
name: pedantic
625-
sha256: "8f6460c77a98ad2807cd3b98c67096db4286f56166852d0ce5951bb600a63594"
625+
sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602"
626626
url: "https://pub.dev"
627627
source: hosted
628-
version: "1.11.0"
628+
version: "1.11.1"
629629
percent_indicator:
630630
dependency: "direct main"
631631
description:

0 commit comments

Comments
 (0)