Skip to content

Commit d9aed9a

Browse files
berehovyiberehovyi
committed
Better support for swift deps
1 parent ef421c2 commit d9aed9a

9 files changed

Lines changed: 54 additions & 21 deletions

File tree

‎example/ios/Podfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
2+
platform :ios, '9.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -34,5 +34,8 @@ end
3434
post_install do |installer|
3535
installer.pods_project.targets.each do |target|
3636
flutter_additional_ios_build_settings(target)
37+
target.build_configurations.each do |config|
38+
config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386'
39+
end
3740
end
3841
end

‎example/ios/Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ EXTERNAL SOURCES:
1919
:path: ".symlinks/plugins/webview_flutter/ios"
2020

2121
SPEC CHECKSUMS:
22-
cloudipsp_mobile: 27ec32288648803e8a883efe94ac1cc8b24a4fa7
23-
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
22+
cloudipsp_mobile: 4a45b3e92c54fef27ff14e0210acc82d2a804e8d
23+
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
2424
webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
2525

26-
PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d
26+
PODFILE CHECKSUM: 018201b96b6ee47a0462757e5d3dac0bf7ced318
2727

28-
COCOAPODS: 1.10.1
28+
COCOAPODS: 1.11.2

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
326C43331338C9A7A4BCBA49 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C2429418A39FEF7F6BEFDB5 /* libPods-Runner.a */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
73EC8387034969C94961BDA4 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DF889EC7E51DF219D28248 /* libPods-Runner.a */; };
1313
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1414
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1515
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1616
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1717
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
18+
A26B669F2729451100705363 /* Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = A26B669E2729451100705363 /* Stub.swift */; };
1819
/* End PBXBuildFile section */
1920

2021
/* Begin PBXCopyFilesBuildPhase section */
@@ -31,6 +32,7 @@
3132
/* End PBXCopyFilesBuildPhase section */
3233

3334
/* Begin PBXFileReference section */
35+
0C2429418A39FEF7F6BEFDB5 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3436
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3537
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3638
36FA73D2F485357758D189F2 /* 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>"; };
@@ -47,17 +49,18 @@
4749
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4850
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4951
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
52+
A26B669D2729451000705363 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
53+
A26B669E2729451100705363 /* Stub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stub.swift; sourceTree = "<group>"; };
5054
A28786D626A80D63000CCA57 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
5155
B48B20BF2FB71BC3F46B3680 /* 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>"; };
52-
F5DF889EC7E51DF219D28248 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5356
/* End PBXFileReference section */
5457

5558
/* Begin PBXFrameworksBuildPhase section */
5659
97C146EB1CF9000F007C117D /* Frameworks */ = {
5760
isa = PBXFrameworksBuildPhase;
5861
buildActionMask = 2147483647;
5962
files = (
60-
73EC8387034969C94961BDA4 /* libPods-Runner.a in Frameworks */,
63+
326C43331338C9A7A4BCBA49 /* libPods-Runner.a in Frameworks */,
6164
);
6265
runOnlyForDeploymentPostprocessing = 0;
6366
};
@@ -67,7 +70,7 @@
6770
37E1AD53A1E1F3C934ECD3EC /* Frameworks */ = {
6871
isa = PBXGroup;
6972
children = (
70-
F5DF889EC7E51DF219D28248 /* libPods-Runner.a */,
73+
0C2429418A39FEF7F6BEFDB5 /* libPods-Runner.a */,
7174
);
7275
name = Frameworks;
7376
sourceTree = "<group>";
@@ -115,6 +118,8 @@
115118
97C146F11CF9000F007C117D /* Supporting Files */,
116119
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
117120
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
121+
A26B669E2729451100705363 /* Stub.swift */,
122+
A26B669D2729451000705363 /* Runner-Bridging-Header.h */,
118123
);
119124
path = Runner;
120125
sourceTree = "<group>";
@@ -172,6 +177,7 @@
172177
TargetAttributes = {
173178
97C146ED1CF9000F007C117D = {
174179
CreatedOnToolsVersion = 7.3.1;
180+
LastSwiftMigration = 1300;
175181
};
176182
};
177183
};
@@ -268,6 +274,7 @@
268274
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
269275
97C146F31CF9000F007C117D /* main.m in Sources */,
270276
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
277+
A26B669F2729451100705363 /* Stub.swift in Sources */,
271278
);
272279
runOnlyForDeploymentPostprocessing = 0;
273280
};
@@ -348,6 +355,7 @@
348355
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
349356
buildSettings = {
350357
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
358+
CLANG_ENABLE_MODULES = YES;
351359
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
352360
CODE_SIGN_IDENTITY = "iPhone Distribution";
353361
CODE_SIGN_STYLE = Manual;
@@ -362,6 +370,8 @@
362370
PRODUCT_BUNDLE_IDENTIFIER = com.cloudipsp.sdk.flutter;
363371
PRODUCT_NAME = "$(TARGET_NAME)";
364372
PROVISIONING_PROFILE_SPECIFIER = "com.cloudipsp.sdk.flutter AdHoc";
373+
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
374+
SWIFT_VERSION = 5.0;
365375
VERSIONING_SYSTEM = "apple-generic";
366376
};
367377
name = Profile;
@@ -476,6 +486,7 @@
476486
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
477487
buildSettings = {
478488
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
489+
CLANG_ENABLE_MODULES = YES;
479490
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
480491
CODE_SIGN_STYLE = Manual;
481492
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -489,6 +500,9 @@
489500
PRODUCT_BUNDLE_IDENTIFIER = com.cloudipsp.sdk.flutter;
490501
PRODUCT_NAME = "$(TARGET_NAME)";
491502
PROVISIONING_PROFILE_SPECIFIER = "";
503+
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
504+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
505+
SWIFT_VERSION = 5.0;
492506
VERSIONING_SYSTEM = "apple-generic";
493507
};
494508
name = Debug;
@@ -498,6 +512,7 @@
498512
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
499513
buildSettings = {
500514
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
515+
CLANG_ENABLE_MODULES = YES;
501516
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
502517
CODE_SIGN_IDENTITY = "iPhone Distribution";
503518
CODE_SIGN_STYLE = Manual;
@@ -512,6 +527,8 @@
512527
PRODUCT_BUNDLE_IDENTIFIER = com.cloudipsp.sdk.flutter;
513528
PRODUCT_NAME = "$(TARGET_NAME)";
514529
PROVISIONING_PROFILE_SPECIFIER = "com.cloudipsp.sdk.flutter AdHoc";
530+
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
531+
SWIFT_VERSION = 5.0;
515532
VERSIONING_SYSTEM = "apple-generic";
516533
};
517534
name = Release;

‎example/ios/Runner/Runner-Bridging-Header.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//
2+
// Use this file to import your target's public headers that you would like to expose to Swift.
3+
//
4+

‎example/ios/Runner/Stub.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//
2+
// Stub.swift
3+
// Runner
4+
//
5+
// Created by Valentyn Berehovyi on 10/27/21.
6+
//
7+
8+
import Foundation

‎example/pubspec.lock‎

Lines changed: 5 additions & 5 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.6.1"
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:
@@ -42,7 +42,7 @@ packages:
4242
path: ".."
4343
relative: true
4444
source: path
45-
version: "0.0.1"
45+
version: "0.0.2"
4646
collection:
4747
dependency: transitive
4848
description:
@@ -108,7 +108,7 @@ packages:
108108
name: meta
109109
url: "https://pub.dartlang.org"
110110
source: hosted
111-
version: "1.3.0"
111+
version: "1.7.0"
112112
path:
113113
dependency: transitive
114114
description:
@@ -169,7 +169,7 @@ packages:
169169
name: test_api
170170
url: "https://pub.dartlang.org"
171171
source: hosted
172-
version: "0.3.0"
172+
version: "0.4.2"
173173
typed_data:
174174
dependency: transitive
175175
description:

‎example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ dev_dependencies:
1919
sdk: flutter
2020

2121
flutter:
22-
uses-material-design: true
22+
uses-material-design: true

‎ios/cloudipsp_mobile.podspec‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ Pod::Spec.new do |s|
99
s.description = <<-DESC
1010
Cloudipsp SDK for Mobile(Android, iOS)
1111
DESC
12-
s.homepage = 'http://example.com'
12+
s.homepage = 'https://fondy.eu'
1313
s.license = { :file => '../LICENSE' }
1414
s.author = { 'Maxim Kozenko' => 'max.dnu@gmail.com' }
1515
s.source = { :path => '.' }
16-
s.source_files = 'Classes/**/*.m'
16+
s.static_framework = true
17+
s.source_files = 'Classes/**/*'
1718
s.public_header_files = 'Classes/**/*.h'
1819
s.dependency 'Flutter'
1920
s.frameworks = 'UIKit', 'PassKit'
20-
s.platform = :ios, '8.0'
21+
s.platform = :ios, '11.0'
2122

22-
# Flutter.framework does not contain a i386 slice.
23-
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
23+
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 i386' }
24+
s.swift_version = '5.0'
2425
end

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: cloudipsp_mobile
22
description: Cloudipsp SDK for Mobile(Android, iOS)
3-
version: 0.0.2
3+
version: 0.0.3
44
author: Maxim Kozenko
55
homepage: https://github.com/cloudipsp/flutter-mobile-sdk
66

0 commit comments

Comments
 (0)