Skip to content

Commit

Permalink
chore(deps): update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Malinskiy committed Sep 20, 2024
1 parent cd16c0a commit 5a3ea3f
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 40 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildscript {


plugins {
id("io.gitlab.arturbosch.detekt") version "1.23.4"
id("io.gitlab.arturbosch.detekt") version "1.23.6"
id("com.github.ben-manes.versions") version "0.51.0"
}

Expand Down
50 changes: 25 additions & 25 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
object Versions {
val marathon = System.getenv("GIT_TAG_NAME") ?: "0.10.1"

val kotlin = "1.9.10"
val coroutines = "1.7.3"
val kotlin = "1.9.24"
val coroutines = "1.8.1"
val coroutinesTest = coroutines

val androidCommon = "31.2.2"
val androidCommon = "31.6.1"
val adam = "0.5.8"
val dexTestParser = "2.3.4"
val kotlinLogging = "3.0.5"
val logbackClassic = "1.4.14"
val logbackClassic = "1.5.8"
val axmlParser = "1.0"
val bugsnag = "3.7.1"
val bugsnag = "3.7.2"

val junitGradle = "1.2.0"

val junit5 = "5.10.1"
val junit5 = "5.11.0"
val kluent = "1.73"

val kakao = "3.0.2"
val gson = "2.10.1"
val apacheCommonsText = "1.11.0"
val apacheCommonsIO = "2.11.0"
val gson = "2.11.0"
val apacheCommonsText = "1.12.0"
val apacheCommonsIO = "2.17.0"
val okhttp = "4.12.0"
val influxDbClient = "2.24"
val influxDb2Client = "6.12.0"
val clikt = "4.2.2"
val jacksonDatabind = "2.15.3"
val influxDb2Client = "7.2.0"
val clikt = "5.0.0"
val jacksonDatabind = "2.17.2"
val jacksonKotlin = jacksonDatabind
val jacksonYaml = jacksonDatabind
val jacksonJSR310 = jacksonDatabind
val jacksonAnnotations = jacksonDatabind
val ddPlist = "1.27"
val guava = "33.0.0-jre"
val rsync4j = "3.2.7-6"
val sshj = "0.38.0"
val kotlinProcess = "1.4.1"
val testContainers = "1.19.4"
val ddPlist = "1.28"
val guava = "33.3.0-jre"
val rsync4j = "3.3.0-1"
val sshj = "0.39.0"
val kotlinProcess = "1.5"
val testContainers = "1.20.1"
val jupiterEngine = junit5
val jansi = "2.4.1"
val scalr = "4.2"
val allureTestFilter = "2.25.0"
val allureJava = "2.25.0"
val allureTestFilter = "2.29.0"
val allureJava = "2.29.0"
val allureKotlin = "2.4.0"
val allureEnvironment = "1.0.0"
val mockitoKotlin = "5.2.1"
val mockitoKotlin = "5.4.0"
val dokka = "1.9.10"
val koin = "3.5.3"
val jsonAssert = "1.5.1"
val xmlUnit = "2.9.1"
val assertk = "0.28.0"
val koin = "3.5.6"
val jsonAssert = "1.5.3"
val xmlUnit = "2.10.0"
val assertk = "0.28.1"
}

object BuildPlugins {
Expand Down
2 changes: 1 addition & 1 deletion cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
jacoco
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.dokka")
id("com.github.gmazzo.buildconfig") version "5.3.5"
id("com.github.gmazzo.buildconfig") version "5.5.0"
}

val enableJDB = false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.malinskiy.marathon.cli

import com.github.ajalt.clikt.core.PrintMessage
import com.github.ajalt.clikt.core.main
import com.github.ajalt.clikt.core.subcommands
import com.malinskiy.marathon.Marathon
import com.malinskiy.marathon.exceptions.ExceptionsReporter
Expand Down
37 changes: 27 additions & 10 deletions cli/src/main/kotlin/com/malinskiy/marathon/cli/args/CliCommands.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.malinskiy.marathon.cli.args

import com.github.ajalt.clikt.core.CliktCommand
import com.github.ajalt.clikt.core.Context
import com.github.ajalt.clikt.parameters.groups.OptionGroup
import com.github.ajalt.clikt.parameters.groups.provideDelegate
import com.github.ajalt.clikt.parameters.options.convert
Expand All @@ -10,22 +11,23 @@ import com.github.ajalt.clikt.parameters.types.file
import java.io.File

class MarathonRunCommonOptions : OptionGroup() {
val marathonfile by option("--marathonfile", "-m", help="Marathonfile file path")
val marathonfile by option("--marathonfile", "-m", help = "Marathonfile file path")
.file()
.default(File("Marathonfile"))
val analyticsTracking by option("--analyticsTracking", help="Enable / Disable anonymous analytics tracking. Enabled by default.")
val analyticsTracking by option("--analyticsTracking", help = "Enable / Disable anonymous analytics tracking. Enabled by default.")
.convert { it.toBoolean() }
.default(true)
val bugsnagReporting by option("--bugsnag", help="Enable/Disable anonymous crash reporting. Enabled by default")
val bugsnagReporting by option("--bugsnag", help = "Enable/Disable anonymous crash reporting. Enabled by default")
.convert { it.toBoolean() }
.default(true)
}

class MarathonCli(
private val starter: (CliConfiguration) -> Unit
) : CliktCommand(invokeWithoutSubcommand = true, name = "marathon") {
) : CliktCommand(name = "marathon") {

private val marathonRunCommonOptions by MarathonRunCommonOptions()
override val invokeWithoutSubcommand = true

override fun run() {
val subcommand = currentContext.invokedSubcommand
Expand All @@ -45,23 +47,34 @@ class MarathonCli(

class Version(
private val starter: (CliConfiguration) -> Unit
) : CliktCommand(name = "version", help="Print version and exit") {
) : CliktCommand(name = "version") {
override fun run() {
starter(VersionCommandCliConfiguration)
}

override fun help(context: Context) = "Print version and exit"
}

class Parse(
private val starter: (CliConfiguration) -> Unit
): CliktCommand(name = "parse", help="Print the list of tests without executing them") {
) : CliktCommand(name = "parse") {

private val marathonfile by option("--marathonfile", "-m", help="Marathonfile file path")
private val marathonfile by option("--marathonfile", "-m", help = "Marathonfile file path")
.file()
.default(File("Marathonfile"))
private val parseOutputFileName by option("--output", "-o", help="Output file name without extension. Will be in the outputDir with .yaml extension")
private val includeFlakyTests by option("--include-flaky-tests", "-f", help="Include/exclude flaky tests that will have preventive retries according to the current flakinessStrategy")
private val parseOutputFileName by option(
"--output",
"-o",
help = "Output file name without extension. Will be in the outputDir with .yaml extension"
)
private val includeFlakyTests by option(
"--include-flaky-tests",
"-f",
help = "Include/exclude flaky tests that will have preventive retries according to the current flakinessStrategy"
)
.convert { it.toBoolean() }
.default(false)

override fun run() {
val parseCommandCliConfiguration = ParseCommandCliConfiguration(
marathonfile = marathonfile,
Expand All @@ -70,11 +83,13 @@ class Parse(
)
starter(parseCommandCliConfiguration)
}

override fun help(context: Context) = "Print the list of tests without executing them"
}

class RunMarathon(
private val starter: (CliConfiguration) -> Unit
) : CliktCommand(name = "run", help="Run Marathon to execute tests") {
) : CliktCommand(name = "run") {

private val marathonRunCommonOptions by MarathonRunCommonOptions()

Expand All @@ -86,4 +101,6 @@ class RunMarathon(
)
starter(marathonRunCommandCliConfiguration)
}

override fun help(context: Context) = "Run Marathon to execute tests"
}
2 changes: 1 addition & 1 deletion configuration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.dokka")
jacoco
id("com.github.gmazzo.buildconfig") version "5.3.5"
id("com.github.gmazzo.buildconfig") version "5.5.0"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.dokka")
jacoco
id("com.github.gmazzo.buildconfig") version "5.3.5"
id("com.github.gmazzo.buildconfig") version "5.5.0"
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 5a3ea3f

Please sign in to comment.