Skip to content

Commit f3254ff

Browse files
committed
Fix import framework bugs.
1 parent 792a2e3 commit f3254ff

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
import PackageDescription
44

55
let package = Package(
6-
name: "WebService",
6+
name: "WebServiceSwift",
77
exclude: ["WebServiceExample"]
88
)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ To use the library, you need:
123123
3. If desired, you can create a class for storing hashes or use the existing one - `WebServiceSimpleStore`.
124124
4. Write a factory to generate a WebService object or write an extension for it with a convenience constructor.
125125

126-
**Note:** To use the library, remember to include it in each file: `import WebService`.
126+
**Note:** To use the library, remember to include it in each file: `import WebServiceSwift`.
127127

128128
The project has a less abstract example of using the library, which can be downloaded separately.
129129

Source/WebService.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#import <Foundation/Foundation.h>
1111

1212
//! Project version number for WebServiceSwift.
13-
FOUNDATION_EXPORT double WebServiceVersionNumber;
13+
FOUNDATION_EXPORT double WebServiceSwiftVersionNumber;
1414

1515
//! Project version string for WebServiceSwift.
16-
FOUNDATION_EXPORT const unsigned char WebServiceVersionString[];
16+
FOUNDATION_EXPORT const unsigned char WebServiceSwiftVersionString[];
1717

1818
// In this header, you should import all the public headers of your framework using statements like #import <WebServiceSwift/PublicHeader.h>
1919

WebServiceExample.xcodeproj/project.pbxproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
501D2AC81F4E8DD0000E3FA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 501D2AC71F4E8DD0000E3FA3 /* Assets.xcassets */; };
1414
501D2ACB1F4E8DD0000E3FA3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 501D2AC91F4E8DD0000E3FA3 /* LaunchScreen.storyboard */; };
1515
501D2ADB1F4E8DF5000E3FA3 /* WebService.h in Headers */ = {isa = PBXBuildFile; fileRef = 501D2AD91F4E8DF5000E3FA3 /* WebService.h */; settings = {ATTRIBUTES = (Public, ); }; };
16-
501D2ADE1F4E8DF5000E3FA3 /* WebService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501D2AD71F4E8DF5000E3FA3 /* WebService.framework */; };
17-
501D2ADF1F4E8DF5000E3FA3 /* WebService.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 501D2AD71F4E8DF5000E3FA3 /* WebService.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
16+
501D2ADE1F4E8DF5000E3FA3 /* WebServiceSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501D2AD71F4E8DF5000E3FA3 /* WebServiceSwift.framework */; };
17+
501D2ADF1F4E8DF5000E3FA3 /* WebServiceSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 501D2AD71F4E8DF5000E3FA3 /* WebServiceSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1818
501D2AEC1F4E92A1000E3FA3 /* WebServiceSimpleStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501D2AEB1F4E92A1000E3FA3 /* WebServiceSimpleStore.swift */; };
1919
501D2AF11F518762000E3FA3 /* WebServiceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501D2AED1F4E9BE5000E3FA3 /* WebServiceRequest.swift */; };
2020
501D2AF21F5188CC000E3FA3 /* WebService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501D2AEF1F4EA1EC000E3FA3 /* WebService.swift */; };
@@ -40,7 +40,7 @@
4040
dstPath = "";
4141
dstSubfolderSpec = 10;
4242
files = (
43-
501D2ADF1F4E8DF5000E3FA3 /* WebService.framework in Embed Frameworks */,
43+
501D2ADF1F4E8DF5000E3FA3 /* WebServiceSwift.framework in Embed Frameworks */,
4444
);
4545
name = "Embed Frameworks";
4646
runOnlyForDeploymentPostprocessing = 0;
@@ -56,7 +56,7 @@
5656
501D2AC71F4E8DD0000E3FA3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5757
501D2ACA1F4E8DD0000E3FA3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5858
501D2ACC1F4E8DD0000E3FA3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
59-
501D2AD71F4E8DF5000E3FA3 /* WebService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebService.framework; sourceTree = BUILT_PRODUCTS_DIR; };
59+
501D2AD71F4E8DF5000E3FA3 /* WebServiceSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebServiceSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6060
501D2AD91F4E8DF5000E3FA3 /* WebService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebService.h; sourceTree = "<group>"; };
6161
501D2ADA1F4E8DF5000E3FA3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6262
501D2AE41F4E8FA2000E3FA3 /* WebService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebService.swift; sourceTree = "<group>"; };
@@ -73,7 +73,7 @@
7373
isa = PBXFrameworksBuildPhase;
7474
buildActionMask = 2147483647;
7575
files = (
76-
501D2ADE1F4E8DF5000E3FA3 /* WebService.framework in Frameworks */,
76+
501D2ADE1F4E8DF5000E3FA3 /* WebServiceSwift.framework in Frameworks */,
7777
F453EA236A3F776E9CF4C183 /* Pods_WebServiceExample.framework in Frameworks */,
7878
);
7979
runOnlyForDeploymentPostprocessing = 0;
@@ -111,7 +111,7 @@
111111
isa = PBXGroup;
112112
children = (
113113
501D2ABD1F4E8DD0000E3FA3 /* WebServiceExample.app */,
114-
501D2AD71F4E8DF5000E3FA3 /* WebService.framework */,
114+
501D2AD71F4E8DF5000E3FA3 /* WebServiceSwift.framework */,
115115
);
116116
name = Products;
117117
sourceTree = "<group>";
@@ -189,9 +189,9 @@
189189
productReference = 501D2ABD1F4E8DD0000E3FA3 /* WebServiceExample.app */;
190190
productType = "com.apple.product-type.application";
191191
};
192-
501D2AD61F4E8DF5000E3FA3 /* WebService */ = {
192+
501D2AD61F4E8DF5000E3FA3 /* WebServiceSwift */ = {
193193
isa = PBXNativeTarget;
194-
buildConfigurationList = 501D2AE01F4E8DF5000E3FA3 /* Build configuration list for PBXNativeTarget "WebService" */;
194+
buildConfigurationList = 501D2AE01F4E8DF5000E3FA3 /* Build configuration list for PBXNativeTarget "WebServiceSwift" */;
195195
buildPhases = (
196196
501D2AD21F4E8DF5000E3FA3 /* Sources */,
197197
501D2AD31F4E8DF5000E3FA3 /* Frameworks */,
@@ -202,9 +202,9 @@
202202
);
203203
dependencies = (
204204
);
205-
name = WebService;
205+
name = WebServiceSwift;
206206
productName = WebService;
207-
productReference = 501D2AD71F4E8DF5000E3FA3 /* WebService.framework */;
207+
productReference = 501D2AD71F4E8DF5000E3FA3 /* WebServiceSwift.framework */;
208208
productType = "com.apple.product-type.framework";
209209
};
210210
/* End PBXNativeTarget section */
@@ -242,7 +242,7 @@
242242
projectRoot = "";
243243
targets = (
244244
501D2ABC1F4E8DD0000E3FA3 /* WebServiceExample */,
245-
501D2AD61F4E8DF5000E3FA3 /* WebService */,
245+
501D2AD61F4E8DF5000E3FA3 /* WebServiceSwift */,
246246
);
247247
};
248248
/* End PBXProject section */
@@ -342,7 +342,7 @@
342342
/* Begin PBXTargetDependency section */
343343
501D2ADD1F4E8DF5000E3FA3 /* PBXTargetDependency */ = {
344344
isa = PBXTargetDependency;
345-
target = 501D2AD61F4E8DF5000E3FA3 /* WebService */;
345+
target = 501D2AD61F4E8DF5000E3FA3 /* WebServiceSwift */;
346346
targetProxy = 501D2ADC1F4E8DF5000E3FA3 /* PBXContainerItemProxy */;
347347
};
348348
/* End PBXTargetDependency section */
@@ -566,7 +566,7 @@
566566
defaultConfigurationIsVisible = 0;
567567
defaultConfigurationName = Release;
568568
};
569-
501D2AE01F4E8DF5000E3FA3 /* Build configuration list for PBXNativeTarget "WebService" */ = {
569+
501D2AE01F4E8DF5000E3FA3 /* Build configuration list for PBXNativeTarget "WebServiceSwift" */ = {
570570
isa = XCConfigurationList;
571571
buildConfigurations = (
572572
501D2AE11F4E8DF5000E3FA3 /* Debug */,

WebServiceExample.xcodeproj/xcshareddata/xcschemes/WebService.xcscheme

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "501D2AD61F4E8DF5000E3FA3"
18-
BuildableName = "WebService.framework"
19-
BlueprintName = "WebService"
18+
BuildableName = "WebServiceSwift.framework"
19+
BlueprintName = "WebServiceSwift"
2020
ReferencedContainer = "container:WebServiceExample.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -46,8 +46,8 @@
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
4848
BlueprintIdentifier = "501D2AD61F4E8DF5000E3FA3"
49-
BuildableName = "WebService.framework"
50-
BlueprintName = "WebService"
49+
BuildableName = "WebServiceSwift.framework"
50+
BlueprintName = "WebServiceSwift"
5151
ReferencedContainer = "container:WebServiceExample.xcodeproj">
5252
</BuildableReference>
5353
</MacroExpansion>
@@ -64,8 +64,8 @@
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
6666
BlueprintIdentifier = "501D2AD61F4E8DF5000E3FA3"
67-
BuildableName = "WebService.framework"
68-
BlueprintName = "WebService"
67+
BuildableName = "WebServiceSwift.framework"
68+
BlueprintName = "WebServiceSwift"
6969
ReferencedContainer = "container:WebServiceExample.xcodeproj">
7070
</BuildableReference>
7171
</MacroExpansion>

WebServiceExample/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import UIKit
10-
import WebService
10+
import WebServiceSwift
1111

1212
class ViewController: UIViewController, WebServiceDelegate {
1313

WebServiceExample/WebService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Foundation
10-
import WebService
10+
import WebServiceSwift
1111
import Alamofire
1212

1313

WebServiceExample/WebServiceRequest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Foundation
10-
import WebService
10+
import WebServiceSwift
1111

1212

1313
struct RequestMethod: WebServiceRequesting {

0 commit comments

Comments
 (0)