Skip to content

Commit

Permalink
IMPROVEMENT: merge host-ip configuration properties
Browse files Browse the repository at this point in the history
  • Loading branch information
Hotzkow committed Jul 16, 2019
1 parent 2d9513f commit 96c97d5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

group 'org.droidmate'
version = "1.4-SNAPSHOT"
version = "1.4.1-SNAPSHOT"

apply from: file("${rootProject.projectDir}/ktlint.gradle")
apply from: file("${rootProject.projectDir}/log.gradle")
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rootProject.name = 'common'
rootProject.name = 'droidmate-common'

Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ abstract class ConfigProperties {
object Core : PropertyGroup() {
val logLevel by stringType // TODO we could use a nice enumType instead
val configPath by uriType
val hostIp by stringType
}

object ApiMonitorServer : PropertyGroup() {
Expand All @@ -48,10 +49,6 @@ abstract class ConfigProperties {
val basePort by intType
}

object TcpClient : PropertyGroup() {
val serverAddress by stringType
}

object ExecutionMode : PropertyGroup() {
val inline by booleanType
val explore by booleanType
Expand All @@ -71,7 +68,6 @@ abstract class ConfigProperties {
}

object DeviceCommunication : PropertyGroup() {
val adbHost by stringType
val checkAppIsRunningRetryAttempts by intType
val checkAppIsRunningRetryDelay by intType
val checkDeviceAvailableAfterRebootAttempts by intType
Expand Down
2 changes: 1 addition & 1 deletion versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ project.ext {

driverLib_version = 'master-SNAPSHOT' // our device interface (right now subject to change, but after refactoring it should not require further updates)

kotlin_version = '1.3.21'
kotlin_version = '1.3.41'
coroutines_version = '1.1.0'
androidGradlePlugin_version = "3.3.2" // version 3.2+ requires build tools 28+
androidBuildToolsVersion = "28.0.3" // this is hardcoded in buildSrc/build.kt as well, TODO we should upgrade to 28 to support the newest gradle version
Expand Down

0 comments on commit 96c97d5

Please sign in to comment.