Skip to content

Commit b98e566

Browse files
deszipdeszip
authored
Merge pull request #4 from deszip/develop
v0.3
2 parents 571d471 + 7cfaa4e commit b98e566

File tree

371 files changed

+12018
-1278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

371 files changed

+12018
-1278
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Breakpoints_v2.xcbkptlist

‎Bitrise.xcodeproj/project.pbxproj‎

Lines changed: 84 additions & 20 deletions
Large diffs are not rendered by default.

‎Bitrise.xcodeproj/xcshareddata/xcschemes/Bitrise.xcscheme‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "0E42CAD420EC7A7E0033CD03"
18+
BuildableName = "Bitrise.app"
19+
BlueprintName = "Bitrise"
20+
ReferencedContainer = "container:Bitrise.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
codeCoverageEnabled = "YES"
30+
onlyGenerateCoverageForSpecifiedTargets = "YES"
31+
shouldUseLaunchSchemeArgsEnv = "YES">
32+
<CodeCoverageTargets>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "0E42CAD420EC7A7E0033CD03"
36+
BuildableName = "Bitrise.app"
37+
BlueprintName = "Bitrise"
38+
ReferencedContainer = "container:Bitrise.xcodeproj">
39+
</BuildableReference>
40+
</CodeCoverageTargets>
41+
<Testables>
42+
<TestableReference
43+
skipped = "NO">
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "0E42CAEA20EC7A800033CD03"
47+
BuildableName = "BitriseTests.xctest"
48+
BlueprintName = "BitriseTests"
49+
ReferencedContainer = "container:Bitrise.xcodeproj">
50+
</BuildableReference>
51+
</TestableReference>
52+
</Testables>
53+
<MacroExpansion>
54+
<BuildableReference
55+
BuildableIdentifier = "primary"
56+
BlueprintIdentifier = "0E42CAD420EC7A7E0033CD03"
57+
BuildableName = "Bitrise.app"
58+
BlueprintName = "Bitrise"
59+
ReferencedContainer = "container:Bitrise.xcodeproj">
60+
</BuildableReference>
61+
</MacroExpansion>
62+
<AdditionalOptions>
63+
</AdditionalOptions>
64+
</TestAction>
65+
<LaunchAction
66+
buildConfiguration = "Debug"
67+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
68+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69+
launchStyle = "0"
70+
useCustomWorkingDirectory = "NO"
71+
ignoresPersistentStateOnLaunch = "NO"
72+
debugDocumentVersioning = "YES"
73+
debugServiceExtension = "internal"
74+
allowLocationSimulation = "YES">
75+
<BuildableProductRunnable
76+
runnableDebuggingMode = "0">
77+
<BuildableReference
78+
BuildableIdentifier = "primary"
79+
BlueprintIdentifier = "0E42CAD420EC7A7E0033CD03"
80+
BuildableName = "Bitrise.app"
81+
BlueprintName = "Bitrise"
82+
ReferencedContainer = "container:Bitrise.xcodeproj">
83+
</BuildableReference>
84+
</BuildableProductRunnable>
85+
<AdditionalOptions>
86+
</AdditionalOptions>
87+
</LaunchAction>
88+
<ProfileAction
89+
buildConfiguration = "Release"
90+
shouldUseLaunchSchemeArgsEnv = "YES"
91+
savedToolIdentifier = ""
92+
useCustomWorkingDirectory = "NO"
93+
debugDocumentVersioning = "YES">
94+
<BuildableProductRunnable
95+
runnableDebuggingMode = "0">
96+
<BuildableReference
97+
BuildableIdentifier = "primary"
98+
BlueprintIdentifier = "0E42CAD420EC7A7E0033CD03"
99+
BuildableName = "Bitrise.app"
100+
BlueprintName = "Bitrise"
101+
ReferencedContainer = "container:Bitrise.xcodeproj">
102+
</BuildableReference>
103+
</BuildableProductRunnable>
104+
</ProfileAction>
105+
<AnalyzeAction
106+
buildConfiguration = "Debug">
107+
</AnalyzeAction>
108+
<ArchiveAction
109+
buildConfiguration = "Release"
110+
revealArchiveInOrganizer = "YES">
111+
</ArchiveAction>
112+
</Scheme>

‎Bitrise.xcodeproj/xcuserdata/zardoz.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7-
<key>Bitrise.xcscheme</key>
8-
<dict>
9-
<key>orderHint</key>
10-
<integer>3</integer>
11-
</dict>
127
<key>Bitrise.xcscheme_^#shared#^_</key>
138
<dict>
149
<key>orderHint</key>
15-
<integer>4</integer>
10+
<integer>6</integer>
1611
</dict>
1712
</dict>
1813
<key>SuppressBuildableAutocreation</key>
19-
<dict/>
14+
<dict>
15+
<key>0E42CAD420EC7A7E0033CD03</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
19+
</dict>
20+
<key>0E42CAEA20EC7A800033CD03</key>
21+
<dict>
22+
<key>primary</key>
23+
<true/>
24+
</dict>
25+
</dict>
2026
</dict>
2127
</plist>

‎Bitrise.xcworkspace/xcuserdata/zardoz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

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

‎Bitrise/AppDelegate.m‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ - (instancetype)init {
4343
_popover = [[NSPopover alloc] init];
4444
_popover.delegate = self;
4545

46-
_mainController = [[NSStoryboard mainStoryboard] instantiateControllerWithIdentifier:@"BRMainController"];
46+
NSStoryboard *mainStoryboard = [NSStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
47+
48+
_mainController = [mainStoryboard instantiateControllerWithIdentifier:@"BRMainController"];
4749
_mainController.dependencyContainer = _dependencyContainer;
48-
_detachableMainController = [[NSStoryboard mainStoryboard] instantiateControllerWithIdentifier:@"BRMainController"];
50+
_detachableMainController = [mainStoryboard instantiateControllerWithIdentifier:@"BRMainController"];
4951
_detachableMainController.dependencyContainer = _dependencyContainer;
5052

51-
_detachableWindowController = [[NSStoryboard mainStoryboard] instantiateControllerWithIdentifier:@"BRMainWindow"];
52-
[_detachableWindowController.window setLevel:NSStatusWindowLevel];
53-
[_detachableWindowController.window setTitle:@"BitBot"];
53+
_detachableWindowController = [mainStoryboard instantiateControllerWithIdentifier:@"BRMainWindow"];
54+
[_detachableWindowController.window setLevel:NSFloatingWindowLevel];
55+
[_detachableWindowController.window setTitleVisibility:NSWindowTitleHidden];
5456
}
5557

5658
return self;
@@ -62,7 +64,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
6264
[self.observer startObserving:syncCommand];
6365

6466
// Build status item
65-
NSImage *image = [NSImage imageNamed:@"bitrise-logo"];
67+
NSImage *image = [NSImage imageNamed:@"bitrise-bot-icon"];
6668
self.statusItem.button.image = image;
6769
self.statusItem.button.imageScaling = NSImageScaleProportionallyDown;
6870
self.statusItem.button.alternateImage = image;

‎Bitrise/Container/BRContainerBuilder.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
1515
@interface BRContainerBuilder : NSObject
1616

1717
- (NSPersistentContainer *)buildContainer;
18+
- (NSPersistentContainer *)buildContainerOfType:(NSString *)type;
1819

1920
@end
2021

‎Bitrise/Container/BRContainerBuilder.m‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
@implementation BRContainerBuilder
1212

1313
- (NSPersistentContainer *)buildContainer {
14+
return [self buildContainerOfType:NSSQLiteStoreType];
15+
}
16+
17+
- (NSPersistentContainer *)buildContainerOfType:(NSString *)type {
1418
NSPersistentContainer *container = [NSPersistentContainer persistentContainerWithName:@"bitrise"];
1519
NSPersistentStoreDescription *storeDescription = [NSPersistentStoreDescription new];
1620
NSURL *documentsURL = [[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask][0];
@@ -27,7 +31,7 @@ - (NSPersistentContainer *)buildContainer {
2731
}
2832

2933
storeDescription.URL = [appDirectoryURL URLByAppendingPathComponent:@"bitrise.sqlite"];
30-
storeDescription.type = NSSQLiteStoreType;
34+
storeDescription.type = type;
3135
storeDescription.shouldInferMappingModelAutomatically = YES;
3236
storeDescription.shouldMigrateStoreAutomatically = YES;
3337
container.persistentStoreDescriptions = @[storeDescription];

‎Bitrise/Container/BRDependencyContainer.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ - (BRBitriseAPI *)bitriseAPI {
5454
}
5555

5656
- (BRStorage *)storage {
57-
return [[BRStorage alloc] initWithContainer:self.persistenceContainer];
57+
return [[BRStorage alloc] initWithContext:[self.persistenceContainer newBackgroundContext]];
5858
}
5959

6060
- (BRObserver *)commandObserver {

‎Bitrise/Controller/BRMainController.m‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,15 @@ - (void)viewDidAppear {
8181
[self.dataSource fetch];
8282
}
8383

84+
- (void)prepareForSegue:(NSStoryboardSegue *)segue sender:(id)sender {
85+
[super prepareForSegue:segue sender:sender];
86+
87+
if ([segue.identifier isEqualToString:kAboutWindowSegue] || [segue.identifier isEqualToString:kAccountWindowSegue]) {
88+
[[(NSWindowController *)segue.destinationController window] makeKeyAndOrderFront:self];
89+
[[(NSWindowController *)segue.destinationController window] setLevel:NSFloatingWindowLevel];
90+
}
91+
}
92+
8493
#pragma mark - Actions -
8594

8695
- (IBAction)openSettingsMenu:(NSButton *)sender {

0 commit comments

Comments
 (0)