Skip to content

Commit

Permalink
Fixed time comparing
Browse files Browse the repository at this point in the history
  • Loading branch information
SergKhram committed Apr 13, 2021
1 parent 5eae8fa commit fd656e7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 33 deletions.
34 changes: 2 additions & 32 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import java.net.URI

group = "io.github.sergkhram"
version = "1.0.0-RELEASE"
version = "1.0.1-RELEASE"

dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind:2.8.9")
Expand Down Expand Up @@ -34,8 +34,6 @@ repositories {
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
// withJavadocJar()
// withSourcesJar()
}

signing {
Expand All @@ -59,7 +57,6 @@ publishing {

publications {
create("default", MavenPublication::class.java) {
// customizePom(pom)
from(project.components["java"])
artifact(sourcesJar)
artifact(javadocJar)
Expand Down Expand Up @@ -98,31 +95,4 @@ publishing {
}
}
}
}

//fun customizePom(pom: org.gradle.api.publish.maven.MavenPom) {
// pom.apply {
// name.set("ares-plugin")
// url.set("https://github.com/SergKhram/ARES")
// description.set("Android report synchro plugin")
//
// this.licenses {
// license {
// name.set("The Apache License, Version 2.0")
// url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
// }
// }
//
// this.developers {
// developer {
// id.set("serg-khram-team")
// name.set("Sergei Khramkov")
// email.set("quigon3@yandex.ru")
// }
// }
//
// this.scm {
// url.set("https://github.com/SergKhram/ARES")
// }
// }
//}
}
6 changes: 5 additions & 1 deletion src/main/kotlin/io/github/sergkhram/helpers/conditions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,9 @@ internal val isAppropriateMarathonResultFile: (File, ObjectMapper, JsonNode) ->
val currentMarathonFile = marathonAllureFile.asJson(mapper)
val packageLabel = currentMarathonFile.getPackageLabel()
currentDeviceFile.getFullName() == (packageLabel + "." + currentMarathonFile.getFullName()) &&
currentMarathonFile.getStartTime() in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime()
(
currentMarathonFile.getStartTime() in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime() ||
currentMarathonFile.getStopTime() in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime() ||
(currentMarathonFile.getStartTime() + currentMarathonFile.getStopTime())/2 in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime()
)
}

0 comments on commit fd656e7

Please sign in to comment.