diff --git a/build.gradle.kts b/build.gradle.kts index 3be5d7d..5651590 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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) @@ -78,6 +80,7 @@ subprojects { jcenter() mavenCentral() mavenLocal() + maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/") } val sourcesJar by tasks.creating(Jar::class) { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 876c922..77b4e1f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,5 +3,8 @@ plugins { } repositories { + jcenter() mavenCentral() + mavenLocal() + maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/") } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 241f2e4..a81df55 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -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 { @@ -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}" @@ -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 { diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/CookieRestTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/CookieRestTest.kt index da4e82f..68dd80a 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/CookieRestTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/CookieRestTest.kt @@ -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.* diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/IntroductionTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/IntroductionTest.kt index 1ad0f45..31008bf 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/IntroductionTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/IntroductionTest.kt @@ -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.* diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/JsonRestTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/JsonRestTest.kt index 6507932..471420f 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/JsonRestTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/JsonRestTest.kt @@ -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 diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/NavigationTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/NavigationTest.kt index 9c38dd1..49387f5 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/NavigationTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/NavigationTest.kt @@ -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.* diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ParameterizedTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ParameterizedTest.kt index ca8de2e..5876326 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ParameterizedTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ParameterizedTest.kt @@ -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 diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/RedirectRestTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/RedirectRestTest.kt index d211d04..54365fa 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/RedirectRestTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/RedirectRestTest.kt @@ -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 diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseAsserts.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseAsserts.kt index a96a0dc..714d93d 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseAsserts.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseAsserts.kt @@ -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.* diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseCustomAsserts.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseCustomAsserts.kt index 363865a..46af657 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseCustomAsserts.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseCustomAsserts.kt @@ -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.* diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/XmlRestTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/XmlRestTest.kt index 58d4bc6..a19fd3b 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/XmlRestTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/XmlRestTest.kt @@ -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 diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/example/AirportBookingTest.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/example/AirportBookingTest.kt index 25f556d..f1cd497 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/example/AirportBookingTest.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/example/AirportBookingTest.kt @@ -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.* diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/config/Settings.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/config/Settings.kt index 2a972e0..e0ecfa6 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/config/Settings.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/config/Settings.kt @@ -1,6 +1,6 @@ package ru.fix.kbdd.example.config -import org.koin.core.KoinComponent +import org.koin.core.component.KoinComponent class Settings : KoinComponent { diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/AirportSteps.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/AirportSteps.kt index 87b0fe5..0f42bf0 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/AirportSteps.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/AirportSteps.kt @@ -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 diff --git a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/BillingSteps.kt b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/BillingSteps.kt index 46f1529..11510ab 100644 --- a/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/BillingSteps.kt +++ b/kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/BillingSteps.kt @@ -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