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 Nov 14, 2023
1 parent 1de0708 commit 99ebb14
Show file tree
Hide file tree
Showing 17 changed files with 54 additions and 56 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ buildscript {


plugins {
id("io.gitlab.arturbosch.detekt") version "1.23.1"
id("com.github.ben-manes.versions") version "0.47.0"
id("io.gitlab.arturbosch.detekt") version "1.23.3"
id("com.github.ben-manes.versions") version "0.49.0"
}

configure<DetektExtension> {
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
implementation("com.squareup:kotlinpoet:1.12.0")
implementation("com.google.code.gson:gson:2.10")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
implementation("com.squareup:kotlinpoet:1.14.2")
implementation("com.google.code.gson:gson:2.10.1")
}
44 changes: 22 additions & 22 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
object Versions {
val marathon = System.getenv("GIT_TAG_NAME") ?: "0.8.5"

val kotlin = "1.8.20"
val kotlin = "1.9.10"
val coroutines = "1.7.3"
val coroutinesTest = coroutines

val androidCommon = "31.1.0"
val adam = "0.5.1"
val androidCommon = "31.1.3"
val adam = "0.5.2"
val dexTestParser = "2.3.4"
val kotlinLogging = "3.0.5"
val logbackClassic = "1.4.8"
val logbackClassic = "1.4.11"
val axmlParser = "1.0"
val bugsnag = "3.7.0"
val bugsnag = "3.7.1"

val junitGradle = "1.2.0"
val androidGradleVersion = "7.4.1"
val gradlePluginPublish = "1.2.0"
val androidGradleVersion = "8.1.3"
val gradlePluginPublish = "1.2.1"
val gradlePluginShadow = "8.1.1"

val junit5 = "5.10.0"
val junit5 = "5.10.1"
val kluent = "1.73"

val kakao = "3.0.2"
Expand All @@ -27,37 +27,37 @@ object Versions {
val espressoRunner = "1.0.1"
val junit = "4.13.2"
val gson = "2.10.1"
val apacheCommonsText = "1.10.0"
val apacheCommonsText = "1.11.0"
val apacheCommonsIO = "2.11.0"
val apacheCommonsCodec = "1.15"
val okhttp = "4.11.0"
val okhttp = "4.12.0"
val influxDbClient = "2.23"
val influxDb2Client = "6.10.0"
val clikt = "4.1.0"
val jacksonDatabind = "2.15.2"
val clikt = "4.2.1"
val jacksonDatabind = "2.15.3"
val jacksonKotlin = jacksonDatabind
val jacksonYaml = jacksonDatabind
val jacksonJSR310 = jacksonDatabind
val jacksonAnnotations = jacksonDatabind
val ddPlist = "1.27"
val guava = "32.1.1-jre"
val rsync4j = "3.2.7-1"
val sshj = "0.35.0"
val guava = "32.1.3-jre"
val rsync4j = "3.2.7-5"
val sshj = "0.37.0"
val kotlinProcess = "1.4.1"
val testContainers = "1.18.3"
val testContainers = "1.19.1"
val jupiterEngine = junit5
val jansi = "2.4.0"
val jansi = "2.4.1"
val scalr = "4.2"
val allureTestFilter = "2.23.0"
val allureJava = "2.23.0"
val allureTestFilter = "2.24.0"
val allureJava = "2.24.0"
val allureKotlin = "2.4.0"
val allureEnvironment = "1.0.0"
val mockitoKotlin = "2.2.0"
val dokka = "1.8.10"
val koin = "3.4.3"
val dokka = "1.9.10"
val koin = "3.5.0"
val jsonAssert = "1.5.1"
val xmlUnit = "2.9.1"
val assertk = "0.26.1"
val assertk = "0.27.0"
}

object BuildPlugins {
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.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion sample/android-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
}

plugins {
id("com.github.ben-manes.versions") version "0.47.0"
id("com.github.ben-manes.versions") version "0.49.0"
}

fun isNonStable(version: String): Boolean {
Expand Down
10 changes: 5 additions & 5 deletions sample/android-app/buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
object Versions {
val kotlin = "1.8.10"
val coroutines = "1.6.4"
val kotlin = "1.9.10"
val coroutines = "1.7.3"

val androidGradleVersion = "7.4.1"
val androidGradleVersion = "8.1.3"

val kakao = "3.2.3"
val kakao = "3.4.1"
val espresso = "3.5.1"
val espressoRules = "1.5.0"
val espressoRunner = "1.5.2"
Expand All @@ -13,7 +13,7 @@ object Versions {
val appCompat = "1.6.1"
val constraintLayout = "2.1.4"
val allure = "2.4.0"
val adam = "0.5.0"
val adam = "0.5.2"
}

object BuildPlugins {
Expand Down
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.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions sample/android-cucumber-app/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
}

android {
namespace = "com.example.cucumber"
buildToolsVersion = "30.0.3"
compileSdk = 33

Expand Down
2 changes: 1 addition & 1 deletion sample/android-cucumber-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
}

plugins {
id("com.github.ben-manes.versions") version "0.47.0"
id("com.github.ben-manes.versions") version "0.49.0"
}

fun isNonStable(version: String): Boolean {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
object Versions {
val kotlin = "1.8.10"
val kotlin = "1.9.10"

val androidGradleVersion = "7.4.1"
val androidGradleVersion = "8.1.3"

val cucumber = "4.9.0"
val cucumberPicocontainer = "4.8.1"
Expand Down
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.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion sample/android-library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
}

plugins {
id("com.github.ben-manes.versions") version "0.47.0"
id("com.github.ben-manes.versions") version "0.49.0"
}

fun isNonStable(version: String): Boolean {
Expand Down
7 changes: 3 additions & 4 deletions sample/android-library/buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
object Versions {
val kotlin = "1.8.10"
val coroutines = "1.6.4"

val androidGradleVersion = "7.4.1"
val kotlin = "1.9.10"
val coroutines = "1.7.3"
val androidGradleVersion = "8.1.3"
val espressoRunner = "1.5.2"
val testJunit = "1.1.5"
}
Expand Down
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.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions sample/android-library/library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
}

android {
namespace = "com.example.library"
buildToolsVersion = "30.0.3"
compileSdk = 33

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import net.schmizz.sshj.transport.random.Random
import net.schmizz.sshj.transport.random.SingletonRandomFactory
import net.schmizz.sshj.common.Factory
import net.schmizz.sshj.common.LoggerFactory
import net.schmizz.sshj.common.SecurityUtils
import org.slf4j.Logger

internal class PerformanceDefaultConfig(
Expand All @@ -19,7 +20,7 @@ internal class PerformanceDefaultConfig(
val bcFactory = MemoizingFactory(BouncyCastleRandom.Factory())
val jceFactory = MemoizingFactory(JCERandom.Factory())
}

init {
val loggerFactory = object : LoggerFactory {
override fun getLogger(clazz: Class<*>?): Logger {
Expand All @@ -44,19 +45,15 @@ internal class PerformanceDefaultConfig(
)
}
setLoggerFactory(loggerFactory)
setRandomFactory {
SingletonRandomFactory(if (SecurityUtils.isBouncyCastleRegistered()) bcFactory else jceFactory)
}
}


override fun initRandomFactory(bouncyCastleRegistered: Boolean) {
randomFactory = SingletonRandomFactory(if (bouncyCastleRegistered) bcFactory else jceFactory)
}



class MemoizingFactory(private val factory: Factory<Random>) : Factory<Random> {
val random : Random by lazy { factory.create() }
val random: Random by lazy { factory.create() }
override fun create(): Random {
return random
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import assertk.assertions.isEqualTo
import com.malinskiy.marathon.ios.logparser.formatter.NoopPackageNameFormatter
import com.malinskiy.marathon.ios.test.TestEvent
import com.malinskiy.marathon.time.Timer
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.whenever
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mockito.mock
import org.mockito.Mockito.reset

class TestRunProgressParserTest {
Expand Down

0 comments on commit 99ebb14

Please sign in to comment.