Ubuntu One Music App for iOS

Merge lp:~rockstar/ubuntuone-ios-music/dependencies into lp:~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty

  1. dependencies
  2. Merge into moriarty
Proposed by Paul Hummer
Status: Merged
Merged at revision: 242
Proposed branch: lp:~rockstar/ubuntuone-ios-music/dependencies
Merge into: lp:~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty
Prerequisite: lp:~rockstar/ubuntuone-ios-music/scorched-earth
Diff against target: 246 lines (+125/-17)
1 file modified
U1Music.xcodeproj/project.pbxproj (+125/-17)
To merge this branch: bzr merge lp:~rockstar/ubuntuone-ios-music/dependencies
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
dobey (community) Approve
Review via email: mp+135053@code.launchpad.net

Description of the change

This branch adds the RestKit dependency.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Mike McCracken (mikemc) wrote :

on line 208 and 231, this looks weird:

+ "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"/**",

What does that look like in XCode's UI? Looking at the backslash and double-star, I wonder if that's actually doing anything or just getting ignored?

review: Needs Information
Revision history for this message
Paul Hummer (rockstar) wrote :

The double star is some sort of flag that means "recursive". In the UI, it's just a checkbox.

Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'U1Music.xcodeproj/project.pbxproj'
2--- U1Music.xcodeproj/project.pbxproj 2012-11-20 05:44:21 +0000
3+++ U1Music.xcodeproj/project.pbxproj 2012-11-20 05:44:21 +0000
4@@ -20,6 +20,8 @@
5 52169CA415D95E2C00ED366D /* trash-grey@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169CA015D95E2C00ED366D /* trash-grey@2x.png */; };
6 52206B87165505EE00A3A0A8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 52206B831655053000A3A0A8 /* AppDelegate.m */; };
7 52206B891655061A00A3A0A8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 52206B851655056300A3A0A8 /* main.m */; };
8+ 52206BA016550CAE00A3A0A8 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52206B9F16550CAE00A3A0A8 /* MobileCoreServices.framework */; };
9+ 52206BA116550CBD00A3A0A8 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52206B9616550AEE00A3A0A8 /* libRestKit.a */; };
10 523B3CE215B5D64F004394F4 /* grabber.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE015B5D64F004394F4 /* grabber.png */; };
11 523B3CE315B5D64F004394F4 /* grabber@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE115B5D64F004394F4 /* grabber@2x.png */; };
12 523B3CF915B73BA0004394F4 /* download-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF515B73BA0004394F4 /* download-grey.png */; };
13@@ -98,6 +100,41 @@
14 /* End PBXBuildFile section */
15
16 /* Begin PBXContainerItemProxy section */
17+ 52206B9516550AEE00A3A0A8 /* PBXContainerItemProxy */ = {
18+ isa = PBXContainerItemProxy;
19+ containerPortal = 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */;
20+ proxyType = 2;
21+ remoteGlobalIDString = 25160D1614564E810060A5C5;
22+ remoteInfo = RestKit;
23+ };
24+ 52206B9716550AEE00A3A0A8 /* PBXContainerItemProxy */ = {
25+ isa = PBXContainerItemProxy;
26+ containerPortal = 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */;
27+ proxyType = 2;
28+ remoteGlobalIDString = 25160D2614564E820060A5C5;
29+ remoteInfo = RestKitTests;
30+ };
31+ 52206B9916550AEE00A3A0A8 /* PBXContainerItemProxy */ = {
32+ isa = PBXContainerItemProxy;
33+ containerPortal = 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */;
34+ proxyType = 2;
35+ remoteGlobalIDString = 25160E62145651060060A5C5;
36+ remoteInfo = RestKitFramework;
37+ };
38+ 52206B9B16550AEE00A3A0A8 /* PBXContainerItemProxy */ = {
39+ isa = PBXContainerItemProxy;
40+ containerPortal = 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */;
41+ proxyType = 2;
42+ remoteGlobalIDString = 25160E78145651060060A5C5;
43+ remoteInfo = RestKitFrameworkTests;
44+ };
45+ 52206B9D16550AEE00A3A0A8 /* PBXContainerItemProxy */ = {
46+ isa = PBXContainerItemProxy;
47+ containerPortal = 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */;
48+ proxyType = 2;
49+ remoteGlobalIDString = 259C301615128079003066A2;
50+ remoteInfo = RestKitResources;
51+ };
52 528515931604F16D004A1F7C /* PBXContainerItemProxy */ = {
53 isa = PBXContainerItemProxy;
54 containerPortal = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */;
55@@ -137,6 +174,8 @@
56 52206B821655053000A3A0A8 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Music/AppDelegate.h; sourceTree = SOURCE_ROOT; };
57 52206B831655053000A3A0A8 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Music/AppDelegate.m; sourceTree = SOURCE_ROOT; };
58 52206B851655056300A3A0A8 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Music/main.m; sourceTree = SOURCE_ROOT; };
59+ 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../RestKit/RestKit.xcodeproj; sourceTree = "<group>"; };
60+ 52206B9F16550CAE00A3A0A8 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
61 523B3CDC15B4C42F004394F4 /* SongUITableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongUITableView.h; sourceTree = "<group>"; };
62 523B3CDD15B4C42F004394F4 /* SongUITableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongUITableView.m; sourceTree = "<group>"; };
63 523B3CE015B5D64F004394F4 /* grabber.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = grabber.png; sourceTree = "<group>"; };
64@@ -465,20 +504,22 @@
65 isa = PBXFrameworksBuildPhase;
66 buildActionMask = 2147483647;
67 files = (
68- 528515991604F410004A1F7C /* UbuntuOneAuthKit.a in Frameworks */,
69- 5279764915F00B2600F8435F /* libz.dylib in Frameworks */,
70+ 53F675E8113B096400822059 /* AudioToolbox.framework in Frameworks */,
71+ 53F675DC113B093900822059 /* CFNetwork.framework in Frameworks */,
72+ 93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */,
73+ 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */,
74+ 537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */,
75 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
76- 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
77- 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */,
78 53F675D8113B092C00822059 /* MediaPlayer.framework in Frameworks */,
79- 53F675DC113B093900822059 /* CFNetwork.framework in Frameworks */,
80+ 52206BA016550CAE00A3A0A8 /* MobileCoreServices.framework in Frameworks */,
81 53F675E2113B095900822059 /* QuartzCore.framework in Frameworks */,
82- 53F675E8113B096400822059 /* AudioToolbox.framework in Frameworks */,
83- 537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */,
84+ 93A54024123188880048BC3D /* Security.framework in Frameworks */,
85 536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */,
86- 93A54024123188880048BC3D /* Security.framework in Frameworks */,
87- 93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */,
88+ 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
89+ 52206BA116550CBD00A3A0A8 /* libRestKit.a in Frameworks */,
90+ 528515991604F410004A1F7C /* UbuntuOneAuthKit.a in Frameworks */,
91 9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */,
92+ 5279764915F00B2600F8435F /* libz.dylib in Frameworks */,
93 );
94 runOnlyForDeploymentPostprocessing = 0;
95 };
96@@ -496,6 +537,7 @@
97 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
98 isa = PBXGroup;
99 children = (
100+ 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */,
101 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */,
102 93F3346C1247FB78006C6707 /* Music */,
103 52206B88165505F900A3A0A8 /* Deprecated */,
104@@ -519,17 +561,18 @@
105 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
106 isa = PBXGroup;
107 children = (
108- 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
109+ 53F675E7113B096400822059 /* AudioToolbox.framework */,
110+ 53F675DB113B093900822059 /* CFNetwork.framework */,
111+ 93DFFE3E135D70B60061F29F /* CoreData.framework */,
112+ 537DE2D8113F008C00875852 /* CoreFoundation.framework */,
113+ 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */,
114 1D30AB110D05D00D00671497 /* Foundation.framework */,
115- 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */,
116 53F675D7113B092C00822059 /* MediaPlayer.framework */,
117- 53F675DB113B093900822059 /* CFNetwork.framework */,
118+ 52206B9F16550CAE00A3A0A8 /* MobileCoreServices.framework */,
119 53F675E1113B095900822059 /* QuartzCore.framework */,
120- 53F675E7113B096400822059 /* AudioToolbox.framework */,
121- 537DE2D8113F008C00875852 /* CoreFoundation.framework */,
122 536D620A1144495400DFCE56 /* SystemConfiguration.framework */,
123 93A54023123188880048BC3D /* Security.framework */,
124- 93DFFE3E135D70B60061F29F /* CoreData.framework */,
125+ 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
126 );
127 name = Frameworks;
128 sourceTree = "<group>";
129@@ -552,6 +595,18 @@
130 name = Deprecated;
131 sourceTree = "<group>";
132 };
133+ 52206B8B16550AED00A3A0A8 /* Products */ = {
134+ isa = PBXGroup;
135+ children = (
136+ 52206B9616550AEE00A3A0A8 /* libRestKit.a */,
137+ 52206B9816550AEE00A3A0A8 /* RestKitTests.octest */,
138+ 52206B9A16550AEE00A3A0A8 /* RestKit.framework */,
139+ 52206B9C16550AEE00A3A0A8 /* RestKitFrameworkTests.octest */,
140+ 52206B9E16550AEE00A3A0A8 /* RestKitResources.bundle */,
141+ );
142+ name = Products;
143+ sourceTree = "<group>";
144+ };
145 528515571604EED8004A1F7C /* Supporting Files */ = {
146 isa = PBXGroup;
147 children = (
148@@ -1134,6 +1189,10 @@
149 projectDirPath = "";
150 projectReferences = (
151 {
152+ ProductGroup = 52206B8B16550AED00A3A0A8 /* Products */;
153+ ProjectRef = 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */;
154+ },
155+ {
156 ProductGroup = 5285158F1604F16B004A1F7C /* Products */;
157 ProjectRef = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */;
158 },
159@@ -1146,6 +1205,41 @@
160 /* End PBXProject section */
161
162 /* Begin PBXReferenceProxy section */
163+ 52206B9616550AEE00A3A0A8 /* libRestKit.a */ = {
164+ isa = PBXReferenceProxy;
165+ fileType = archive.ar;
166+ path = libRestKit.a;
167+ remoteRef = 52206B9516550AEE00A3A0A8 /* PBXContainerItemProxy */;
168+ sourceTree = BUILT_PRODUCTS_DIR;
169+ };
170+ 52206B9816550AEE00A3A0A8 /* RestKitTests.octest */ = {
171+ isa = PBXReferenceProxy;
172+ fileType = wrapper.cfbundle;
173+ path = RestKitTests.octest;
174+ remoteRef = 52206B9716550AEE00A3A0A8 /* PBXContainerItemProxy */;
175+ sourceTree = BUILT_PRODUCTS_DIR;
176+ };
177+ 52206B9A16550AEE00A3A0A8 /* RestKit.framework */ = {
178+ isa = PBXReferenceProxy;
179+ fileType = wrapper.framework;
180+ path = RestKit.framework;
181+ remoteRef = 52206B9916550AEE00A3A0A8 /* PBXContainerItemProxy */;
182+ sourceTree = BUILT_PRODUCTS_DIR;
183+ };
184+ 52206B9C16550AEE00A3A0A8 /* RestKitFrameworkTests.octest */ = {
185+ isa = PBXReferenceProxy;
186+ fileType = wrapper.cfbundle;
187+ path = RestKitFrameworkTests.octest;
188+ remoteRef = 52206B9B16550AEE00A3A0A8 /* PBXContainerItemProxy */;
189+ sourceTree = BUILT_PRODUCTS_DIR;
190+ };
191+ 52206B9E16550AEE00A3A0A8 /* RestKitResources.bundle */ = {
192+ isa = PBXReferenceProxy;
193+ fileType = wrapper.cfbundle;
194+ path = RestKitResources.bundle;
195+ remoteRef = 52206B9D16550AEE00A3A0A8 /* PBXContainerItemProxy */;
196+ sourceTree = BUILT_PRODUCTS_DIR;
197+ };
198 528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */ = {
199 isa = PBXReferenceProxy;
200 fileType = archive.ar;
201@@ -1302,7 +1396,10 @@
202 GCC_PREFIX_HEADER = U1Music_Prefix.pch;
203 GCC_THUMB_SUPPORT = NO;
204 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
205- HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include";
206+ HEADER_SEARCH_PATHS = (
207+ "$(BUILT_PRODUCTS_DIR)/usr/local/include",
208+ "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"/**",
209+ );
210 INFOPLIST_FILE = "U1Music-Info.plist";
211 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
212 LIBRARY_SEARCH_PATHS = (
213@@ -1310,6 +1407,10 @@
214 "\"$(SRCROOT)/TestFlight SDK\"",
215 "$(BUILT_PRODUCTS_DIR)/**",
216 );
217+ OTHER_LDFLAGS = (
218+ "-ObjC",
219+ "-all_load",
220+ );
221 PRODUCT_NAME = "U1 Music";
222 PROVISIONING_PROFILE = "";
223 "PROVISIONING_PROFILE[sdk=*]" = "";
224@@ -1335,7 +1436,10 @@
225 GCC_PREFIX_HEADER = U1Music_Prefix.pch;
226 GCC_THUMB_SUPPORT = NO;
227 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
228- HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include";
229+ HEADER_SEARCH_PATHS = (
230+ "$(BUILT_PRODUCTS_DIR)/usr/local/include",
231+ "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"/**",
232+ );
233 INFOPLIST_FILE = "U1Music-Info.plist";
234 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
235 LIBRARY_SEARCH_PATHS = (
236@@ -1343,6 +1447,10 @@
237 "\"$(SRCROOT)/TestFlight SDK\"",
238 "$(BUILT_PRODUCTS_DIR)/**",
239 );
240+ OTHER_LDFLAGS = (
241+ "-ObjC",
242+ "-all_load",
243+ );
244 PRODUCT_NAME = "U1 Music";
245 PROVISIONING_PROFILE = "";
246 "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";

Subscribers

People subscribed via source and target branches