Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 20c8ca9

Browse files
snejsnej
committed
Changed bundle ID. Updated to using xcassets file for icons.
1 parent a298e30 commit 20c8ca9

File tree

17 files changed

+149
-33
lines changed

17 files changed

+149
-33
lines changed

‎AppIcon.icns‎

-49.4 KB
Binary file not shown.

‎Couchbase Lite Viewer.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2733A75A1BD6DF7B00F0FF07 /* database2.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2733A7591BD6DF7B00F0FF07 /* database2.icns */; };
1110
2733A75D1BD70E5600F0FF07 /* JSONItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 2733A75C1BD70E5600F0FF07 /* JSONItem.m */; };
1211
274789FF15F97520006E842D /* URLFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 274789FE15F97520006E842D /* URLFormatter.m */; };
1312
27538FA517F28B31004C3BFD /* CouchbaseLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27538FA417F28B31004C3BFD /* CouchbaseLite.framework */; };
1413
27538FA617F29303004C3BFD /* CouchbaseLite.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 27538FA417F28B31004C3BFD /* CouchbaseLite.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1514
27538FA917F34C09004C3BFD /* AppList.m in Sources */ = {isa = PBXBuildFile; fileRef = 27538FA817F34C09004C3BFD /* AppList.m */; };
1615
27538FAF17F3607C004C3BFD /* AppListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27538FAD17F3607C004C3BFD /* AppListController.m */; };
1716
27538FB017F3607C004C3BFD /* AppListController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 27538FAE17F3607C004C3BFD /* AppListController.xib */; };
18-
27557B2317F38DF100F28764 /* ios_app.png in Resources */ = {isa = PBXBuildFile; fileRef = 27557B2217F38DF100F28764 /* ios_app.png */; };
1917
2765CF7815544FAA0087D810 /* DocEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2765CF7715544FAA0087D810 /* DocEditor.m */; };
2018
276AA6C21BD846CD00973893 /* JSONKeyFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 276AA6C11BD846CD00973893 /* JSONKeyFormatter.m */; };
2119
278B0C6F152A64A900577747 /* DBDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 278B0C6D152A64A900577747 /* DBDocument.m */; };
22-
278B0C72152A6B7C00577747 /* DBDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 278B0C71152A6B7C00577747 /* DBDoc.icns */; };
2320
278C85B81554810D0016C7A4 /* JSONFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 278C85B71554810D0016C7A4 /* JSONFormatter.m */; };
2421
27A8A777152A008200363704 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A8A776152A008200363704 /* Cocoa.framework */; };
2522
27A8A781152A008200363704 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 27A8A77F152A008200363704 /* InfoPlist.strings */; };
@@ -29,11 +26,11 @@
2926
27A8A78D152A008200363704 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 27A8A78B152A008200363704 /* MainMenu.xib */; };
3027
27A8A79A152A01FF00363704 /* DBWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A8A798152A01FF00363704 /* DBWindowController.m */; };
3128
27A8A79B152A01FF00363704 /* DBWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 27A8A799152A01FF00363704 /* DBWindowController.xib */; };
29+
27DC377C1BDE8BAB00734E82 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 27DC377B1BDE8BAB00734E82 /* Images.xcassets */; };
30+
27DC377E1BDE8EC100734E82 /* DBDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 27DC377D1BDE8EC100734E82 /* DBDoc.icns */; };
3231
27F3A62D15EE70B300263663 /* DocHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F3A62C15EE70B300263663 /* DocHistory.m */; };
3332
27F3A63015EE98C100263663 /* QueryResultController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F3A62F15EE98C100263663 /* QueryResultController.m */; };
3433
27F3A63315EEA06900263663 /* RevTreeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F3A63215EEA06900263663 /* RevTreeController.m */; };
35-
27F3A63B15F0095800263663 /* database.icns in Resources */ = {isa = PBXBuildFile; fileRef = 27F3A63A15F0095800263663 /* database.icns */; };
36-
27F87AFC1555E7FD00F0A416 /* AppIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 27F87AFB1555E7FC00F0A416 /* AppIcon.icns */; };
3734
/* End PBXBuildFile section */
3835

3936
/* Begin PBXCopyFilesBuildPhase section */
@@ -51,7 +48,6 @@
5148
/* End PBXCopyFilesBuildPhase section */
5249

5350
/* Begin PBXFileReference section */
54-
2733A7591BD6DF7B00F0FF07 /* database2.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = database2.icns; sourceTree = "<group>"; };
5551
2733A75B1BD70E5600F0FF07 /* JSONItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONItem.h; sourceTree = "<group>"; };
5652
2733A75C1BD70E5600F0FF07 /* JSONItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONItem.m; sourceTree = "<group>"; };
5753
274789FD15F97520006E842D /* URLFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLFormatter.h; sourceTree = "<group>"; };
@@ -62,14 +58,12 @@
6258
27538FAC17F3607C004C3BFD /* AppListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppListController.h; sourceTree = "<group>"; };
6359
27538FAD17F3607C004C3BFD /* AppListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppListController.m; sourceTree = "<group>"; };
6460
27538FAE17F3607C004C3BFD /* AppListController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AppListController.xib; sourceTree = "<group>"; };
65-
27557B2217F38DF100F28764 /* ios_app.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ios_app.png; sourceTree = "<group>"; };
6661
2765CF7615544FAA0087D810 /* DocEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocEditor.h; sourceTree = "<group>"; };
6762
2765CF7715544FAA0087D810 /* DocEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DocEditor.m; sourceTree = "<group>"; };
6863
276AA6C01BD846CD00973893 /* JSONKeyFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONKeyFormatter.h; sourceTree = "<group>"; };
6964
276AA6C11BD846CD00973893 /* JSONKeyFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONKeyFormatter.m; sourceTree = "<group>"; };
7065
278B0C6C152A64A900577747 /* DBDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBDocument.h; sourceTree = "<group>"; };
7166
278B0C6D152A64A900577747 /* DBDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBDocument.m; sourceTree = "<group>"; };
72-
278B0C71152A6B7C00577747 /* DBDoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = DBDoc.icns; sourceTree = "<group>"; };
7367
278C85B61554810D0016C7A4 /* JSONFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONFormatter.h; sourceTree = "<group>"; };
7468
278C85B71554810D0016C7A4 /* JSONFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONFormatter.m; sourceTree = "<group>"; };
7569
27A8A772152A008200363704 /* Couchbase Lite Viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Couchbase Lite Viewer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -88,14 +82,14 @@
8882
27A8A797152A01FF00363704 /* DBWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBWindowController.h; sourceTree = "<group>"; };
8983
27A8A798152A01FF00363704 /* DBWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBWindowController.m; sourceTree = "<group>"; };
9084
27A8A799152A01FF00363704 /* DBWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DBWindowController.xib; sourceTree = "<group>"; };
85+
27DC377B1BDE8BAB00734E82 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "Couchbase Lite Viewer/Images.xcassets"; sourceTree = SOURCE_ROOT; };
86+
27DC377D1BDE8EC100734E82 /* DBDoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = DBDoc.icns; path = "Couchbase Lite Viewer/DBDoc.icns"; sourceTree = SOURCE_ROOT; };
9187
27F3A62B15EE70B300263663 /* DocHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocHistory.h; sourceTree = "<group>"; };
9288
27F3A62C15EE70B300263663 /* DocHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DocHistory.m; sourceTree = "<group>"; };
9389
27F3A62E15EE98C000263663 /* QueryResultController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryResultController.h; sourceTree = "<group>"; };
9490
27F3A62F15EE98C100263663 /* QueryResultController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryResultController.m; sourceTree = "<group>"; };
9591
27F3A63115EEA06900263663 /* RevTreeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RevTreeController.h; sourceTree = "<group>"; };
9692
27F3A63215EEA06900263663 /* RevTreeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RevTreeController.m; sourceTree = "<group>"; };
97-
27F3A63A15F0095800263663 /* database.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = database.icns; sourceTree = "<group>"; };
98-
27F87AFB1555E7FC00F0A416 /* AppIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = AppIcon.icns; path = ../AppIcon.icns; sourceTree = "<group>"; };
9993
27F87AFD1555EC5000F0A416 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
10094
/* End PBXFileReference section */
10195

@@ -168,11 +162,8 @@
168162
27A8A77D152A008200363704 /* Supporting Files */ = {
169163
isa = PBXGroup;
170164
children = (
171-
27F87AFB1555E7FC00F0A416 /* AppIcon.icns */,
172-
278B0C71152A6B7C00577747 /* DBDoc.icns */,
173-
27F3A63A15F0095800263663 /* database.icns */,
174-
2733A7591BD6DF7B00F0FF07 /* database2.icns */,
175-
27557B2217F38DF100F28764 /* ios_app.png */,
165+
27DC377B1BDE8BAB00734E82 /* Images.xcassets */,
166+
27DC377D1BDE8EC100734E82 /* DBDoc.icns */,
176167
27A8A77E152A008200363704 /* Couchbase Lite Viewer-Info.plist */,
177168
27A8A77F152A008200363704 /* InfoPlist.strings */,
178169
27A8A782152A008200363704 /* main.m */,
@@ -289,12 +280,9 @@
289280
27A8A781152A008200363704 /* InfoPlist.strings in Resources */,
290281
27A8A787152A008200363704 /* Credits.rtf in Resources */,
291282
27A8A78D152A008200363704 /* MainMenu.xib in Resources */,
283+
27DC377E1BDE8EC100734E82 /* DBDoc.icns in Resources */,
292284
27A8A79B152A01FF00363704 /* DBWindowController.xib in Resources */,
293-
27557B2317F38DF100F28764 /* ios_app.png in Resources */,
294-
278B0C72152A6B7C00577747 /* DBDoc.icns in Resources */,
295-
27F87AFC1555E7FD00F0A416 /* AppIcon.icns in Resources */,
296-
27F3A63B15F0095800263663 /* database.icns in Resources */,
297-
2733A75A1BD6DF7B00F0FF07 /* database2.icns in Resources */,
285+
27DC377C1BDE8BAB00734E82 /* Images.xcassets in Resources */,
298286
27538FB017F3607C004C3BFD /* AppListController.xib in Resources */,
299287
);
300288
runOnlyForDeploymentPostprocessing = 0;
@@ -371,7 +359,7 @@
371359
CLANG_WARN_UNREACHABLE_CODE = YES;
372360
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
373361
COPY_PHASE_STRIP = NO;
374-
CURRENT_PROJECT_VERSION = 0.6;
362+
CURRENT_PROJECT_VERSION = 0.61;
375363
ENABLE_STRICT_OBJC_MSGSEND = YES;
376364
ENABLE_TESTABILITY = YES;
377365
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -426,7 +414,7 @@
426414
CLANG_WARN_UNREACHABLE_CODE = YES;
427415
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
428416
COPY_PHASE_STRIP = YES;
429-
CURRENT_PROJECT_VERSION = 0.6;
417+
CURRENT_PROJECT_VERSION = 0.61;
430418
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
431419
ENABLE_STRICT_OBJC_MSGSEND = YES;
432420
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -458,9 +446,10 @@
458446
27A8A791152A008200363704 /* Debug */ = {
459447
isa = XCBuildConfiguration;
460448
buildSettings = {
449+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
461450
CLANG_ENABLE_OBJC_ARC = YES;
462-
CODE_SIGN_IDENTITY = "Developer ID Application";
463-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
451+
CODE_SIGN_IDENTITY = "";
452+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "";
464453
COMBINE_HIDPI_IMAGES = YES;
465454
FRAMEWORK_SEARCH_PATHS = (
466455
"$(inherited)",
@@ -472,7 +461,7 @@
472461
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks/";
473462
MACOSX_DEPLOYMENT_TARGET = 10.9;
474463
OTHER_CODE_SIGN_FLAGS = "--deep";
475-
PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.${PRODUCT_NAME:rfc1034identifier}";
464+
PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.cblite-viewer";
476465
PRODUCT_NAME = "Couchbase Lite Viewer";
477466
PROVISIONING_PROFILE = "";
478467
WRAPPER_EXTENSION = app;
@@ -482,9 +471,10 @@
482471
27A8A792152A008200363704 /* Release */ = {
483472
isa = XCBuildConfiguration;
484473
buildSettings = {
474+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
485475
CLANG_ENABLE_OBJC_ARC = YES;
486-
CODE_SIGN_IDENTITY = "Developer ID Application";
487-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
476+
CODE_SIGN_IDENTITY = "";
477+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "";
488478
COMBINE_HIDPI_IMAGES = YES;
489479
FRAMEWORK_SEARCH_PATHS = (
490480
"$(inherited)",
@@ -496,7 +486,7 @@
496486
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks/";
497487
MACOSX_DEPLOYMENT_TARGET = 10.9;
498488
OTHER_CODE_SIGN_FLAGS = "--deep";
499-
PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.${PRODUCT_NAME:rfc1034identifier}";
489+
PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.cblite-viewer";
500490
PRODUCT_NAME = "Couchbase Lite Viewer";
501491
PROVISIONING_PROFILE = "";
502492
WRAPPER_EXTENSION = app;

‎Source/DBDoc.icns‎ renamed to ‎Couchbase Lite Viewer/DBDoc.icns‎

File renamed without changes.

‎Couchbase Lite Viewer/Images.xcassets/AppIcon.appiconset/AppIcon128x128.png‎

20.7 KB
Loading

‎Couchbase Lite Viewer/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "mac",
5+
"scale" : "1x",
6+
"size" : "16x16"
7+
},
8+
{
9+
"idiom" : "mac",
10+
"scale" : "2x",
11+
"size" : "16x16"
12+
},
13+
{
14+
"idiom" : "mac",
15+
"scale" : "1x",
16+
"size" : "32x32"
17+
},
18+
{
19+
"idiom" : "mac",
20+
"scale" : "2x",
21+
"size" : "32x32"
22+
},
23+
{
24+
"size" : "128x128",
25+
"idiom" : "mac",
26+
"filename" : "AppIcon128x128.png",
27+
"scale" : "1x"
28+
},
29+
{
30+
"idiom" : "mac",
31+
"scale" : "2x",
32+
"size" : "128x128"
33+
},
34+
{
35+
"idiom" : "mac",
36+
"scale" : "1x",
37+
"size" : "256x256"
38+
},
39+
{
40+
"idiom" : "mac",
41+
"scale" : "2x",
42+
"size" : "256x256"
43+
},
44+
{
45+
"idiom" : "mac",
46+
"scale" : "1x",
47+
"size" : "512x512"
48+
},
49+
{
50+
"idiom" : "mac",
51+
"scale" : "2x",
52+
"size" : "512x512"
53+
}
54+
],
55+
"info" : {
56+
"version" : 1,
57+
"author" : "xcode"
58+
}
59+
}

‎Couchbase Lite Viewer/Images.xcassets/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎Couchbase Lite Viewer/Images.xcassets/database.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "database.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Couchbase Lite Viewer/Images.xcassets/database.imageset/database.png‎

9.02 KB
Loading

‎Couchbase Lite Viewer/Images.xcassets/database2.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "database2.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Couchbase Lite Viewer/Images.xcassets/database2.imageset/database2.png‎

18.5 KB
Loading

0 commit comments

Comments
 (0)