diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9577075ee7..513c0c254a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -78,7 +78,7 @@ The following are a few guidelines on how we suggest you start. - EditorConfig by JetBrains (might be already activated) - Spek Framework by Spek Team 3. Import the project (import the build.gradle -> import as project, works more reliably) -4. Open up a terminal (e.g. Intellij's built in -> usually ALT+F12) and run `./gr build` +4. Open up a terminal (e.g. Intellij's built in -> usually ALT+F12) and run `./gradlew build` This builds the project (compile, run tests etc) via gradle (notice, we renamed `gradlew` to `gr`, more convenient no?) 5. Read up the [Coding Conventions of Atrium](#coding-conventions) (there are only 5 points). diff --git a/.github/workflows/java-windows.yml b/.github/workflows/java-windows.yml index 08c5ed83f3..4071cbd02a 100644 --- a/.github/workflows/java-windows.yml +++ b/.github/workflows/java-windows.yml @@ -17,7 +17,7 @@ jobs: with: java-version: ${{ matrix.java_version }} - name: Build buildNonDeprecatedJvm - run: ./gr buildNonDeprecatedJvm + run: ./gradlew buildNonDeprecatedJvm - name: build sample atrium+spek project run: samples\jvm\spek\gradlew -p samples\jvm\spek build diff --git a/.travis.yml b/.travis.yml index bbc60f7a98..2ee46bd82a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,30 +4,28 @@ language: java jdk: - openjdk11 -before_install: chmod +x gr - install: skip jobs: include: - env: MODE=current_11 - script: ./gr buildAllWithoutJs + script: ./gradlew buildAllWithoutJs after_success: bash <(curl -s https://codecov.io/bash) -F current - env: MODE=current_8 jdk: oraclejdk8 - script: ./gr buildNonDeprecatedJvm buildAllAndroid + script: ./gradlew buildNonDeprecatedJvm buildAllAndroid after_success: bash <(curl -s https://codecov.io/bash) -F current - env: MODE=js - script: ./gr buildAllJs + script: ./gradlew buildAllJs - env: MODE=bbc - script: ./gr bbcTests + script: ./gradlew bbcTests after_success: bash <(curl -s https://codecov.io/bash) -F bbc - env: MODE=bc - script: ./gr bcTests + script: ./gradlew bcTests after_success: bash <(curl -s https://codecov.io/bash) -F bc - env: MODE=samples diff --git a/build.gradle b/build.gradle index ca37dec334..1dce8bafe8 100644 --- a/build.gradle +++ b/build.gradle @@ -513,7 +513,7 @@ Release & deploy a commit d) commit & push changes 4. deploy to bintray: // export CI=true is a temporary work around till https://youtrack.jetbrains.com/issue/KT-29069 is fixed: - a) java -version 2>&1 | grep "version \"9" && CI=true ./gr clean publishToBintray + a) java -version 2>&1 | grep "version \"9" && CI=true ./gradlew clean publishToBintray b) Log in to bintray, check that there are 926 artifacts and publish them c) synchronise to maven central 5. create release on github diff --git a/samples/readme-examples/src/main/kotlin/readme/examples/ReadmeSpec.kt b/samples/readme-examples/src/main/kotlin/readme/examples/ReadmeSpec.kt index 2a8da0de07..6e927dce6e 100644 --- a/samples/readme-examples/src/main/kotlin/readme/examples/ReadmeSpec.kt +++ b/samples/readme-examples/src/main/kotlin/readme/examples/ReadmeSpec.kt @@ -32,7 +32,7 @@ import java.util.* * The tests and error message are written here and automatically placed into the README via generation. * The generation is done during the project built. To trigger it manually, you have to use: * ``` - * ./gr :readme-examples:build + * ./gradlew :readme-examples:build * ``` * * There are currently three kind of tags supported: