From 744657a8b76e45fe3cab2ec56052a00f95718eab Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Tue, 10 Aug 2021 13:22:30 +0200 Subject: [PATCH] remove last remaining bits of bintray/jcenter and switch installation example to kotlin-dsl --- README.md | 38 +++++++++---------------- build.gradle | 1 - misc/tools/readme-examples/build.gradle | 4 --- samples/maven/settings.xml | 32 --------------------- 4 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 samples/maven/settings.xml diff --git a/README.md b/README.md index 7c8db76da..382da0e96 100644 --- a/README.md +++ b/README.md @@ -87,20 +87,16 @@ For instance, the [README of v0.17.0-RC1](https://github.com/robstoll/atrium/tre # Installation ## JVM -Atrium is linked to [mavenCentral](https://search.maven.org/search?q=g:ch.tutteli.atrium), -[jcenter](https://bintray.com/bintray/jcenter?filterByPkgName=atrium) -but can also be retrieved directly from [bintray](https://bintray.com/robstoll/tutteli-jars/atrium). +Atrium is published to [mavenCentral](https://search.maven.org/search?q=g:ch.tutteli.atrium). *gradle*: ``` -buildscript { - ext { atrium_version='0.17.0-RC1' } -} repositories { mavenCentral() } +val atriumVersion by extra("0.17.0-RC1") dependencies { - testImplementation "ch.tutteli.atrium:atrium-fluent-en_GB:$atrium_version" + testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:$atriumVersion") } ``` We have defined a dependency to the bundle `atrium-fluent-en_GB` in the above example @@ -115,7 +111,7 @@ We currently provide the following extensions for the JVM platform: You can enable them as follows: ``` dependencies { - testImplementation "ch.tutteli.atrium:atrium-api-fluent-en_GB-kotlin_1_3:$atrium_version" + testImplementation("ch.tutteli.atrium:atrium-api-fluent-en_GB-kotlin_1_3:$atriumVersion") } ``` @@ -125,21 +121,19 @@ Also take a look at [Third-party Extensions](#third-party-extensions) which migh click to see how the setup for the infix API looks like ``` -buildscript { - ext { atrium_version='0.17.0-RC1' } -} repositories { mavenCentral() } +val atriumVersion by extra("0.17.0-RC1") dependencies { - testImplementation "ch.tutteli.atrium:atrium-infix-en_GB:$atrium_version" + testImplementation("ch.tutteli.atrium:atrium-infix-en_GB:$atriumVersion") } ``` And for the aforementioned extensions: ``` dependencies { - testImplementation "ch.tutteli.atrium:atrium-api-infix-en_GB-kotlin_1_3:$atrium_version" + testImplementation("ch.tutteli.atrium:atrium-api-infix-en_GB-kotlin_1_3:$atriumVersion") } ``` @@ -157,14 +151,12 @@ That is all, you are all set. Jump to [Examples](#examples) which shows how to u ## JS ``` -buildscript { - ext { atrium_version='0.17.0-RC1' } -} repositories { mavenCentral() } +val atriumVersion by extra("0.17.0-RC1") dependencies { - testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB-js:$atrium_version") + testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB-js:$atriumVersion") } ``` @@ -191,7 +183,7 @@ We currently provide the following extensions for the JS platform: You can enable them as follows: ``` dependencies { - testImplementation "ch.tutteli.atrium:atrium-api-fluent-en_GB-kotlin_1_3-js:$atrium_version" + testImplementation("ch.tutteli.atrium:atrium-api-fluent-en_GB-kotlin_1_3-js:$atriumVersion") } ``` @@ -199,21 +191,19 @@ dependencies { click to see how the setup for the infix API looks like ``` -buildscript { - ext { atrium_version='0.17.0-RC1' } -} repositories { mavenCentral() } +val atriumVersion by extra("0.17.0-RC1") dependencies { - testImplementation "ch.tutteli.atrium:atrium-infix-en_GB-js:$atrium_version" + testImplementation("ch.tutteli.atrium:atrium-infix-en_GB-js:$atriumVersion") } ``` and for the aforementioned extensions: ``` dependencies { - testImplementation "ch.tutteli.atrium:atrium-api-infix-en_GB-kotlin_1_3-js:$atrium_version" + testImplementation("ch.tutteli.atrium:atrium-api-infix-en_GB-kotlin_1_3-js:$atriumVersion") } ```
@@ -2396,7 +2386,7 @@ In order to create an own expectation verb it is sufficient to: Taking the setup shown in the [Installation](#installation) section for the JVM platform, you would replace the `dependencies` block as follows: ```gradle dependencies { - testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:$atrium_version") { + testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:$atriumVersion") { exclude group: 'ch.tutteli.atrium', module: 'atrium-verbs' } } diff --git a/build.gradle b/build.gradle index e3579af37..74e25dd22 100644 --- a/build.gradle +++ b/build.gradle @@ -111,7 +111,6 @@ kotlinutils.kotlinVersion = kotlin_version repositories { mavenCentral() - jcenter() } configurations { diff --git a/misc/tools/readme-examples/build.gradle b/misc/tools/readme-examples/build.gradle index fc4b930bf..fe474eebb 100644 --- a/misc/tools/readme-examples/build.gradle +++ b/misc/tools/readme-examples/build.gradle @@ -1,9 +1,5 @@ description = 'Runs examples, includes the code and the output in README.md' -repositories { - maven { url "https://dl.bintray.com/jetbrains/spek" } -} - apply plugin: 'kotlin' dependencies { implementation "org.junit.platform:junit-platform-console-standalone:$junitPlatformVersion" diff --git a/samples/maven/settings.xml b/samples/maven/settings.xml deleted file mode 100644 index 9d64e702f..000000000 --- a/samples/maven/settings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - jcenter - - - - bintray - - - - false - - bintray-robstoll-tutteli-jars - bintray - https://dl.bintray.com/robstoll/tutteli-jars - - - - - jcenter - - - jcenter - https://jcenter.bintray.com/ - - - - -