Skip to content

Commit 16dedba

Browse files
Calebh101Calebh101
committed
macOS stuff and small bug fix
1 parent 393af39 commit 16dedba

File tree

7 files changed

+195
-1
lines changed

7 files changed

+195
-1
lines changed

‎lib/main.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ void disengageAddons([String? id]) {
6767
}
6868

6969
Future<void> main() async {
70+
Logger.print("Starting Dictionaries...");
71+
WidgetsFlutterBinding.ensureInitialized();
72+
7073
if (kDebugMode) Logger.enable();
7174
if (kDebugMode) Logger.setVerbose(true);
7275

‎macos/Flutter/Flutter-Debug.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.debug.xcconfig"
12
#include "ephemeral/Flutter-Generated.xcconfig"

‎macos/Flutter/Flutter-Release.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: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
platform :osx, '10.15'
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+
32+
flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
33+
target 'RunnerTests' do
34+
inherit! :search_paths
35+
end
36+
end
37+
38+
post_install do |installer|
39+
installer.pods_project.targets.each do |target|
40+
flutter_additional_macos_build_settings(target)
41+
end
42+
end

‎macos/Podfile.lock‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
PODS:
2+
- file_picker (0.0.1):
3+
- FlutterMacOS
4+
- file_saver (0.0.1):
5+
- FlutterMacOS
6+
- FlutterMacOS (1.0.0)
7+
- path_provider_foundation (0.0.1):
8+
- Flutter
9+
- FlutterMacOS
10+
- shared_preferences_foundation (0.0.1):
11+
- Flutter
12+
- FlutterMacOS
13+
- url_launcher_macos (0.0.1):
14+
- FlutterMacOS
15+
16+
DEPENDENCIES:
17+
- file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
18+
- file_saver (from `Flutter/ephemeral/.symlinks/plugins/file_saver/macos`)
19+
- FlutterMacOS (from `Flutter/ephemeral`)
20+
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
21+
- shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
22+
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
23+
24+
EXTERNAL SOURCES:
25+
file_picker:
26+
:path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
27+
file_saver:
28+
:path: Flutter/ephemeral/.symlinks/plugins/file_saver/macos
29+
FlutterMacOS:
30+
:path: Flutter/ephemeral
31+
path_provider_foundation:
32+
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
33+
shared_preferences_foundation:
34+
:path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
35+
url_launcher_macos:
36+
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
37+
38+
SPEC CHECKSUMS:
39+
file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
40+
file_saver: e35bd97de451dde55ff8c38862ed7ad0f3418d0f
41+
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
42+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
43+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
44+
url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
45+
46+
PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009
47+
48+
COCOAPODS: 1.16.2

‎macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24+
0A327FCE42E3CE6D7AB2A824 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B87E9A440824E112E1DC0F61 /* Pods_RunnerTests.framework */; };
25+
12B1578551C907986B5C9A73 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E401A5BAFAA343FEE124DEA3 /* Pods_Runner.framework */; };
2426
331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
2527
335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
2628
33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
@@ -60,11 +62,12 @@
6062
/* End PBXCopyFilesBuildPhase section */
6163

6264
/* Begin PBXFileReference section */
65+
1CB8EA0BC23C1FDE2836DB84 /* 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>"; };
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 /* dictionaries.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dictionaries.app"; sourceTree = BUILT_PRODUCTS_DIR; };
70+
33CC10ED2044A3C60003C045 /* dictionaries.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dictionaries.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,28 +79,51 @@
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+
3D5ABEE31FA6F454B821B400 /* 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>"; };
83+
4496D17253C3FA4ED9E3C541 /* 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>"; };
7984
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8085
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
86+
9B11FCB1862CC075891064B9 /* 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>"; };
87+
A28865B147785F583C8C94E8 /* 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>"; };
88+
B87E9A440824E112E1DC0F61 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
89+
E401A5BAFAA343FEE124DEA3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
90+
F121CD6457B0E05A356C3880 /* 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>"; };
8191
/* End PBXFileReference section */
8292

8393
/* Begin PBXFrameworksBuildPhase section */
8494
331C80D2294CF70F00263BE5 /* Frameworks */ = {
8595
isa = PBXFrameworksBuildPhase;
8696
buildActionMask = 2147483647;
8797
files = (
98+
0A327FCE42E3CE6D7AB2A824 /* Pods_RunnerTests.framework in Frameworks */,
8899
);
89100
runOnlyForDeploymentPostprocessing = 0;
90101
};
91102
33CC10EA2044A3C60003C045 /* Frameworks */ = {
92103
isa = PBXFrameworksBuildPhase;
93104
buildActionMask = 2147483647;
94105
files = (
106+
12B1578551C907986B5C9A73 /* Pods_Runner.framework in Frameworks */,
95107
);
96108
runOnlyForDeploymentPostprocessing = 0;
97109
};
98110
/* End PBXFrameworksBuildPhase section */
99111

100112
/* Begin PBXGroup section */
113+
191FC37BB54DB0F1D68D50D8 /* Pods */ = {
114+
isa = PBXGroup;
115+
children = (
116+
3D5ABEE31FA6F454B821B400 /* Pods-Runner.debug.xcconfig */,
117+
A28865B147785F583C8C94E8 /* Pods-Runner.release.xcconfig */,
118+
1CB8EA0BC23C1FDE2836DB84 /* Pods-Runner.profile.xcconfig */,
119+
4496D17253C3FA4ED9E3C541 /* Pods-RunnerTests.debug.xcconfig */,
120+
9B11FCB1862CC075891064B9 /* Pods-RunnerTests.release.xcconfig */,
121+
F121CD6457B0E05A356C3880 /* Pods-RunnerTests.profile.xcconfig */,
122+
);
123+
name = Pods;
124+
path = Pods;
125+
sourceTree = "<group>";
126+
};
101127
331C80D6294CF71000263BE5 /* RunnerTests */ = {
102128
isa = PBXGroup;
103129
children = (
@@ -125,6 +151,7 @@
125151
331C80D6294CF71000263BE5 /* RunnerTests */,
126152
33CC10EE2044A3C60003C045 /* Products */,
127153
D73912EC22F37F3D000D13A0 /* Frameworks */,
154+
191FC37BB54DB0F1D68D50D8 /* Pods */,
128155
);
129156
sourceTree = "<group>";
130157
};
@@ -175,6 +202,8 @@
175202
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
176203
isa = PBXGroup;
177204
children = (
205+
E401A5BAFAA343FEE124DEA3 /* Pods_Runner.framework */,
206+
B87E9A440824E112E1DC0F61 /* 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+
1B7B36033D35CF25FAD1B1C7 /* [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+
70616092CCB0BBEEDB0A3990 /* [CP] Check Pods Manifest.lock */,
207238
33CC10E92044A3C60003C045 /* Sources */,
208239
33CC10EA2044A3C60003C045 /* Frameworks */,
209240
33CC10EB2044A3C60003C045 /* Resources */,
210241
33CC110E2044A8840003C045 /* Bundle Framework */,
211242
3399D490228B24CF009A79C7 /* ShellScript */,
243+
F142A4B15A7B185190A22BE0 /* [CP] Embed Pods Frameworks */,
212244
);
213245
buildRules = (
214246
);
@@ -291,6 +323,28 @@
291323
/* End PBXResourcesBuildPhase section */
292324

293325
/* Begin PBXShellScriptBuildPhase section */
326+
1B7B36033D35CF25FAD1B1C7 /* [CP] Check Pods Manifest.lock */ = {
327+
isa = PBXShellScriptBuildPhase;
328+
buildActionMask = 2147483647;
329+
files = (
330+
);
331+
inputFileListPaths = (
332+
);
333+
inputPaths = (
334+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
335+
"${PODS_ROOT}/Manifest.lock",
336+
);
337+
name = "[CP] Check Pods Manifest.lock";
338+
outputFileListPaths = (
339+
);
340+
outputPaths = (
341+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
342+
);
343+
runOnlyForDeploymentPostprocessing = 0;
344+
shellPath = /bin/sh;
345+
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";
346+
showEnvVarsInLog = 0;
347+
};
294348
3399D490228B24CF009A79C7 /* ShellScript */ = {
295349
isa = PBXShellScriptBuildPhase;
296350
alwaysOutOfDate = 1;
@@ -329,6 +383,45 @@
329383
shellPath = /bin/sh;
330384
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
331385
};
386+
70616092CCB0BBEEDB0A3990 /* [CP] Check Pods Manifest.lock */ = {
387+
isa = PBXShellScriptBuildPhase;
388+
buildActionMask = 2147483647;
389+
files = (
390+
);
391+
inputFileListPaths = (
392+
);
393+
inputPaths = (
394+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
395+
"${PODS_ROOT}/Manifest.lock",
396+
);
397+
name = "[CP] Check Pods Manifest.lock";
398+
outputFileListPaths = (
399+
);
400+
outputPaths = (
401+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
402+
);
403+
runOnlyForDeploymentPostprocessing = 0;
404+
shellPath = /bin/sh;
405+
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";
406+
showEnvVarsInLog = 0;
407+
};
408+
F142A4B15A7B185190A22BE0 /* [CP] Embed Pods Frameworks */ = {
409+
isa = PBXShellScriptBuildPhase;
410+
buildActionMask = 2147483647;
411+
files = (
412+
);
413+
inputFileListPaths = (
414+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
415+
);
416+
name = "[CP] Embed Pods Frameworks";
417+
outputFileListPaths = (
418+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
419+
);
420+
runOnlyForDeploymentPostprocessing = 0;
421+
shellPath = /bin/sh;
422+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\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 = 4496D17253C3FA4ED9E3C541 /* 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 = 9B11FCB1862CC075891064B9 /* 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 = F121CD6457B0E05A356C3880 /* Pods-RunnerTests.profile.xcconfig */;
411507
buildSettings = {
412508
BUNDLE_LOADER = "$(TEST_HOST)";
413509
CURRENT_PROJECT_VERSION = 1;

‎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.

0 commit comments

Comments
 (0)