Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import kotlin.reflect.KProperty

buildscript {
repositories {
jcenter()
mavenCentral()
mavenLocal()
maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/")
}
dependencies {
classpath(Libs.gradle_release_plugin)
Expand Down Expand Up @@ -78,6 +80,7 @@ subprojects {
jcenter()
mavenCentral()
mavenLocal()
maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/")
}

val sourcesJar by tasks.creating(Jar::class) {
Expand Down
3 changes: 3 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
mavenLocal()
maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/")
}
15 changes: 2 additions & 13 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ object Vers {
const val dynamic_property = "1.1.9"
const val jfix_stdlib = "2.0.2"
const val corounit = "1.1.1"
const val koin = "2.0.1"

const val aspectj = "1.9.5"
const val freefair_aspectj = "5.0.1"
const val koin = "2.2.3"
}

object Libs {
Expand All @@ -46,14 +43,6 @@ object Libs {
const val groovy = "org.codehaus.groovy:groovy:3.0.1"
const val groovy_xml = "org.codehaus.groovy:groovy-xml:3.0.1"

const val dynamic_property_api = "ru.fix:dynamic-property-api:${Vers.dynamic_property}"

const val dynamic_property_std_source = "ru.fix:dynamic-property-std-source:${Vers.dynamic_property}"
const val dynamic_property_jackson = "ru.fix:dynamic-property-jackson:${Vers.dynamic_property}"
const val dynamic_property_spring = "ru.fix:dynamic-property-spring:${Vers.dynamic_property}"
const val jfix_stdlib_files = "ru.fix:jfix-stdlib-files:${Vers.jfix_stdlib}"

const val jfix_stdlib_concurrency = "ru.fix:jfix-stdlib-concurrency:${Vers.jfix_stdlib}"
const val jfix_corounit_engine = "ru.fix:corounit-engine:${Vers.corounit}"
const val jfix_corounit_allure = "ru.fix:corounit-allure:${Vers.corounit}"

Expand Down Expand Up @@ -86,7 +75,7 @@ object Libs {
const val wiremock = "com.github.tomakehurst:wiremock:2.26.1"
const val jfix_stdlib_socket = "ru.fix:jfix-stdlib-socket:${Vers.jfix_stdlib}"

const val koin = "org.koin:koin-core:${Vers.koin}"
const val koin = "io.insert-koin:koin-core:${Vers.koin}"
}

enum class Projs {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Description
import io.qameta.allure.Epic
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.kbdd.asserts.isContains
import ru.fix.kbdd.asserts.isEquals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import io.qameta.allure.Description
import io.qameta.allure.Epic
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Epic
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.parameterized
import ru.fix.corounit.allure.row
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import com.google.common.net.HttpHeaders
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import io.qameta.allure.Description
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.kotest.matchers.shouldBe
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.kbdd.asserts.*
import ru.fix.kbdd.example.MockServer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.qameta.allure.Epic
import io.qameta.allure.Feature
import io.qameta.allure.Story
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.fix.kbdd.example.config

import org.koin.core.KoinComponent
import org.koin.core.component.KoinComponent


class Settings : KoinComponent {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.fix.kbdd.example.steps

import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.kbdd.asserts.*
import ru.fix.kbdd.example.config.Settings
import ru.fix.kbdd.rest.Rest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.fix.kbdd.example.steps

import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Step
import ru.fix.kbdd.example.config.Settings
import ru.fix.kbdd.rest.Rest
Expand Down
Loading