Skip to content
This repository has been archived by the owner on Dec 7, 2019. It is now read-only.

Add windows compatibility #45

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

jakob-grabner
Copy link

@jakob-grabner jakob-grabner commented Aug 1, 2018

Make swarmer work on windows.
Fixes #37

}
val emulator = when (os()) {
Os.Linux, Os.Mac -> "$androidHome/emulator/emulator"
Os.Windows -> "$androidHome/emulator/emulator.exe"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.exe! RUN DON'T LOOK BACK

Copy link
Contributor

@artem-zinnatullin artem-zinnatullin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -102,8 +116,7 @@ private fun startEmulator(
.doOnNext { log("Ports for emulator ${args.emulatorName}: ${it.first}, ${it.second}.") }
.flatMap { ports ->
startEmulatorProcess(
// Unix only, PR welcome.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I knew someone will delete this line haha

@@ -334,3 +347,17 @@ private fun outputDirectory(args: Commands.Start) =

private fun connectedEmulators(): Single<Set<AdbDevice>> =
connectedAdbDevices().take(1).toSingle().map { it.filter { it.isEmulator }.toSet() }

private fun os(): Os {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets do it, sounds good

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@artem-zinnatullin
Copy link
Contributor

@yunikkk can you PTAL?

@yunikkk
Copy link
Contributor

yunikkk commented Aug 6, 2018

@jakob-grabner
I'll expose os() from commander now, lets use it from there.
Then LGTM and thanks for contribution!

rtjag added 2 commits August 25, 2018 10:21
Update commander to 0.1.8 -> 0.1.10
Update jCommander to 1.71 -> 1.72
Update kotlin to 1.2.41 -> 1.2.61
@jakob-grabner
Copy link
Author

@yunikkk thanks for exposing os() from commander. I updated the PR to use it.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants