Skip to content

Commit 72f95c2

Browse files
dethidethi
committed
fix testing build bug + fix CFBundle error + remove Objc bridging
1 parent 7ecd8e9 commit 72f95c2

File tree

4 files changed

+44
-47
lines changed

4 files changed

+44
-47
lines changed

‎AlgoliaSearch.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
5D7495841A8E25A600B0263F /* AlgoliaSearch.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D7495831A8E25A600B0263F /* AlgoliaSearch.h */; settings = {ATTRIBUTES = (Public, ); }; };
1110
5D74958A1A8E25A600B0263F /* AlgoliaSearch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D74957E1A8E25A600B0263F /* AlgoliaSearch.framework */; };
1211
5D7495911A8E25A600B0263F /* AlgoliaSearchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D7495901A8E25A600B0263F /* AlgoliaSearchTests.swift */; };
13-
5D74959B1A8E265300B0263F /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D74959A1A8E265300B0263F /* Alamofire.framework */; };
1412
5D7495A11A8E277400B0263F /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D74959F1A8E277400B0263F /* Extension.swift */; };
1513
5D7495A21A8E277400B0263F /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D7495A01A8E277400B0263F /* Client.swift */; };
16-
5D7495A31A8E279A00B0263F /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D74959A1A8E265300B0263F /* Alamofire.framework */; };
1714
5D7495A71A8E499B00B0263F /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D7495A61A8E499B00B0263F /* Query.swift */; };
15+
5D9F70821A93B4BE004B751B /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D9F70811A93B4BE004B751B /* Alamofire.framework */; };
16+
5D9F70851A93B9C9004B751B /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D9F70811A93B4BE004B751B /* Alamofire.framework */; };
17+
5D9F70871A93BE2A004B751B /* Alamofire.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D9F70811A93B4BE004B751B /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXContainerItemProxy section */
@@ -27,25 +27,37 @@
2727
};
2828
/* End PBXContainerItemProxy section */
2929

30+
/* Begin PBXCopyFilesBuildPhase section */
31+
5D9F70861A93BE1D004B751B /* CopyFiles */ = {
32+
isa = PBXCopyFilesBuildPhase;
33+
buildActionMask = 2147483647;
34+
dstPath = "";
35+
dstSubfolderSpec = 10;
36+
files = (
37+
5D9F70871A93BE2A004B751B /* Alamofire.framework in CopyFiles */,
38+
);
39+
runOnlyForDeploymentPostprocessing = 0;
40+
};
41+
/* End PBXCopyFilesBuildPhase section */
42+
3043
/* Begin PBXFileReference section */
3144
5D74957E1A8E25A600B0263F /* AlgoliaSearch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlgoliaSearch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3245
5D7495821A8E25A600B0263F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
33-
5D7495831A8E25A600B0263F /* AlgoliaSearch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AlgoliaSearch.h; sourceTree = "<group>"; };
3446
5D7495891A8E25A600B0263F /* AlgoliaSearchTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AlgoliaSearchTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3547
5D74958F1A8E25A600B0263F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3648
5D7495901A8E25A600B0263F /* AlgoliaSearchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlgoliaSearchTests.swift; sourceTree = "<group>"; };
37-
5D74959A1A8E265300B0263F /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/Mac/Alamofire.framework; sourceTree = "<group>"; };
3849
5D74959F1A8E277400B0263F /* Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; };
3950
5D7495A01A8E277400B0263F /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
4051
5D7495A61A8E499B00B0263F /* Query.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Query.swift; sourceTree = "<group>"; };
52+
5D9F70811A93B4BE004B751B /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/Mac/Alamofire.framework; sourceTree = "<group>"; };
4153
/* End PBXFileReference section */
4254

4355
/* Begin PBXFrameworksBuildPhase section */
4456
5D74957A1A8E25A600B0263F /* Frameworks */ = {
4557
isa = PBXFrameworksBuildPhase;
4658
buildActionMask = 2147483647;
4759
files = (
48-
5D74959B1A8E265300B0263F /* Alamofire.framework in Frameworks */,
60+
5D9F70821A93B4BE004B751B /* Alamofire.framework in Frameworks */,
4961
);
5062
runOnlyForDeploymentPostprocessing = 0;
5163
};
@@ -54,7 +66,7 @@
5466
buildActionMask = 2147483647;
5567
files = (
5668
5D74958A1A8E25A600B0263F /* AlgoliaSearch.framework in Frameworks */,
57-
5D7495A31A8E279A00B0263F /* Alamofire.framework in Frameworks */,
69+
5D9F70851A93B9C9004B751B /* Alamofire.framework in Frameworks */,
5870
);
5971
runOnlyForDeploymentPostprocessing = 0;
6072
};
@@ -83,7 +95,6 @@
8395
5D7495801A8E25A600B0263F /* Source */ = {
8496
isa = PBXGroup;
8597
children = (
86-
5D7495831A8E25A600B0263F /* AlgoliaSearch.h */,
8798
5D7495A01A8E277400B0263F /* Client.swift */,
8899
5D7495A61A8E499B00B0263F /* Query.swift */,
89100
5D74959F1A8E277400B0263F /* Extension.swift */,
@@ -120,7 +131,7 @@
120131
5D74959C1A8E265C00B0263F /* Frameworks */ = {
121132
isa = PBXGroup;
122133
children = (
123-
5D74959A1A8E265300B0263F /* Alamofire.framework */,
134+
5D9F70811A93B4BE004B751B /* Alamofire.framework */,
124135
);
125136
name = Frameworks;
126137
sourceTree = "<group>";
@@ -132,7 +143,6 @@
132143
isa = PBXHeadersBuildPhase;
133144
buildActionMask = 2147483647;
134145
files = (
135-
5D7495841A8E25A600B0263F /* AlgoliaSearch.h in Headers */,
136146
);
137147
runOnlyForDeploymentPostprocessing = 0;
138148
};
@@ -146,7 +156,6 @@
146156
5D7495791A8E25A600B0263F /* Sources */,
147157
5D74957A1A8E25A600B0263F /* Frameworks */,
148158
5D74957B1A8E25A600B0263F /* Headers */,
149-
5D74957C1A8E25A600B0263F /* Resources */,
150159
);
151160
buildRules = (
152161
);
@@ -164,6 +173,7 @@
164173
5D7495851A8E25A600B0263F /* Sources */,
165174
5D7495861A8E25A600B0263F /* Frameworks */,
166175
5D7495871A8E25A600B0263F /* Resources */,
176+
5D9F70861A93BE1D004B751B /* CopyFiles */,
167177
);
168178
buildRules = (
169179
);
@@ -211,13 +221,6 @@
211221
/* End PBXProject section */
212222

213223
/* Begin PBXResourcesBuildPhase section */
214-
5D74957C1A8E25A600B0263F /* Resources */ = {
215-
isa = PBXResourcesBuildPhase;
216-
buildActionMask = 2147483647;
217-
files = (
218-
);
219-
runOnlyForDeploymentPostprocessing = 0;
220-
};
221224
5D7495871A8E25A600B0263F /* Resources */ = {
222225
isa = PBXResourcesBuildPhase;
223226
buildActionMask = 2147483647;
@@ -263,7 +266,7 @@
263266
ALWAYS_SEARCH_USER_PATHS = NO;
264267
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
265268
CLANG_CXX_LIBRARY = "libc++";
266-
CLANG_ENABLE_MODULES = YES;
269+
CLANG_ENABLE_MODULES = NO;
267270
CLANG_ENABLE_OBJC_ARC = YES;
268271
CLANG_WARN_BOOL_CONVERSION = YES;
269272
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -307,7 +310,7 @@
307310
ALWAYS_SEARCH_USER_PATHS = NO;
308311
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
309312
CLANG_CXX_LIBRARY = "libc++";
310-
CLANG_ENABLE_MODULES = YES;
313+
CLANG_ENABLE_MODULES = NO;
311314
CLANG_ENABLE_OBJC_ARC = YES;
312315
CLANG_WARN_BOOL_CONVERSION = YES;
313316
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -341,6 +344,7 @@
341344
5D7495951A8E25A600B0263F /* Debug */ = {
342345
isa = XCBuildConfiguration;
343346
buildSettings = {
347+
APPLICATION_EXTENSION_API_ONLY = NO;
344348
CLANG_ENABLE_MODULES = YES;
345349
COMBINE_HIDPI_IMAGES = YES;
346350
DEFINES_MODULE = YES;
@@ -364,6 +368,7 @@
364368
5D7495961A8E25A600B0263F /* Release */ = {
365369
isa = XCBuildConfiguration;
366370
buildSettings = {
371+
APPLICATION_EXTENSION_API_ONLY = NO;
367372
CLANG_ENABLE_MODULES = YES;
368373
COMBINE_HIDPI_IMAGES = YES;
369374
DEFINES_MODULE = YES;

‎Source/AlgoliaSearch.h‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Source/Client.swift‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class Client {
5757
}
5858
self.hostnames.shuffle()
5959

60-
let version = NSBundle.mainBundle().infoDictionary!["CFBundleShortVersionString"] as String
60+
let version = NSBundle(identifier: "com.algolia.AlgoliaSearch")!.infoDictionary!["CFBundleShortVersionString"] as String
6161
var HTTPHeader = [
6262
"X-Algolia-API-Key": self.apiKey,
6363
"X-Algolia-Application-Id": self.appID,
@@ -83,6 +83,14 @@ public class Client {
8383
}
8484
}
8585

86+
// MARK: - Operations
87+
88+
public func listIndexes(block: (client: Client, JSON: AnyObject?, error: NSError?) -> Void) {
89+
performHTTPQuery("1/indexes", method: .GET, body: nil, block: { (JSON, error) -> Void in
90+
block(client: self, JSON: JSON, error: error)
91+
})
92+
}
93+
8694
// MARK: - Network
8795

8896
/// Perform an HTTP Query

‎Tests/AlgoliaSearchTests.swift‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,28 @@
88

99
import XCTest
1010
import AlgoliaSearch
11+
import Alamofire
1112

1213
class AlgoliaSearchTests: XCTestCase {
13-
var client: Client?
14+
var client: Client!
1415

1516
override func setUp() {
1617
super.setUp()
17-
client = AlgoliaSearch.Client(appID: "ok", apiKey: "nil")
18+
client = AlgoliaSearch.Client(appID: "XXX", apiKey: "XXX")
1819
}
1920

2021
override func tearDown() {
2122
// Put teardown code here. This method is called after the invocation of each test method in the class.
2223
super.tearDown()
2324
}
2425

25-
func testExample() {
26-
// This is an example of a functional test case.
27-
XCTAssert(true, "Pass")
28-
}
29-
30-
func testPerformanceExample() {
31-
// This is an example of a performance test case.
32-
self.measureBlock() {
33-
// Put the code you want to measure the time of here.
26+
func testListIndexes() {
27+
let expectation = expectationWithDescription("List indexes")
28+
client.listIndexes { (client, JSON, error) -> Void in
29+
expectation.fulfill()
30+
XCTAssertNil(error, error!.localizedDescription)
3431
}
32+
33+
waitForExpectationsWithTimeout(100, handler: nil)
3534
}
3635
}

0 commit comments

Comments
 (0)