diff --git a/allure-common/.gitignore b/allure-android-commons/.gitignore similarity index 100% rename from allure-common/.gitignore rename to allure-android-commons/.gitignore diff --git a/allure-common/build.gradle b/allure-android-commons/build.gradle similarity index 57% rename from allure-common/build.gradle rename to allure-android-commons/build.gradle index f8fc546..210e4e7 100644 --- a/allure-common/build.gradle +++ b/allure-android-commons/build.gradle @@ -12,14 +12,14 @@ buildscript { } dependencies { - compile project(":allure-model") + implementation project(":allure-model") - compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" - compile "com.google.code.gson:gson:${gsonVersion}" - compile "junit:junit:${jUnitVersion}" + implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" + implementation "com.google.code.gson:gson:${gsonVersion}" + implementation "junit:junit:${jUnitVersion}" - testCompile "org.hamcrest:hamcrest-all:${hamcrestVersion}" - testCompile "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}" + testImplementation "org.hamcrest:hamcrest-all:${hamcrestVersion}" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}" } sourceSets { diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/AllureLifecycle.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureLifecycle.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/AllureLifecycle.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureLifecycle.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/AllureRunListener.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureRunListener.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/AllureRunListener.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureRunListener.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/AllureRunner.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureRunner.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/AllureRunner.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureRunner.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/AllureStorage.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureStorage.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/AllureStorage.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/AllureStorage.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/SeverityLevel.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/SeverityLevel.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/SeverityLevel.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/SeverityLevel.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/SoftAssert.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/SoftAssert.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/SoftAssert.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/SoftAssert.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/Step.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/Step.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/Step.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/Step.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Description.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Description.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Description.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Description.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/DisplayName.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/DisplayName.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/DisplayName.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/DisplayName.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Epic.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Epic.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Epic.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Epic.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Epics.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Epics.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Epics.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Epics.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Feature.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Feature.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Feature.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Feature.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Features.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Features.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Features.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Features.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Issue.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Issue.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Issue.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Issue.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Link.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Link.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Link.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Link.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Links.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Links.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Links.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Links.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Owner.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Owner.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Owner.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Owner.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Severity.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Severity.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Severity.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Severity.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Stories.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Stories.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Stories.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Stories.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Story.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Story.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Story.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Story.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Title.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Title.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/annotations/Title.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/annotations/Title.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/io/AllureFileConstants.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/AllureFileConstants.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/io/AllureFileConstants.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/AllureFileConstants.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsReader.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsReader.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsReader.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsReader.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsWriter.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsWriter.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsWriter.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/AllureResultsWriter.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsReader.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsReader.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsReader.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsReader.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsWriter.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsWriter.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsWriter.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/io/FileSystemResultsWriter.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/listener/ContainerLifecycleListener.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/listener/ContainerLifecycleListener.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/listener/ContainerLifecycleListener.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/listener/ContainerLifecycleListener.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/listener/StepLifecycleListener.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/listener/StepLifecycleListener.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/listener/StepLifecycleListener.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/listener/StepLifecycleListener.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/listener/TestLifecycleListener.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/listener/TestLifecycleListener.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/listener/TestLifecycleListener.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/listener/TestLifecycleListener.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/serialization/SerializationProcessor.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/serialization/SerializationProcessor.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/serialization/SerializationProcessor.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/serialization/SerializationProcessor.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessor.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessor.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessor.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessor.kt diff --git a/allure-common/src/main/kotlin/ru/tinkoff/allure/utils/ResultsUtilsCommon.kt b/allure-android-commons/src/main/kotlin/ru/tinkoff/allure/utils/ResultsUtilsCommon.kt similarity index 100% rename from allure-common/src/main/kotlin/ru/tinkoff/allure/utils/ResultsUtilsCommon.kt rename to allure-android-commons/src/main/kotlin/ru/tinkoff/allure/utils/ResultsUtilsCommon.kt diff --git a/allure-common/src/test/kotlin/ru/tinkoff/allure/AllureLifecycleTest.kt b/allure-android-commons/src/test/kotlin/ru/tinkoff/allure/AllureLifecycleTest.kt similarity index 100% rename from allure-common/src/test/kotlin/ru/tinkoff/allure/AllureLifecycleTest.kt rename to allure-android-commons/src/test/kotlin/ru/tinkoff/allure/AllureLifecycleTest.kt diff --git a/allure-common/src/test/kotlin/ru/tinkoff/allure/AllureStorageTest.kt b/allure-android-commons/src/test/kotlin/ru/tinkoff/allure/AllureStorageTest.kt similarity index 100% rename from allure-common/src/test/kotlin/ru/tinkoff/allure/AllureStorageTest.kt rename to allure-android-commons/src/test/kotlin/ru/tinkoff/allure/AllureStorageTest.kt diff --git a/allure-common/src/test/kotlin/ru/tinkoff/allure/SoftAssertTest.kt b/allure-android-commons/src/test/kotlin/ru/tinkoff/allure/SoftAssertTest.kt similarity index 100% rename from allure-common/src/test/kotlin/ru/tinkoff/allure/SoftAssertTest.kt rename to allure-android-commons/src/test/kotlin/ru/tinkoff/allure/SoftAssertTest.kt diff --git a/allure-common/src/test/kotlin/ru/tinkoff/allure/StepTest.kt b/allure-android-commons/src/test/kotlin/ru/tinkoff/allure/StepTest.kt similarity index 100% rename from allure-common/src/test/kotlin/ru/tinkoff/allure/StepTest.kt rename to allure-android-commons/src/test/kotlin/ru/tinkoff/allure/StepTest.kt diff --git a/allure-common/src/test/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessorTest.kt b/allure-android-commons/src/test/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessorTest.kt similarity index 100% rename from allure-common/src/test/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessorTest.kt rename to allure-android-commons/src/test/kotlin/ru/tinkoff/allure/serialization/gson/GsonSerializationProcessorTest.kt diff --git a/allure-android/build.gradle b/allure-android/build.gradle index 1bb36d5..4217352 100644 --- a/allure-android/build.gradle +++ b/allure-android/build.gradle @@ -55,7 +55,7 @@ android { dependencies { implementation project(':allure-model') - implementation project(':allure-common') + implementation project(':allure-android-commons') implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" implementation "androidx.annotation:annotation:${androidXVersion}" implementation "androidx.test:runner:${androidXTestVersion}" diff --git a/allure-model/build.gradle b/allure-model/build.gradle index a5fa25b..4d93111 100644 --- a/allure-model/build.gradle +++ b/allure-model/build.gradle @@ -12,10 +12,10 @@ buildscript { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" - compile "com.google.code.gson:gson:${gsonVersion}" + implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" + implementation "com.google.code.gson:gson:${gsonVersion}" - testCompile "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}" } sourceSets { diff --git a/settings.gradle b/settings.gradle index 20dd21f..74b1e82 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = "allure_android" include "allure-model" -include "allure-common" +include "allure-android-commons" include "allure-android" \ No newline at end of file