Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2017cc1

Browse filesBrowse files
committed
fix modulemap structure
1 parent c65831b commit 2017cc1
Copy full SHA for 2017cc1

File tree

Expand file treeCollapse file tree

5 files changed

+19
-11
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+19
-11
lines changed

‎Argon2Swift.podspec

Copy file name to clipboardExpand all lines: Argon2Swift.podspec
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Pod::Spec.new do |spec|
6767
spec.watchos.deployment_target = "2.0"
6868
spec.tvos.deployment_target = "9.0"
6969

70-
spec.preserve_paths = 'Sources/', 'Sources/Argon2', 'Sources/Argon2/include/**/*.h'
70+
spec.preserve_paths = 'Sources/Modules', 'Sources/Argon2', 'Sources/Argon2/include/**/*.h'
7171
# spec.header_mappings_dir = 'Sources/Argon2/include'
7272
spec.requires_arc = true
7373

@@ -98,8 +98,8 @@ Pod::Spec.new do |spec|
9898

9999
spec.pod_target_xcconfig = {
100100
'DEFINES_MODULE' => 'YES',
101-
'SWIFT_INCLUDE_PATHS[sdk=*]' => '$(PODS_TARGET_SRCROOT)/Sources $(PODS_TARGET_SRCROOT)/Sources/Argon2 $(PODS_TARGET_SRCROOT)/Sources/Argon2/include',
102-
'HEADER_SEARCH_PATHS[sdk=*]' => '$(PODS_TARGET_SRCROOT)/Sources'
101+
'SWIFT_INCLUDE_PATHS[sdk=*]' => '$(PODS_TARGET_SRCROOT)/Sources/Modules $(PODS_TARGET_SRCROOT)/Sources/Argon2 $(PODS_TARGET_SRCROOT)/Sources/Argon2/include',
102+
'HEADER_SEARCH_PATHS[sdk=*]' => '$(PODS_TARGET_SRCROOT)/Sources/Modules'
103103
}
104104

105105
spec.test_spec 'Tests' do |test_spec|

‎Argon2Swift.xcodeproj/project.pbxproj

Copy file name to clipboardExpand all lines: Argon2Swift.xcodeproj/project.pbxproj
+11-3Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,14 @@
277277
name = Frameworks;
278278
sourceTree = "<group>";
279279
};
280+
A44E6ECD25EC1E9A00137A6F /* Modules */ = {
281+
isa = PBXGroup;
282+
children = (
283+
A44E6AFC25EC0B8700137A6F /* module.modulemap */,
284+
);
285+
path = Modules;
286+
sourceTree = "<group>";
287+
};
280288
A460113625B28539004F9B26 = {
281289
isa = PBXGroup;
282290
children = (
@@ -303,7 +311,7 @@
303311
A460117C25B286CA004F9B26 /* Sources */ = {
304312
isa = PBXGroup;
305313
children = (
306-
A44E6AFC25EC0B8700137A6F /* module.modulemap */,
314+
A44E6ECD25EC1E9A00137A6F /* Modules */,
307315
A4D9430D25B5531600DB4538 /* Info.plist */,
308316
A460165C25B29897004F9B26 /* Swift */,
309317
A460148C25B29608004F9B26 /* Argon2 */,
@@ -1066,7 +1074,7 @@
10661074
isa = XCBuildConfiguration;
10671075
buildSettings = {
10681076
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
1069-
HEADER_SEARCH_PATHS = Sources/;
1077+
HEADER_SEARCH_PATHS = "$(SRCROOT)/Sources/Modules";
10701078
INFOPLIST_FILE = Sources/Info.plist;
10711079
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
10721080
LIBRARY_SEARCH_PATHS = "";
@@ -1081,7 +1089,7 @@
10811089
isa = XCBuildConfiguration;
10821090
buildSettings = {
10831091
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
1084-
HEADER_SEARCH_PATHS = Sources/;
1092+
HEADER_SEARCH_PATHS = "$(SRCROOT)/Sources/Modules";
10851093
INFOPLIST_FILE = Sources/Info.plist;
10861094
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
10871095
LIBRARY_SEARCH_PATHS = "";

‎Sources/Argon2Swift.h

Copy file name to clipboardExpand all lines: Sources/Argon2Swift.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
//#import <Argon2Swift/argon2.h>
9+
#import <Argon2Swift/Argon2Swift.h>
1010

1111
//! Project version number for Argon2Swift_macOS.
1212
FOUNDATION_EXPORT double Argon2SwiftVersionNumber;

‎Sources/Modules/module.modulemap

Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module Argon2 {
2+
header "../Argon2/include/argon2.h"
3+
export *
4+
}

‎Sources/module.modulemap

Copy file name to clipboardExpand all lines: Sources/module.modulemap
-4Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.