Skip to content

Commit 3ab0ee7

Browse files
jersonjerson
committed
add space escape for ios cocoapods
1 parent acdbfc5 commit 3ab0ee7

File tree

11 files changed

+37
-45
lines changed

11 files changed

+37
-45
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 3.0.1
2+
3+
- Fixed path import with spaces in cocoapods for ios
14
## 3.0.0
25

36
- First version with flatbuffers, smaller binaries, please take a look

‎example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

‎example/ios/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
1414
:path: ".symlinks/plugins/openpgp/ios"
1515

1616
SPEC CHECKSUMS:
17-
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
18-
openpgp: ade51f414e2978b7d956a7da953832c6203d5625
17+
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
18+
openpgp: 8925c86ba4a2663e345e3e6e133d8c4e6f6754a3
1919

2020
PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d
2121

22-
COCOAPODS: 1.8.3
22+
COCOAPODS: 1.11.2

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
97C146EC1CF9000F007C117D /* Resources */,
143143
9705A1C41CF9048500538489 /* Embed Frameworks */,
144144
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
145-
8934F5BE2C88ED262CEAAF29 /* [CP] Embed Pods Frameworks */,
146145
);
147146
buildRules = (
148147
);
@@ -237,23 +236,6 @@
237236
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";
238237
showEnvVarsInLog = 0;
239238
};
240-
8934F5BE2C88ED262CEAAF29 /* [CP] Embed Pods Frameworks */ = {
241-
isa = PBXShellScriptBuildPhase;
242-
buildActionMask = 2147483647;
243-
files = (
244-
);
245-
inputFileListPaths = (
246-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
247-
);
248-
name = "[CP] Embed Pods Frameworks";
249-
outputFileListPaths = (
250-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
251-
);
252-
runOnlyForDeploymentPostprocessing = 0;
253-
shellPath = /bin/sh;
254-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
255-
showEnvVarsInLog = 0;
256-
};
257239
9740EEB61CF901F6004384FC /* Run Script */ = {
258240
isa = PBXShellScriptBuildPhase;
259241
buildActionMask = 2147483647;
@@ -343,7 +325,7 @@
343325
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
344326
GCC_WARN_UNUSED_FUNCTION = YES;
345327
GCC_WARN_UNUSED_VARIABLE = YES;
346-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
328+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
347329
MTL_ENABLE_DEBUG_INFO = NO;
348330
SDKROOT = iphoneos;
349331
SUPPORTED_PLATFORMS = iphoneos;
@@ -428,7 +410,7 @@
428410
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
429411
GCC_WARN_UNUSED_FUNCTION = YES;
430412
GCC_WARN_UNUSED_VARIABLE = YES;
431-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
413+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
432414
MTL_ENABLE_DEBUG_INFO = YES;
433415
ONLY_ACTIVE_ARCH = YES;
434416
SDKROOT = iphoneos;
@@ -477,7 +459,7 @@
477459
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
478460
GCC_WARN_UNUSED_FUNCTION = YES;
479461
GCC_WARN_UNUSED_VARIABLE = YES;
480-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
462+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
481463
MTL_ENABLE_DEBUG_INFO = NO;
482464
SDKROOT = iphoneos;
483465
SUPPORTED_PLATFORMS = iphoneos;

‎example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/pubspec.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ packages:
3535
name: async
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "2.7.0"
38+
version: "2.8.1"
3939
boolean_selector:
4040
dependency: transitive
4141
description:
@@ -56,7 +56,7 @@ packages:
5656
name: charcode
5757
url: "https://pub.dartlang.org"
5858
source: hosted
59-
version: "1.2.0"
59+
version: "1.3.1"
6060
cli_util:
6161
dependency: transitive
6262
description:
@@ -91,7 +91,7 @@ packages:
9191
name: coverage
9292
url: "https://pub.dartlang.org"
9393
source: hosted
94-
version: "1.0.2"
94+
version: "1.0.3"
9595
crypto:
9696
dependency: transitive
9797
description:
@@ -126,7 +126,7 @@ packages:
126126
name: file
127127
url: "https://pub.dartlang.org"
128128
source: hosted
129-
version: "6.1.1"
129+
version: "6.1.2"
130130
flutter:
131131
dependency: "direct main"
132132
description: flutter
@@ -214,7 +214,7 @@ packages:
214214
name: meta
215215
url: "https://pub.dartlang.org"
216216
source: hosted
217-
version: "1.4.0"
217+
version: "1.7.0"
218218
mime:
219219
dependency: transitive
220220
description:
@@ -235,7 +235,7 @@ packages:
235235
path: ".."
236236
relative: true
237237
source: path
238-
version: "3.0.0"
238+
version: "3.0.1"
239239
package_config:
240240
dependency: transitive
241241
description:
@@ -277,7 +277,7 @@ packages:
277277
name: process
278278
url: "https://pub.dartlang.org"
279279
source: hosted
280-
version: "4.2.1"
280+
version: "4.2.3"
281281
pub_semver:
282282
dependency: transitive
283283
description:
@@ -380,21 +380,21 @@ packages:
380380
name: test
381381
url: "https://pub.dartlang.org"
382382
source: hosted
383-
version: "1.17.5"
383+
version: "1.17.10"
384384
test_api:
385385
dependency: transitive
386386
description:
387387
name: test_api
388388
url: "https://pub.dartlang.org"
389389
source: hosted
390-
version: "0.4.0"
390+
version: "0.4.2"
391391
test_core:
392392
dependency: transitive
393393
description:
394394
name: test_core
395395
url: "https://pub.dartlang.org"
396396
source: hosted
397-
version: "0.3.25"
397+
version: "0.4.0"
398398
typed_data:
399399
dependency: transitive
400400
description:
@@ -415,7 +415,7 @@ packages:
415415
name: vm_service
416416
url: "https://pub.dartlang.org"
417417
source: hosted
418-
version: "6.2.0"
418+
version: "7.1.1"
419419
watcher:
420420
dependency: transitive
421421
description:

‎example/windows/flutter/generated_plugin_registrant.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Generated file. Do not edit.
33
//
44

5+
// clang-format off
6+
57
#include "generated_plugin_registrant.h"
68

79
#include <openpgp/openpgp_plugin.h>

‎example/windows/flutter/generated_plugin_registrant.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Generated file. Do not edit.
33
//
44

5+
// clang-format off
6+
57
#ifndef GENERATED_PLUGIN_REGISTRANT_
68
#define GENERATED_PLUGIN_REGISTRANT_
79

‎ios/openpgp.podspec‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#
22
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
3-
# Run `pod lib lint openpgp.podspec' to validate before publishing.
3+
# Run `pod lib lint fast_rsa.podspec' to validate before publishing.
44
#
5+
shared_lib = File.join(__dir__, "libopenpgp_bridge.a").gsub(/ /, '\ ')
6+
57
Pod::Spec.new do |s|
68
s.name = 'openpgp'
79
s.version = '0.6.0'
@@ -18,9 +20,10 @@ Pod::Spec.new do |s|
1820
s.vendored_libraries = '*.a'
1921
s.dependency 'Flutter'
2022
s.platform = :ios, '8.0'
21-
s.xcconfig = { 'OTHER_LDFLAGS' => '-force_load "${PODS_ROOT}/../.symlinks/plugins/openpgp/ios/libopenpgp_bridge.a"'}
23+
s.xcconfig = { 'OTHER_LDFLAGS' => "-force_load '#{shared_lib}'"}
2224
# Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
23-
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
25+
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
26+
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
2427
s.swift_version = '5.0'
2528

2629
end

‎pubspec.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.7.0"
10+
version: "2.8.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
@@ -28,7 +28,7 @@ packages:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.2.0"
31+
version: "1.3.1"
3232
clock:
3333
dependency: transitive
3434
description:
@@ -92,7 +92,7 @@ packages:
9292
name: meta
9393
url: "https://pub.dartlang.org"
9494
source: hosted
95-
version: "1.4.0"
95+
version: "1.7.0"
9696
path:
9797
dependency: transitive
9898
description:
@@ -146,7 +146,7 @@ packages:
146146
name: test_api
147147
url: "https://pub.dartlang.org"
148148
source: hosted
149-
version: "0.4.0"
149+
version: "0.4.2"
150150
typed_data:
151151
dependency: transitive
152152
description:

0 commit comments

Comments
 (0)