diff --git a/apis/cc-de_CH/atrium-api-cc-de_CH-android/build.gradle b/apis/cc-de_CH/atrium-api-cc-de_CH-android/build.gradle deleted file mode 100644 index a996bbb7c..000000000 --- a/apis/cc-de_CH/atrium-api-cc-de_CH-android/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -description = 'An assertion function API in de_CH with a focus on code completion for Android.' + - 'It provides a fluent API in de_CH which is designed to ease the usage of code completion or ' + - 'in other words, the developer should be able to: ' + - 'start creating an assertion + code completion + . + code completion + . + and so on.' - -dependencies { - api prefixedProject('domain-api-deprecated') - api prefixedProject('domain-builders-android') - - testImplementation(prefixedProject('spec')) { - exclude module: "${rootProject.name}-translations-en_GB-android" - } - testImplementation prefixedProject('translations-de_CH-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/apis/cc-en_GB/atrium-api-cc-en_GB-android/build.gradle b/apis/cc-en_GB/atrium-api-cc-en_GB-android/build.gradle deleted file mode 100644 index bd4efc8c8..000000000 --- a/apis/cc-en_GB/atrium-api-cc-en_GB-android/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -description = 'An assertion function API in en_GB with a focus on code completion for Android.' + - 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + - 'in other words, the developer should be able to: ' + - 'start creating an assertion + code completion + . + code completion + . + and so on.' - -dependencies { - api prefixedProject('domain-builders-android') - - testImplementation prefixedProject('verbs-internal-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/apis/cc-infix-en_GB/atrium-api-cc-infix-en_GB-android/build.gradle b/apis/cc-infix-en_GB/atrium-api-cc-infix-en_GB-android/build.gradle deleted file mode 100644 index fc012fbfc..000000000 --- a/apis/cc-infix-en_GB/atrium-api-cc-infix-en_GB-android/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -description = 'An API in en_GB with a focus on code completion and infix functions for Android.' + - 'It provides a fluent API in en_GB which is designed to ease the usage of code completion.' - -dependencies { - api prefixedProject('domain-builders-android') - - testImplementation prefixedProject('verbs-internal-android') - testImplementation prefixedProject('api-infix-en_GB-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-android/build.gradle b/apis/fluent-en_GB/atrium-api-fluent-en_GB-android/build.gradle deleted file mode 100644 index 8e2e62326..000000000 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-android/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -description = 'A fluent assertion function API in en_GB with a focus on code completion for Android.' - -dependencies { - api prefixedProject('domain-builders-android') - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/apis/fluent-en_GB/extensions/jdk8/atrium-api-fluent-en_GB-jdk8-android/build.gradle b/apis/fluent-en_GB/extensions/jdk8/atrium-api-fluent-en_GB-jdk8-android/build.gradle deleted file mode 100644 index 4f05d5004..000000000 --- a/apis/fluent-en_GB/extensions/jdk8/atrium-api-fluent-en_GB-jdk8-android/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -description = 'JDK 8 specific assertion functions and builders for fluent-en_GB-android.' - -dependencies { - api prefixedProject('api-fluent-en_GB-android') - api prefixedProject('domain-builders-android') - api "ch.tutteli.niok:niok-android:$niok_version" - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-android/build.gradle b/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-android/build.gradle deleted file mode 100644 index 293280a78..000000000 --- a/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-android/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -description = 'Kotlin 1.3 specific assertion functions and builders for fluent-en_GB-android -- will be merged into fluent-en_GB-android with 1.0.0' - -dependencies { - api prefixedProject('api-fluent-en_GB-android') - api prefixedProject('domain-builders-kotlin_1_3-android') - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-android/build.gradle b/apis/infix-en_GB/atrium-api-infix-en_GB-android/build.gradle deleted file mode 100644 index 3a116068b..000000000 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-android/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -description = 'An infix API in en_GB with a focus on code completion for Android.' - -dependencies { - api prefixedProject('domain-builders-android') - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) - -tasks.withType(Test) { - systemProperty("ch.tutteli.atrium.reporting.reporterFactory", "ascii") -} diff --git a/apis/infix-en_GB/extensions/jdk8/atrium-api-infix-en_GB-jdk8-android/build.gradle b/apis/infix-en_GB/extensions/jdk8/atrium-api-infix-en_GB-jdk8-android/build.gradle deleted file mode 100644 index 173797e98..000000000 --- a/apis/infix-en_GB/extensions/jdk8/atrium-api-infix-en_GB-jdk8-android/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -description = 'JDK 8 specific assertion functions and builders for infix-en_GB-android.' - -dependencies { - api prefixedProject('api-infix-en_GB-android') - api prefixedProject('domain-builders-android') - api "ch.tutteli.niok:niok-android:$niok_version" - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-android/build.gradle b/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-android/build.gradle deleted file mode 100644 index 0b86c16c9..000000000 --- a/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-android/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -description = 'Kotlin 1.3 specific assertion functions and builders for infix-en_GB-android -- will be merged into infix-en_GB-android with 1.0.0' - -dependencies { - api prefixedProject('api-infix-en_GB-android') - api prefixedProject('domain-builders-kotlin_1_3-android') - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/build.gradle b/build.gradle index 9dccf938a..7510784bd 100644 --- a/build.gradle +++ b/build.gradle @@ -505,15 +505,6 @@ useJupiter( 'cc-en_GB-robstoll-jvm', 'cc-infix-en_GB-robstoll-jvm', ) -//TODO merge with above as soon as https://youtrack.jetbrains.com/issue/KT-29069 is fixed -if (System.getenv('CI')) { - useJupiter( - 'core-api-android', - 'cc-de_CH-robstoll-android', - 'cc-en_GB-robstoll-android', - 'cc-infix-en_GB-robstoll-android', - ) -} def buildNonDeprecatedJvm = task('buildNonDeprecatedJvm', group: build, description: 'builds all JVM modules') buildNonDeprecatedJvm.dependsOn(jacocoMulti.jacocoProjects.findAll { diff --git a/bundles/cc-de_CH-robstoll/atrium-cc-de_CH-robstoll-android/build.gradle b/bundles/cc-de_CH-robstoll/atrium-cc-de_CH-robstoll-android/build.gradle deleted file mode 100644 index 7c1f26346..000000000 --- a/bundles/cc-de_CH-robstoll/atrium-cc-de_CH-robstoll-android/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -description = 'Represents a convenience module which merely bundles dependencies for Android.' - -dependencies { - api prefixedProject('api-fluent-en_GB-android') - api prefixedProject('verbs-android') - api prefixedProject('api-cc-de_CH-android') - api prefixedProject('translations-de_CH-android') - api prefixedProject('domain-builders-android') - api prefixedProject('domain-api-android') - api prefixedProject('core-api-android') - - runtimeOnly prefixedProject('domain-robstoll-android') - runtimeOnly prefixedProject('core-robstoll-android') - - //TODO remove with 1.0.0 - implementation prefixedProject('assertions') - api prefixedProject('core-api-deprecated') - implementation prefixedProject('core-robstoll-deprecated') - api prefixedProject('translations-de_CH-deprecated') -} - -//TODO should not be necessary https://youtrack.jetbrains.com/issue/KT-28124 -compileKotlin.dependsOn( - prefixedProject('domain-robstoll-android').jar, - prefixedProject('core-robstoll-android').jar -) diff --git a/bundles/cc-en_GB-robstoll/atrium-cc-en_GB-robstoll-android/build.gradle b/bundles/cc-en_GB-robstoll/atrium-cc-en_GB-robstoll-android/build.gradle deleted file mode 100644 index e73cf5996..000000000 --- a/bundles/cc-en_GB-robstoll/atrium-cc-en_GB-robstoll-android/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -description = 'Represents a convenience module which merely bundles dependencies for Android.' - -dependencies { - api prefixedProject('verbs-android') - api prefixedProject('api-cc-en_GB-android') - api prefixedProject('translations-en_GB-android') - api prefixedProject('domain-builders-android') - api prefixedProject('domain-api-android') - api prefixedProject('core-api-android') - - runtimeOnly prefixedProject('domain-robstoll-android') - runtimeOnly prefixedProject('core-robstoll-android') - - // here to ease migration; so that ReplaceWith of @Deprecated works - api prefixedProject('api-fluent-en_GB-android') -} - -//TODO should not be necessary https://youtrack.jetbrains.com/issue/KT-28124 -compileKotlin.dependsOn( - prefixedProject('domain-robstoll-android').jar -) diff --git a/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-android/build.gradle b/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-android/build.gradle deleted file mode 100644 index 719a0a5fb..000000000 --- a/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-android/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -description = 'Represents a convenience module which merely bundles dependencies for Android.' - -dependencies { - api prefixedProject('verbs-android') - api prefixedProject('api-cc-infix-en_GB-android') - api prefixedProject('translations-en_GB-android') - api prefixedProject('domain-builders-android') - api prefixedProject('domain-api-android') - api prefixedProject('core-api-android') - - runtimeOnly prefixedProject('domain-robstoll-android') - runtimeOnly prefixedProject('core-robstoll-android') - - // here to ease migration; so that ReplaceWith of @Deprecated works - api prefixedProject('api-infix-en_GB-android') -} - -//TODO should not be necessary https://youtrack.jetbrains.com/issue/KT-28124 -compileKotlin.dependsOn( - prefixedProject('domain-robstoll-android').compileKotlin -) diff --git a/bundles/fluent-en_GB/atrium-fluent-en_GB-android/build.gradle b/bundles/fluent-en_GB/atrium-fluent-en_GB-android/build.gradle deleted file mode 100644 index 1896f706c..000000000 --- a/bundles/fluent-en_GB/atrium-fluent-en_GB-android/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -description = 'Represents a convenience module which merely bundles dependencies for Android.' - -dependencies { - api prefixedProject('verbs-android') - api prefixedProject('api-fluent-en_GB-android') - api prefixedProject('translations-en_GB-android') - api prefixedProject('domain-builders-android') - api prefixedProject('domain-api-android') - api prefixedProject('core-api-android') - - runtimeOnly prefixedProject('domain-robstoll-android') - runtimeOnly prefixedProject('core-robstoll-android') - - //TODO remove once all specs are with spek2 where they are set via spek plugin - spekDep(delegate) -} - -srcAndResourcesFromJvmProject(project) diff --git a/bundles/infix-en_GB/atrium-infix-en_GB-android/build.gradle b/bundles/infix-en_GB/atrium-infix-en_GB-android/build.gradle deleted file mode 100644 index fe21f751f..000000000 --- a/bundles/infix-en_GB/atrium-infix-en_GB-android/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -description = 'Represents a convenience module which merely bundles dependencies for Android.' - -dependencies { - api prefixedProject('verbs-android') - api prefixedProject('api-infix-en_GB-android') - api prefixedProject('translations-en_GB-android') - api prefixedProject('domain-builders-android') - api prefixedProject('domain-api-android') - api prefixedProject('core-api-android') - - runtimeOnly prefixedProject('domain-robstoll-android') - runtimeOnly prefixedProject('core-robstoll-android') - - //TODO remove once all specs are with spek2 where they are set via spek plugin - spekDep(delegate) -} - -srcAndResourcesFromJvmProject(project) diff --git a/core/api/atrium-core-api-android/build.gradle b/core/api/atrium-core-api-android/build.gradle deleted file mode 100644 index 4151b1bda..000000000 --- a/core/api/atrium-core-api-android/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -description = 'API of the core of Atrium for Android.' - -dependencies { - api kbox(), excludeKotlin - api kotlinReflect() - - testImplementation prefixedProject('api-infix-en_GB-android') - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-android/build.gradle b/core/robstoll-lib/atrium-core-robstoll-lib-android/build.gradle deleted file mode 100644 index 591ca1d9f..000000000 --- a/core/robstoll-lib/atrium-core-robstoll-lib-android/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -description = 'Contains the bits and pieces behind robstoll\'s implementation ' + - 'of Atrium for Android. You should only depend on this module if you are ' + - 'providing an implementation as well and want to reuse certain artifacts. If you are a consumer of ' + - 'Atrium, then you should depend on atrium-core-robstoll instead.' - -dependencies { - implementation prefixedProject('core-api-android') - - // it is up to the consumer of atrium-core-robstoll-lib which atrium-translations module is used at runtime - compileOnly prefixedProject('translations-en_GB-android') - - testImplementation prefixedProject('api-fluent-en_GB-android') - testImplementation prefixedProject('specs-android') -} - - -//TODO should not be necessary https://youtrack.jetbrains.com/issue/KT-28124 -compileTestKotlin.dependsOn( - prefixedProject('core-robstoll-android').compileKotlin, - prefixedProject('core-robstoll-android').processResources, - prefixedProject('domain-robstoll-android').compileKotlin, - prefixedProject('domain-robstoll-android').processResources -) - -srcAndResourcesFromJvmProject(project) diff --git a/core/robstoll/atrium-core-robstoll-android/build.gradle b/core/robstoll/atrium-core-robstoll-android/build.gradle deleted file mode 100644 index a50369caf..000000000 --- a/core/robstoll/atrium-core-robstoll-android/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -description = 'robstoll\'s implementation of the core of Atrium for the JVM platform.' - -dependencies { - api prefixedProject('core-api-android') - implementation prefixedProject('core-robstoll-lib-android') -} - -srcAndResourcesFromJvmProject(project) \ No newline at end of file diff --git a/domain/api/atrium-domain-api-android/build.gradle b/domain/api/atrium-domain-api-android/build.gradle deleted file mode 100644 index 7560cc2d5..000000000 --- a/domain/api/atrium-domain-api-android/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -description = 'API of the domain of Atrium for Android.' - -dependencies { - api prefixedProject('core-api-android') - - // it is up to the consumer of atrium-domain-api which atrium-translations module is used at runtime - compileOnly prefixedProject('translations-en_GB-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/domain/api/extensions/kotlin_1_3/atrium-domain-api-kotlin_1_3-android/build.gradle b/domain/api/extensions/kotlin_1_3/atrium-domain-api-kotlin_1_3-android/build.gradle deleted file mode 100644 index cc4de9d81..000000000 --- a/domain/api/extensions/kotlin_1_3/atrium-domain-api-kotlin_1_3-android/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -description = 'Kotlin 1.3 specific extension for domain-api-android -- will be merged into domain-api-android with 1.0.0' - -dependencies { - api prefixedProject('domain-api-android') - api prefixedProject('core-api-android') - - // it is up to the consumer of atrium-domain-api which atrium-translations module is used at runtime - compileOnly prefixedProject('translations-en_GB-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/domain/builders/atrium-domain-builders-android/build.gradle b/domain/builders/atrium-domain-builders-android/build.gradle deleted file mode 100644 index 1787a7713..000000000 --- a/domain/builders/atrium-domain-builders-android/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -description = 'Contains base classes for sophisticated assertion builders which can be re-used in APIs for Android.' - -dependencies { - api prefixedProject('domain-api-android') - - // it is up to the consumer of atrium-domain-builders which atrium-translations module is used at runtime - compileOnly prefixedProject('translations-en_GB-android') - - testImplementation prefixedProject('api-fluent-en_GB-android') - testImplementation prefixedProject('specs-android') - - //TODO remove with 1.0.0, only used for FeatureAssertionBuilderName...Spec - testImplementation prefixedProject('api-cc-en_GB-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/domain/builders/extensions/kotlin_1_3/atrium-domain-builders-kotlin_1_3-android/build.gradle b/domain/builders/extensions/kotlin_1_3/atrium-domain-builders-kotlin_1_3-android/build.gradle deleted file mode 100644 index ad99330fe..000000000 --- a/domain/builders/extensions/kotlin_1_3/atrium-domain-builders-kotlin_1_3-android/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -description = 'Kotlin 1.3 specific extension for domain-builders-android -- will be merged into domain-builders-android with 1.0.0' - -dependencies { - api prefixedProject('domain-builders-android') - api prefixedProject('domain-api-kotlin_1_3-android') - - // it is up to the consumer of atrium-domain-builders which atrium-translations module is used at runtime - compileOnly prefixedProject('translations-en_GB-android') - - testImplementation prefixedProject('api-fluent-en_GB-android') - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-android/build.gradle b/domain/robstoll-lib/atrium-domain-robstoll-lib-android/build.gradle deleted file mode 100644 index 35873b796..000000000 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-android/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -description = 'Contains the bits and pieces behind robstoll\'s implementation' + - 'of the domain of Atrium for Android. You should only depend on this module if you are ' + - 'providing an implementation as well and want to reuse certain artifacts. ' + - 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' - -dependencies { - api prefixedProject('domain-builders-android') - - implementation prefixedProject('api-fluent-en_GB-android') - implementation niok() - - // it is up to the consumer of atrium-domain-robstoll-lib which atrium-translations module is used at runtime - compileOnly prefixedProject('translations-en_GB-android') - - //TODO remove with 1.0.0 - implementation prefixedProject('api-cc-en_GB-android') - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/domain/robstoll-lib/extensions/kotlin_1_3/atrium-domain-robstoll-lib-kotlin_1_3-android/build.gradle b/domain/robstoll-lib/extensions/kotlin_1_3/atrium-domain-robstoll-lib-kotlin_1_3-android/build.gradle deleted file mode 100644 index df56f48e1..000000000 --- a/domain/robstoll-lib/extensions/kotlin_1_3/atrium-domain-robstoll-lib-kotlin_1_3-android/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -description = 'Kotlin 1.3 specific extension for domain-robstoll-lib-android -- will be merged into domain-robstoll-lib-android with 1.0.0' - -dependencies { - api prefixedProject('domain-robstoll-lib-android') - api prefixedProject('domain-builders-kotlin_1_3-android') - - implementation prefixedProject('api-fluent-en_GB-android') - implementation niok() - - // it is up to the consumer of atrium-domain-robstoll-lib which atrium-translations module is used at runtime - compileOnly prefixedProject('translations-en_GB-android') - - //TODO remove with 1.0.0 - implementation prefixedProject('api-cc-en_GB-android') - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/domain/robstoll/atrium-domain-robstoll-android/build.gradle b/domain/robstoll/atrium-domain-robstoll-android/build.gradle deleted file mode 100644 index 4bef2d7a4..000000000 --- a/domain/robstoll/atrium-domain-robstoll-android/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -description = 'robstoll\'s implementation of the domain (assertion functions and builders) of Atrium for Android.' - -dependencies { - api prefixedProject('domain-api-android') - implementation prefixedProject('domain-robstoll-lib-android') -} - -srcAndResourcesFromJvmProject(project) \ No newline at end of file diff --git a/domain/robstoll/extensions/kotlin_1_3/atrium-domain-robstoll-kotlin_1_3-android/build.gradle b/domain/robstoll/extensions/kotlin_1_3/atrium-domain-robstoll-kotlin_1_3-android/build.gradle deleted file mode 100644 index 2bebf2647..000000000 --- a/domain/robstoll/extensions/kotlin_1_3/atrium-domain-robstoll-kotlin_1_3-android/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -description = 'Kotlin 1.3 specific extension for domain-robstoll-android -- will be merged into domain-robstoll-android with 1.0.0' - -dependencies { - api prefixedProject('domain-robstoll-android') - api prefixedProject('domain-api-kotlin_1_3-android') - implementation prefixedProject('domain-robstoll-lib-kotlin_1_3-android') -} - -srcAndResourcesFromJvmProject(project) diff --git a/misc/specs/atrium-specs-android/build.gradle b/misc/specs/atrium-specs-android/build.gradle deleted file mode 100644 index 965687e56..000000000 --- a/misc/specs/atrium-specs-android/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -description = 'Provides specifications of Atrium (for the Android platform) which can be reused by ' + - 'APIs and domain/core-implementations of Atrium, to verify that they fulfill the specification.' - -dependencies { - api prefixedProject('domain-api-android') - api prefixedProject('core-api-android') - api prefixedProject('domain-builders-android') - // exclude this dependency in case you want to use another translation - api prefixedProject('translations-en_GB-android') - api prefixedProject('verbs-internal-android') - api spekExtensions() - api "io.mockk:mockk:$mockk_version" - api niok(), excludeKotlin - - implementation prefixedProject('api-fluent-en_GB-android') - - - // exclude these dependencies in case you want to use another implementation - runtimeOnly prefixedProject('core-robstoll-android') - runtimeOnly prefixedProject('domain-robstoll-android') - runtimeOnly prefixedProject('domain-robstoll-kotlin_1_3-android') - - //TODO 1.0.0 remove, only needed for returnValueOf test - implementation prefixedProject('api-cc-en_GB-android') -} - -dependencies { - //spek2 requires stdlib-jdk8 and kotlin-reflect - runtimeOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - runtimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - - api "org.spekframework.spek2:spek-dsl-jvm:$spek2_version", excludeKotlin - runtimeOnly "org.spekframework.spek2:spek-runner-junit5:$spek2_version", excludeKotlin - - //TODO #116 remove once there aren't any spek1 specs anymore - api "org.jetbrains.spek:spek-api:$spek_version", excludeKotlin - api mockito(), excludeKotlin -} - -srcAndResourcesFromJvmProject(project) - -compileKotlin.kotlinOptions.languageVersion = '1.3' diff --git a/misc/verbs-internal/atrium-verbs-internal-android/build.gradle b/misc/verbs-internal/atrium-verbs-internal-android/build.gradle deleted file mode 100644 index 73faf0cbb..000000000 --- a/misc/verbs-internal/atrium-verbs-internal-android/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -description = 'Specifies the internally used assertion verbs for Android.' - -dependencies { - api prefixedProject('core-api-android') - api prefixedProject('domain-builders-android') - api prefixedProject('spec') - - runtimeOnly prefixedProject('domain-robstoll-android') - runtimeOnly prefixedProject('core-robstoll-android') - - testImplementation prefixedProject('specs-android') -} - -srcAndResourcesFromJvmProject(project) - -//TODO should not be necessary https://youtrack.jetbrains.com/issue/KT-28124 -compileKotlin.dependsOn( - prefixedProject('core-robstoll-jvm').jar -) diff --git a/misc/verbs/atrium-verbs-android/build.gradle b/misc/verbs/atrium-verbs-android/build.gradle deleted file mode 100644 index 0879534d9..000000000 --- a/misc/verbs/atrium-verbs-android/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -description = 'Assertion verbs for Atrium for Android.' - -dependencies { - api prefixedProject('domain-builders-android') - api prefixedProject('core-api-android') - - testImplementation prefixedProject('specs-android') - testRuntimeOnly prefixedProject('domain-robstoll-android') - testRuntimeOnly prefixedProject('core-robstoll-android') - - //TODO remove with 1.0.0 - testImplementation prefixedProject('spec') -} - -srcAndResourcesFromJvmProject(project) diff --git a/settings.gradle b/settings.gradle index 65ef4cec4..def48f17b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,25 +12,14 @@ buildscript { apply plugin: 'ch.tutteli.settings' -//TODO remove as soon as https://youtrack.jetbrains.com/issue/KT-29069 is fixed -def kotlinJvmJsAndAndroidIfCi = { self, String suffix -> - if (System.getenv('CI')) { - self.kotlinJvmJsAndroid(suffix) - } else { - self.kotlinJvmJs(suffix) - } -} -def kotlinJvmAndAndroidIfCi = { self, String suffix -> +def kotlinJvm = { self, String suffix -> self.folder(suffix, "$suffix-") { prefixed('common', 'jvm') - if (System.getenv('CI')) { - prefixed('android') - } } } def bundleWithExtensionsAndSmokeTest = { self, String apiName -> - kotlinJvmJsAndAndroidIfCi(self, apiName) + self.kotlinJvmJs(apiName) if (JavaVersion.current() >= JavaVersion.VERSION_1_9) { self.folder(apiName) { @@ -43,11 +32,11 @@ def bundleWithExtensionsAndSmokeTest = { self, String apiName -> } def apiWithExtensions = { self, String apiName -> - kotlinJvmJsAndAndroidIfCi(self, apiName) + self.kotlinJvmJs(apiName) self.folder(apiName, "$apiName-") { extensions { - kotlinJvmAndAndroidIfCi(delegate, 'jdk8') - kotlinJvmJsAndAndroidIfCi(delegate, 'kotlin_1_3') + kotlinJvm(delegate, 'jdk8') + kotlinJvmJs('kotlin_1_3') } } } @@ -66,52 +55,52 @@ include { } domain('domain-') { - kotlinJvmJsAndAndroidIfCi(delegate, 'api') - kotlinJvmJsAndAndroidIfCi(delegate, 'builders') - kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll') - kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll-lib') + kotlinJvmJs('api') + kotlinJvmJs('builders') + kotlinJvmJs('robstoll') + kotlinJvmJs('robstoll-lib') api('api-') { extensions { - kotlinJvmJsAndAndroidIfCi(delegate, 'kotlin_1_3') + kotlinJvmJs('kotlin_1_3') } } builders('builders-') { extensions { - kotlinJvmJsAndAndroidIfCi(delegate, 'kotlin_1_3') + kotlinJvmJs('kotlin_1_3') } } robstoll('robstoll-') { extensions { - kotlinJvmJsAndAndroidIfCi(delegate, 'kotlin_1_3') + kotlinJvmJs('kotlin_1_3') } } folder('robstoll-lib', 'robstoll-lib-') { extensions { - kotlinJvmJsAndAndroidIfCi(delegate, 'kotlin_1_3') + kotlinJvmJs('kotlin_1_3') } } } core('core-') { - kotlinJvmJsAndAndroidIfCi(delegate, 'api') - kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll') - kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll-lib') + kotlinJvmJs('api') + kotlinJvmJs('robstoll') + kotlinJvmJs('robstoll-lib') } translations('translations-') { - kotlinJvmJsAndAndroidIfCi(delegate, 'de_CH') - kotlinJvmJsAndAndroidIfCi(delegate, 'en_GB') + kotlinJvmJs('de_CH') + kotlinJvmJs('en_GB') } misc { _ 'spec' - kotlinJvmJsAndAndroidIfCi(delegate, 'specs') - kotlinJvmJsAndAndroidIfCi(delegate, 'verbs') - kotlinJvmJsAndAndroidIfCi(delegate, 'verbs-internal') + kotlinJvmJs('specs') + kotlinJvmJs('verbs') + kotlinJvmJs('verbs-internal') tools { _ 'bc-test' @@ -123,9 +112,9 @@ include { bundles { _ 'cc-en_UK-robstoll' _ 'cc-infix-en_UK-robstoll' - kotlinJvmJsAndAndroidIfCi(delegate, 'cc-de_CH-robstoll') - kotlinJvmJsAndAndroidIfCi(delegate, 'cc-en_GB-robstoll') - kotlinJvmJsAndAndroidIfCi(delegate, 'cc-infix-en_GB-robstoll') + kotlinJvmJs('cc-de_CH-robstoll') + kotlinJvmJs('cc-en_GB-robstoll') + kotlinJvmJs('cc-infix-en_GB-robstoll') if (JavaVersion.current() >= JavaVersion.VERSION_1_9) { folder('cc-en_GB-robstoll') { @@ -140,9 +129,9 @@ include { folder('apis', 'api-') { _ 'cc-en_UK' _ 'cc-infix-en_UK' - kotlinJvmJsAndAndroidIfCi(delegate, 'cc-de_CH') - kotlinJvmJsAndAndroidIfCi(delegate, 'cc-en_GB') - kotlinJvmJsAndAndroidIfCi(delegate, 'cc-infix-en_GB') + kotlinJvmJs('cc-de_CH') + kotlinJvmJs('cc-en_GB') + kotlinJvmJs('cc-infix-en_GB') } domain('domain-') { _ 'api-deprecated' diff --git a/translations/de_CH/atrium-translations-de_CH-android/build.gradle b/translations/de_CH/atrium-translations-de_CH-android/build.gradle deleted file mode 100644 index 1b87375fa..000000000 --- a/translations/de_CH/atrium-translations-de_CH-android/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -description = 'Contains translations for Atrium in de_CH for Android.' - -dependencies { - api prefixedProject('core-api-android') -} - -srcAndResourcesFromJvmProject(project) \ No newline at end of file diff --git a/translations/en_GB/atrium-translations-en_GB-android/build.gradle b/translations/en_GB/atrium-translations-en_GB-android/build.gradle deleted file mode 100644 index 1b1a034a2..000000000 --- a/translations/en_GB/atrium-translations-en_GB-android/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -description = 'Contains translations for Atrium in en_GB for the JVM platform.' - -dependencies { - api prefixedProject('core-api-jvm') -} - -srcAndResourcesFromJvmProject(project)