Skip to content

Commit 5867b3b

Browse files
authored
Merge pull request #4 from mouEsam/feature/ios_support
Feature/macOS support
2 parents 3e0233d + a2955a5 commit 5867b3b

File tree

19 files changed

+162
-375
lines changed

19 files changed

+162
-375
lines changed

example/macos/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
1515

1616
SPEC CHECKSUMS:
1717
FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
18-
metadata_god: 8dc3b9dd92707c611e86d65aad262b5c90c03280
18+
metadata_god: 55a71136c95eb75ec28142f6fbfc2bcff6f881b1
1919

2020
PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
2121

example/pubspec.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ packages:
188188
name: source_span
189189
url: "https://pub.dartlang.org"
190190
source: hosted
191-
version: "1.9.0"
191+
version: "1.9.1"
192192
stack_trace:
193193
dependency: transitive
194194
description:
@@ -202,7 +202,7 @@ packages:
202202
name: stream_channel
203203
url: "https://pub.dartlang.org"
204204
source: hosted
205-
version: "2.1.0"
205+
version: "2.1.1"
206206
string_scanner:
207207
dependency: transitive
208208
description:
@@ -223,14 +223,14 @@ packages:
223223
name: test_api
224224
url: "https://pub.dartlang.org"
225225
source: hosted
226-
version: "0.4.12"
226+
version: "0.4.14"
227227
vector_math:
228228
dependency: transitive
229229
description:
230230
name: vector_math
231231
url: "https://pub.dartlang.org"
232232
source: hosted
233-
version: "2.1.2"
233+
version: "2.1.4"
234234
sdks:
235235
dart: ">=2.18.0 <3.0.0"
236236
flutter: ">=2.8.0"

frameworks/rust_crate/rust_crate.xcodeproj/project.pbxproj

+21-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
/* Begin PBXBuildFile section */
1010
D43D164F2840F6E9007C0039 /* rust_crate.h in Headers */ = {isa = PBXBuildFile; fileRef = D43D164E2840F6E9007C0039 /* rust_crate.h */; settings = {ATTRIBUTES = (Public, ); }; };
1111
D43D166F2840FAF3007C0039 /* bridge_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = D43D166E2840FAF3007C0039 /* bridge_generated.h */; settings = {ATTRIBUTES = (Public, ); }; };
12-
D43D167D284106FE007C0039 /* librust_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D43D1676284106CF007C0039 /* librust_static.a */; platformFilter = ios; };
13-
D43D167E284106FE007C0039 /* rust.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D43D1678284106CF007C0039 /* rust.dylib */; platformFilters = (macos, ); };
12+
D43D167D284106FE007C0039 /* librust_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D43D1676284106CF007C0039 /* librust_static.a */; };
13+
D43D167E284106FE007C0039 /* rust.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D43D1678284106CF007C0039 /* rust.dylib */; platformFilters = (maccatalyst, macos, ); };
14+
D443D03028E1FB3B00621650 /* rust.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = D43D1678284106CF007C0039 /* rust.dylib */; platformFilters = (maccatalyst, macos, ); };
1415
/* End PBXBuildFile section */
1516

1617
/* Begin PBXContainerItemProxy section */
@@ -44,6 +45,20 @@
4445
};
4546
/* End PBXContainerItemProxy section */
4647

48+
/* Begin PBXCopyFilesBuildPhase section */
49+
D443D03128E1FB3B00621650 /* Embed Libraries */ = {
50+
isa = PBXCopyFilesBuildPhase;
51+
buildActionMask = 2147483647;
52+
dstPath = "";
53+
dstSubfolderSpec = 10;
54+
files = (
55+
D443D03028E1FB3B00621650 /* rust.dylib in Embed Libraries */,
56+
);
57+
name = "Embed Libraries";
58+
runOnlyForDeploymentPostprocessing = 0;
59+
};
60+
/* End PBXCopyFilesBuildPhase section */
61+
4762
/* Begin PBXFileReference section */
4863
D43D164B2840F6E9007C0039 /* rust_crate.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = rust_crate.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4964
D43D164E2840F6E9007C0039 /* rust_crate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rust_crate.h; sourceTree = "<group>"; };
@@ -130,6 +145,7 @@
130145
D43D16472840F6E9007C0039 /* Sources */,
131146
D43D16482840F6E9007C0039 /* Frameworks */,
132147
D43D16492840F6E9007C0039 /* Resources */,
148+
D443D03128E1FB3B00621650 /* Embed Libraries */,
133149
);
134150
buildRules = (
135151
);
@@ -371,13 +387,15 @@
371387
GENERATE_INFOPLIST_FILE = YES;
372388
INFOPLIST_KEY_NSHumanReadableCopyright = "";
373389
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
390+
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
374391
LD_RUNPATH_SEARCH_PATHS = (
375392
"$(inherited)",
376393
"@executable_path/Frameworks",
377394
"@loader_path/Frameworks",
378395
"@executable_path/../Frameworks",
379396
"@loader_path/../Frameworks",
380397
);
398+
MACOSX_DEPLOYMENT_TARGET = 11.0;
381399
MARKETING_VERSION = 1.0;
382400
PRODUCT_BUNDLE_IDENTIFIER = "com.kortobaa.rust-crate";
383401
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -410,6 +428,7 @@
410428
"@executable_path/../Frameworks",
411429
"@loader_path/../Frameworks",
412430
);
431+
MACOSX_DEPLOYMENT_TARGET = 11.0;
413432
MARKETING_VERSION = 1.0;
414433
PRODUCT_BUNDLE_IDENTIFIER = "com.kortobaa.rust-crate";
415434
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

macos/Frameworks/rust_crate.framework/Headers

-1
This file was deleted.

macos/Frameworks/rust_crate.framework/Modules

-1
This file was deleted.

macos/Frameworks/rust_crate.framework/Resources

-1
This file was deleted.

macos/Frameworks/rust_crate.framework/Versions/A/Headers/bridge_generated.h

-82
This file was deleted.

macos/Frameworks/rust_crate.framework/Versions/A/Headers/rust_crate.h

-19
This file was deleted.

macos/Frameworks/rust_crate.framework/Versions/A/Modules/module.modulemap

-6
This file was deleted.

macos/Frameworks/rust_crate.framework/Versions/A/Resources/Info.plist

-48
This file was deleted.

0 commit comments

Comments
 (0)