diff --git a/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt b/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt index 1dbcb92..a1dbea0 100644 --- a/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt +++ b/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt @@ -1,9 +1,9 @@ package com.gojuno.commander.android -import com.gojuno.cmd.common.Notification -import com.gojuno.cmd.common.log -import com.gojuno.cmd.common.nanosToHumanReadableTime -import com.gojuno.cmd.common.process +import com.gojuno.commander.os.Notification +import com.gojuno.commander.os.log +import com.gojuno.commander.os.nanosToHumanReadableTime +import com.gojuno.commander.os.process import rx.Observable import rx.Single import java.io.File @@ -51,7 +51,7 @@ fun connectedAdbDevices(): Observable> = process(listOf(adb, "dev } .doOnError { log("Error during getting connectedAdbDevices, error = $it") } -fun AdbDevice.log(message: String) = com.gojuno.cmd.common.log("[$id] $message") +fun AdbDevice.log(message: String) = com.gojuno.commander.os.log("[$id] $message") fun AdbDevice.installApk(pathToApk: String): Observable { val adbDevice = this diff --git a/os/src/main/kotlin/com/gojuno/cmd/common/Processes.kt b/os/src/main/kotlin/com/gojuno/commander/os/Processes.kt similarity index 97% rename from os/src/main/kotlin/com/gojuno/cmd/common/Processes.kt rename to os/src/main/kotlin/com/gojuno/commander/os/Processes.kt index ac1237a..f607e7d 100644 --- a/os/src/main/kotlin/com/gojuno/cmd/common/Processes.kt +++ b/os/src/main/kotlin/com/gojuno/commander/os/Processes.kt @@ -1,7 +1,7 @@ -package com.gojuno.cmd.common +package com.gojuno.commander.os -import com.gojuno.cmd.common.Os.Linux -import com.gojuno.cmd.common.Os.Mac +import com.gojuno.commander.os.Os.Linux +import com.gojuno.commander.os.Os.Mac import rx.Emitter.BackpressureMode import rx.Observable import rx.schedulers.Schedulers.io diff --git a/os/src/test/kotlin/com/gojuno/cmd/common/ProcessesSpec.kt b/os/src/test/kotlin/com/gojuno/commander/os/ProcessesSpec.kt similarity index 98% rename from os/src/test/kotlin/com/gojuno/cmd/common/ProcessesSpec.kt rename to os/src/test/kotlin/com/gojuno/commander/os/ProcessesSpec.kt index dbdc012..99cd891 100644 --- a/os/src/test/kotlin/com/gojuno/cmd/common/ProcessesSpec.kt +++ b/os/src/test/kotlin/com/gojuno/commander/os/ProcessesSpec.kt @@ -1,4 +1,4 @@ -package com.gojuno.cmd.common +package com.gojuno.commander.os import org.assertj.core.api.Assertions.assertThat import org.jetbrains.spek.api.Spek