docker
/
Amethyst
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add a Gemfile to restrict cocoapods version 

There's a bug in cocoapods 1.0.0.beta.6 that prevents resource bundles (which are used by MASShortcut) from actually being copied in correctly, which breaks the build. Reverting down to 1.0.0.beta.5 until it's fixed.
This commit is contained in:
Ian Ynda-Hummel 2016-03-25 10:41:01 -04:00
Родитель 71c34ff498
Коммит 3ac32f2fe1
7 изменённых файлов: 159 добавлений и 61 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
.ruby-version Normal file
Просмотреть файл

@ -0,0 +1 @@
2.3.0

86
Amethyst.xcodeproj/project.pbxproj
Просмотреть файл

@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
2D18DE0C34F2BE119DAC65D8 /* Pods_Amethyst.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F823741FAE4FD854B9F9CC5B /* Pods_Amethyst.framework */; };
4008E730190C4E020049E2F6 /* AMGeneralPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4008E72F190C4E020049E2F6 /* AMGeneralPreferencesViewController.m */; };
4008E734190C4E190049E2F6 /* AMShortcutsPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4008E733190C4E190049E2F6 /* AMShortcutsPreferencesViewController.m */; };
4008E73E190D81580049E2F6 /* AMShortcutsPreferencesListItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4008E73D190D81580049E2F6 /* AMShortcutsPreferencesListItemView.m */; };
@ -57,7 +58,6 @@
40EF05921AABE5DF001FBA5B /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40EF05901AABE5D1001FBA5B /* Sparkle.framework */; };
40EF05931AABE5DF001FBA5B /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 40EF05901AABE5D1001FBA5B /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
40F48BD119D9BF8D0085453B /* NSScreen+Amethyst.m in Sources */ = {isa = PBXBuildFile; fileRef = 40F48BD019D9BF8D0085453B /* NSScreen+Amethyst.m */; };
C2F91BD6DF0BD2A6203692B4 /* Pods_AmethystTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B2CF2F4AD7F7E894A35F891 /* Pods_AmethystTests.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -161,7 +161,11 @@
40EF05901AABE5D1001FBA5B /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Carthage/Build/Mac/Sparkle.framework; sourceTree = "<group>"; };
40F48BCF19D9BF8D0085453B /* NSScreen+Amethyst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSScreen+Amethyst.h"; sourceTree = "<group>"; };
40F48BD019D9BF8D0085453B /* NSScreen+Amethyst.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSScreen+Amethyst.m"; sourceTree = "<group>"; };
822B72B694C28A1EF75FB821 /* Pods-Amethyst.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Amethyst.release.xcconfig"; path = "Pods/Target Support Files/Pods-Amethyst/Pods-Amethyst.release.xcconfig"; sourceTree = "<group>"; };
BC6A31D2564700A03F952CC5 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C659B4A3A56050DF603E88DB /* Pods_Amethyst_AmethystTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Amethyst_AmethystTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F7E2E7883BD15C48BBB55EAD /* Pods-Amethyst.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Amethyst.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Amethyst/Pods-Amethyst.debug.xcconfig"; sourceTree = "<group>"; };
F823741FAE4FD854B9F9CC5B /* Pods_Amethyst.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Amethyst.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -179,6 +183,7 @@
402DB6E21742E41A00D1C936 /* Cocoa.framework in Frameworks */,
40EF058E1AABDF85001FBA5B /* ReactiveCocoa.framework in Frameworks */,
40C3F91E1BD1B22E00F58660 /* Security.framework in Frameworks */,
2D18DE0C34F2BE119DAC65D8 /* Pods_Amethyst.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -186,7 +191,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C2F91BD6DF0BD2A6203692B4 /* Pods_AmethystTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -198,6 +202,8 @@
children = (
3665375156858D662B49C869 /* Pods-AmethystTests.debug.xcconfig */,
154FDC8E49877CD859DBF9A6 /* Pods-AmethystTests.release.xcconfig */,
F7E2E7883BD15C48BBB55EAD /* Pods-Amethyst.debug.xcconfig */,
822B72B694C28A1EF75FB821 /* Pods-Amethyst.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
@ -254,6 +260,8 @@
402DB6E31742E41A00D1C936 /* Other Frameworks */,
BC6A31D2564700A03F952CC5 /* Pods.framework */,
1B2CF2F4AD7F7E894A35F891 /* Pods_AmethystTests.framework */,
F823741FAE4FD854B9F9CC5B /* Pods_Amethyst.framework */,
C659B4A3A56050DF603E88DB /* Pods_Amethyst_AmethystTests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@ -379,6 +387,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 402DB6FB1742E41A00D1C936 /* Build configuration list for PBXNativeTarget "Amethyst" */;
buildPhases = (
0AB7FE8E894C27F271A37BA3 /* 📦 Check Pods Manifest.lock */,
4058C4701C4C4F9E00B19D26 /* ShellScript */,
408D394419C7C2B90001981F /* ShellScript */,
402DB6DA1742E41A00D1C936 /* Sources */,
@ -386,6 +395,8 @@
402DB6DC1742E41A00D1C936 /* Resources */,
40CD2F95176D0F4A00251338 /* CopyFiles */,
408D394519C7C3C40001981F /* ShellScript */,
9904A011E7DAC210C65AE6D9 /* 📦 Embed Pods Frameworks */,
1A5AD7CBB6148D73FFB6D272 /* 📦 Copy Pods Resources */,
);
buildRules = (
);
@ -400,12 +411,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 40D95B4E1C6E2ED800AAF433 /* Build configuration list for PBXNativeTarget "AmethystTests" */;
buildPhases = (
D8373E3093477B78CFF173B1 /* Check Pods Manifest.lock */,
D8373E3093477B78CFF173B1 /* 📦 Check Pods Manifest.lock */,
40D95B431C6E2ED800AAF433 /* Sources */,
40D95B441C6E2ED800AAF433 /* Frameworks */,
40D95B451C6E2ED800AAF433 /* Resources */,
A270E0B138303CE2F25D1DEC /* Embed Pods Frameworks */,
3D7F1BC5662575C036671422 /* Copy Pods Resources */,
A270E0B138303CE2F25D1DEC /* 📦 Embed Pods Frameworks */,
3D7F1BC5662575C036671422 /* 📦 Copy Pods Resources */,
);
buildRules = (
);
@ -483,19 +494,49 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
3D7F1BC5662575C036671422 /* Copy Pods Resources */ = {
0AB7FE8E894C27F271A37BA3 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AmethystTests/Pods-AmethystTests-resources.sh\"\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
1A5AD7CBB6148D73FFB6D272 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Amethyst/Pods-Amethyst-resources.sh\"\n";
showEnvVarsInLog = 0;
};
3D7F1BC5662575C036671422 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Amethyst-AmethystTests/Pods-Amethyst-AmethystTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
4058C4701C4C4F9E00B19D26 /* ShellScript */ = {
@ -537,29 +578,44 @@
shellPath = /bin/sh;
shellScript = "source ./bin/CrashlyticsKeys.sh\nif [ -n \"$CRASHLYTICS_API_KEY\" -a -n \"$CRASHLYTICS_APP_KEY\" ]; then\n ./Fabric.framework/run $CRASHLYTICS_API_KEY $CRASHLYTICS_APP_KEY\n /usr/libexec/PlistBuddy -c \"Delete Fabric:APIKey\" Amethyst/Amethyst-Info.plist\nfi\n";
};
A270E0B138303CE2F25D1DEC /* Embed Pods Frameworks */ = {
9904A011E7DAC210C65AE6D9 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AmethystTests/Pods-AmethystTests-frameworks.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Amethyst/Pods-Amethyst-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D8373E3093477B78CFF173B1 /* Check Pods Manifest.lock */ = {
A270E0B138303CE2F25D1DEC /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Amethyst-AmethystTests/Pods-Amethyst-AmethystTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D8373E3093477B78CFF173B1 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
@ -714,6 +770,7 @@
};
402DB6FC1742E41A00D1C936 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F7E2E7883BD15C48BBB55EAD /* Pods-Amethyst.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
@ -742,6 +799,7 @@
};
402DB6FD1742E41A00D1C936 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 822B72B694C28A1EF75FB821 /* Pods-Amethyst.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
@ -769,7 +827,6 @@
};
40D95B4F1C6E2ED800AAF433 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3665375156858D662B49C869 /* Pods-AmethystTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_WARN_BOOL_CONVERSION = YES;
@ -798,7 +855,6 @@
};
40D95B501C6E2ED800AAF433 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 154FDC8E49877CD859DBF9A6 /* Pods-AmethystTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_WARN_BOOL_CONVERSION = YES;

36
Amethyst.xcodeproj/xcshareddata/xcschemes/Amethyst.xcscheme
Просмотреть файл

@ -3,7 +3,7 @@
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
parallelizeBuildables = "NO"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
@ -14,40 +14,12 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7E67B5206E57AD05F77BAE03C0847409"
BuildableName = "Pods.framework"
BlueprintName = "Pods"
BlueprintIdentifier = "DD613904C77DB34467C0830F559AC993"
BuildableName = "Pods_Amethyst.framework"
BlueprintName = "Pods-Amethyst"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6C04C0C95A0379357C972685994914D8"
BuildableName = "Pods_AmethystTests.framework"
BlueprintName = "Pods-AmethystTests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
BuildableName = "Sparkle.framework"
BlueprintName = "Sparkle"
ReferencedContainer = "container:Sparkle/Sparkle.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"

3
Gemfile Normal file
Просмотреть файл

@ -0,0 +1,3 @@
source 'http://rubygems.org'
gem 'cocoapods', '1.0.0.beta.5'

67
Gemfile.lock Normal file
Просмотреть файл

@ -0,0 +1,67 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.0.beta.3)
cocoapods (1.0.0.beta.5)
activesupport (>= 4.0.2)
claide (>= 1.0.0.beta.2, < 2.0)
cocoapods-core (= 1.0.0.beta.5)
cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0)
cocoapods-downloader (>= 1.0.0.beta.1, < 2.0)
cocoapods-plugins (>= 1.0.0.beta.1, < 2.0)
cocoapods-search (>= 1.0.0.beta.1, < 2.0)
cocoapods-stats (>= 1.0.0.beta.3, < 2.0)
cocoapods-trunk (>= 1.0.0.beta.2, < 2.0)
cocoapods-try (>= 1.0.0.beta.2, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 0.3.0)
molinillo (~> 0.4.4)
nap (~> 1.0)
xcodeproj (>= 1.0.0.beta.3, < 2.0)
cocoapods-core (1.0.0.beta.5)
activesupport (>= 4.0.2)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.0.beta.1)
cocoapods-downloader (1.0.0.beta.2)
cocoapods-plugins (1.0.0.beta.1)
nap
cocoapods-search (1.0.0.beta.1)
cocoapods-stats (1.0.0.beta.3)
cocoapods-trunk (1.0.0.beta.2)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.0.0.beta.3)
colored (1.2)
escape (0.0.4)
fourflusher (0.3.0)
fuzzy_match (2.0.4)
i18n (0.7.0)
json (1.8.3)
minitest (5.8.4)
molinillo (0.4.4)
nap (1.1.0)
netrc (0.7.8)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (1.0.0.beta.3)
activesupport (>= 3)
claide (>= 1.0.0.beta.1, < 2.0)
colored (~> 1.2)
PLATFORMS
ruby
DEPENDENCIES
cocoapods (= 1.0.0.beta.5)
BUNDLED WITH
1.11.2

17
Podfile
Просмотреть файл

@ -2,13 +2,12 @@ platform :osx, '10.10'
use_frameworks!
pod 'CCNLaunchAtLoginItem', '~> 0.1'
pod 'CCNPreferencesWindowController', git: 'https://github.com/phranck/CCNPreferencesWindowController'
pod 'CocoaLumberjack', '=2.0.0-beta'
pod 'MASShortcut', :git => 'https://github.com/ianyh/MASShortcut'
pod 'Masonry'
pod 'Silica', :git => 'https://github.com/ianyh/Silica'
pod 'SwiftyJSON'
target :AmethystTests do
target 'Amethyst' do
pod 'CCNLaunchAtLoginItem', '~> 0.1'
pod 'CCNPreferencesWindowController', git: 'https://github.com/phranck/CCNPreferencesWindowController'
pod 'CocoaLumberjack', '=2.0.0-beta'
pod 'MASShortcut', :git => 'https://github.com/ianyh/MASShortcut'
pod 'Masonry'
pod 'Silica', :git => 'https://github.com/ianyh/Silica'
pod 'SwiftyJSON'
end

10
Podfile.lock
Просмотреть файл

@ -11,7 +11,7 @@ PODS:
- CocoaLumberjack/Extensions (2.0.0-beta):
- CocoaLumberjack/Core
- Masonry (0.6.1)
- MASShortcut (2.3.2)
- MASShortcut (2.3.3)
- Silica (0.1.4)
- SwiftyJSON (2.3.2)
@ -37,7 +37,7 @@ CHECKOUT OPTIONS:
:commit: bd9d7967772cefefe9154d2b16d93b9a305f1c72
:git: https://github.com/phranck/CCNPreferencesWindowController
MASShortcut:
:commit: d70129eebebb2249a27bfbac8019c8a93a51c08a
:commit: 19299541f9912aa7bce65e4f851dba1b1acaf7ea
:git: https://github.com/ianyh/MASShortcut
Silica:
:commit: a73415cd79ccee6e7c3dcb87ecf5d9889a6d85d2
@ -48,10 +48,10 @@ SPEC CHECKSUMS:
CCNPreferencesWindowController: 78ed2e3fc54207496c410196cba721f82eea7fc1
CocoaLumberjack: 7dbecb93eeec8dcc4fbbdb6fc77b8b64d9e77d0a
Masonry: 4972309f2f134de9dd312f4dc4a21359b50e6caa
MASShortcut: a816834091659aca3ad6a309f44ae16d25a7fef6
MASShortcut: b00fe4e734d5c965e73c823c8f4630421e46d456
Silica: 8434165d6cc5f853e8434118e49bad5da85f080e
SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
PODFILE CHECKSUM: cf9bb9de50f320a621ecc7c623fb88b39361149e
PODFILE CHECKSUM: 59394f697eece1a574b0c4fb04fbd6644d36ec48
COCOAPODS: 1.0.0.beta.3
COCOAPODS: 1.0.0.beta.5