Skip to content

Commit 81a1423

Browse files
macmademacmade
committed
Updates from GitHub
1 parent a26394c commit 81a1423

File tree

6 files changed

+136
-4
lines changed

6 files changed

+136
-4
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "Submodules/xcconfig"]
22
path = Submodules/xcconfig
33
url = https://github.com/DigiDNA/xcconfig.git
4+
[submodule "Submodules/GitHubUpdates"]
5+
path = Submodules/GitHubUpdates
6+
url = https://github.com/macmade/GitHubUpdates.git

‎ColorSet.xcodeproj/project.pbxproj‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
0509117B20E50608009EF90C /* ColorSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 0509117A20E50608009EF90C /* ColorSet.m */; };
1111
0509117E20E5065C009EF90C /* ColorPair.m in Sources */ = {isa = PBXBuildFile; fileRef = 0509117C20E5065C009EF90C /* ColorPair.m */; };
1212
050911A420E52272009EF90C /* ColorSetStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 050911A320E52272009EF90C /* ColorSetStream.m */; };
13+
0509121520E55A7F009EF90C /* GitHubUpdates.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0509120F20E55A6A009EF90C /* GitHubUpdates.framework */; };
14+
0509121720E55A93009EF90C /* GitHubUpdates.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0509120F20E55A6A009EF90C /* GitHubUpdates.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1315
0530C41F20E10FEA00F5B259 /* ArrayIsEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0530C41E20E10FEA00F5B259 /* ArrayIsEmpty.swift */; };
1416
0530C42120E1112C00F5B259 /* ArrayIsNotEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0530C42020E1112C00F5B259 /* ArrayIsNotEmpty.swift */; };
1517
0530C42320E1213500F5B259 /* NSView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0530C42220E1213500F5B259 /* NSView.swift */; };
@@ -28,6 +30,43 @@
2830
05D11ECE20E165FB00A621B5 /* File.icns in Resources */ = {isa = PBXBuildFile; fileRef = 05D11ECD20E165FB00A621B5 /* File.icns */; };
2931
/* End PBXBuildFile section */
3032

33+
/* Begin PBXContainerItemProxy section */
34+
0509120E20E55A6A009EF90C /* PBXContainerItemProxy */ = {
35+
isa = PBXContainerItemProxy;
36+
containerPortal = 0509120920E55A6A009EF90C /* GitHubUpdates.xcodeproj */;
37+
proxyType = 2;
38+
remoteGlobalIDString = 05F82B251EF32EA700EC8A93;
39+
remoteInfo = GitHubUpdates;
40+
};
41+
0509121020E55A6A009EF90C /* PBXContainerItemProxy */ = {
42+
isa = PBXContainerItemProxy;
43+
containerPortal = 0509120920E55A6A009EF90C /* GitHubUpdates.xcodeproj */;
44+
proxyType = 2;
45+
remoteGlobalIDString = 0555EBA01EF3DDA10016167F;
46+
remoteInfo = Relauncher;
47+
};
48+
0509121220E55A7B009EF90C /* PBXContainerItemProxy */ = {
49+
isa = PBXContainerItemProxy;
50+
containerPortal = 0509120920E55A6A009EF90C /* GitHubUpdates.xcodeproj */;
51+
proxyType = 1;
52+
remoteGlobalIDString = 05F82B241EF32EA700EC8A93;
53+
remoteInfo = GitHubUpdates;
54+
};
55+
/* End PBXContainerItemProxy section */
56+
57+
/* Begin PBXCopyFilesBuildPhase section */
58+
0509121620E55A8A009EF90C /* CopyFiles */ = {
59+
isa = PBXCopyFilesBuildPhase;
60+
buildActionMask = 2147483647;
61+
dstPath = "";
62+
dstSubfolderSpec = 10;
63+
files = (
64+
0509121720E55A93009EF90C /* GitHubUpdates.framework in CopyFiles */,
65+
);
66+
runOnlyForDeploymentPostprocessing = 0;
67+
};
68+
/* End PBXCopyFilesBuildPhase section */
69+
3170
/* Begin PBXFileReference section */
3271
0509117920E50608009EF90C /* ColorSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ColorSet.h; sourceTree = "<group>"; };
3372
0509117A20E50608009EF90C /* ColorSet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ColorSet.m; sourceTree = "<group>"; };
@@ -76,6 +115,7 @@
76115
0509120520E559CF009EF90C /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
77116
0509120720E559CF009EF90C /* ccache-config.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "ccache-config.sh"; sourceTree = "<group>"; };
78117
0509120820E559CF009EF90C /* ccache.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ccache.sh; sourceTree = "<group>"; };
118+
0509120920E55A6A009EF90C /* GitHubUpdates.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GitHubUpdates.xcodeproj; path = Submodules/GitHubUpdates/GitHubUpdates.xcodeproj; sourceTree = "<group>"; };
79119
0530C41E20E10FEA00F5B259 /* ArrayIsEmpty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayIsEmpty.swift; sourceTree = "<group>"; };
80120
0530C42020E1112C00F5B259 /* ArrayIsNotEmpty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayIsNotEmpty.swift; sourceTree = "<group>"; };
81121
0530C42220E1213500F5B259 /* NSView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSView.swift; sourceTree = "<group>"; };
@@ -104,6 +144,7 @@
104144
isa = PBXFrameworksBuildPhase;
105145
buildActionMask = 2147483647;
106146
files = (
147+
0509121520E55A7F009EF90C /* GitHubUpdates.framework in Frameworks */,
107148
);
108149
runOnlyForDeploymentPostprocessing = 0;
109150
};
@@ -223,12 +264,30 @@
223264
path = Scripts;
224265
sourceTree = "<group>";
225266
};
267+
0509120A20E55A6A009EF90C /* Products */ = {
268+
isa = PBXGroup;
269+
children = (
270+
0509120F20E55A6A009EF90C /* GitHubUpdates.framework */,
271+
0509121120E55A6A009EF90C /* Relauncher */,
272+
);
273+
name = Products;
274+
sourceTree = "<group>";
275+
};
276+
0509121420E55A7F009EF90C /* Frameworks */ = {
277+
isa = PBXGroup;
278+
children = (
279+
);
280+
name = Frameworks;
281+
sourceTree = "<group>";
282+
};
226283
0543AE5920DC33BC00284E99 = {
227284
isa = PBXGroup;
228285
children = (
286+
0509120920E55A6A009EF90C /* GitHubUpdates.xcodeproj */,
229287
050911D720E559CF009EF90C /* xcconfig */,
230288
0543AE6420DC33BC00284E99 /* ColorSet */,
231289
0543AE6320DC33BC00284E99 /* Products */,
290+
0509121420E55A7F009EF90C /* Frameworks */,
232291
);
233292
sourceTree = "<group>";
234293
};
@@ -298,11 +357,14 @@
298357
buildPhases = (
299358
0543AE5E20DC33BC00284E99 /* Sources */,
300359
0543AE5F20DC33BC00284E99 /* Frameworks */,
360+
0509122120E55AE4009EF90C /* ShellScript */,
301361
0543AE6020DC33BC00284E99 /* Resources */,
362+
0509121620E55A8A009EF90C /* CopyFiles */,
302363
);
303364
buildRules = (
304365
);
305366
dependencies = (
367+
0509121320E55A7B009EF90C /* PBXTargetDependency */,
306368
);
307369
name = ColorSet;
308370
productName = ColorSet;
@@ -341,13 +403,36 @@
341403
mainGroup = 0543AE5920DC33BC00284E99;
342404
productRefGroup = 0543AE6320DC33BC00284E99 /* Products */;
343405
projectDirPath = "";
406+
projectReferences = (
407+
{
408+
ProductGroup = 0509120A20E55A6A009EF90C /* Products */;
409+
ProjectRef = 0509120920E55A6A009EF90C /* GitHubUpdates.xcodeproj */;
410+
},
411+
);
344412
projectRoot = "";
345413
targets = (
346414
0543AE6120DC33BC00284E99 /* ColorSet */,
347415
);
348416
};
349417
/* End PBXProject section */
350418

419+
/* Begin PBXReferenceProxy section */
420+
0509120F20E55A6A009EF90C /* GitHubUpdates.framework */ = {
421+
isa = PBXReferenceProxy;
422+
fileType = wrapper.framework;
423+
path = GitHubUpdates.framework;
424+
remoteRef = 0509120E20E55A6A009EF90C /* PBXContainerItemProxy */;
425+
sourceTree = BUILT_PRODUCTS_DIR;
426+
};
427+
0509121120E55A6A009EF90C /* Relauncher */ = {
428+
isa = PBXReferenceProxy;
429+
fileType = "compiled.mach-o.executable";
430+
path = Relauncher;
431+
remoteRef = 0509121020E55A6A009EF90C /* PBXContainerItemProxy */;
432+
sourceTree = BUILT_PRODUCTS_DIR;
433+
};
434+
/* End PBXReferenceProxy section */
435+
351436
/* Begin PBXResourcesBuildPhase section */
352437
0543AE6020DC33BC00284E99 /* Resources */ = {
353438
isa = PBXResourcesBuildPhase;
@@ -363,6 +448,26 @@
363448
};
364449
/* End PBXResourcesBuildPhase section */
365450

451+
/* Begin PBXShellScriptBuildPhase section */
452+
0509122120E55AE4009EF90C /* ShellScript */ = {
453+
isa = PBXShellScriptBuildPhase;
454+
buildActionMask = 2147483647;
455+
files = (
456+
);
457+
inputFileListPaths = (
458+
);
459+
inputPaths = (
460+
);
461+
outputFileListPaths = (
462+
);
463+
outputPaths = (
464+
);
465+
runOnlyForDeploymentPostprocessing = 0;
466+
shellPath = /bin/sh;
467+
shellScript = "#!/bin/bash\nif [ \"${CONFIGURATION}\" = \"Release\" ]; then\n plist=\"ColorSet/Info.plist\"\n rev=$(git rev-list `git branch | grep -e \"^*\" | cut -d' ' -f 2` | wc -l)\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $rev\" \"$plist\"\nfi\n";
468+
};
469+
/* End PBXShellScriptBuildPhase section */
470+
366471
/* Begin PBXSourcesBuildPhase section */
367472
0543AE5E20DC33BC00284E99 /* Sources */ = {
368473
isa = PBXSourcesBuildPhase;
@@ -387,6 +492,14 @@
387492
};
388493
/* End PBXSourcesBuildPhase section */
389494

495+
/* Begin PBXTargetDependency section */
496+
0509121320E55A7B009EF90C /* PBXTargetDependency */ = {
497+
isa = PBXTargetDependency;
498+
name = GitHubUpdates;
499+
targetProxy = 0509121220E55A7B009EF90C /* PBXContainerItemProxy */;
500+
};
501+
/* End PBXTargetDependency section */
502+
390503
/* Begin PBXVariantGroup section */
391504
0543AE7720DC33DF00284E99 /* MainMenu.xib */ = {
392505
isa = PBXVariantGroup;

‎ColorSet/ColorSet.entitlements‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
<true/>
77
<key>com.apple.security.files.user-selected.read-write</key>
88
<true/>
9+
<key>com.apple.security.network.client</key>
10+
<true/>
911
</dict>
1012
</plist>

‎ColorSet/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<key>CFBundlePackageType</key>
3939
<string>APPL</string>
4040
<key>CFBundleShortVersionString</key>
41-
<string>1.0</string>
41+
<string>1.0.0</string>
4242
<key>CFBundleVersion</key>
43-
<string>1</string>
43+
<string>14</string>
4444
<key>LSMinimumSystemVersion</key>
4545
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
4646
<key>NSHumanReadableCopyright</key>

‎ColorSet/Interface/Base.lproj/MainMenu.xib‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.14"/>
66
</dependencies>
77
<objects>
88
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -28,6 +28,13 @@
2828
</menuItem>
2929
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
3030
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
31+
<menuItem isSeparatorItem="YES" id="131-ZC-Tm0"/>
32+
<menuItem title="Check for Updates..." id="ulI-oZ-oZE">
33+
<modifierMask key="keyEquivalentModifierMask"/>
34+
<connections>
35+
<action selector="checkForUpdates:" target="Uwj-E6-Thg" id="VbG-tH-N46"/>
36+
</connections>
37+
</menuItem>
3138
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
3239
<menuItem title="Services" id="NMo-om-nkz">
3340
<modifierMask key="keyEquivalentModifierMask"/>
@@ -687,5 +694,11 @@
687694
</menuItem>
688695
</items>
689696
</menu>
697+
<customObject id="Uwj-E6-Thg" customClass="GitHubUpdater">
698+
<userDefinedRuntimeAttributes>
699+
<userDefinedRuntimeAttribute type="string" keyPath="user" value="DigiDNA"/>
700+
<userDefinedRuntimeAttribute type="string" keyPath="repository" value="ColorSet"/>
701+
</userDefinedRuntimeAttributes>
702+
</customObject>
690703
</objects>
691704
</document>

‎Submodules/GitHubUpdates‎

Submodule GitHubUpdates added at 4dfc848

0 commit comments

Comments
 (0)