Skip to content

Commit

Permalink
Adapt to new gradle wrapper name
Browse files Browse the repository at this point in the history
  • Loading branch information
jGleitz committed Jan 27, 2020
1 parent 9f51368 commit 61cc5ce
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 61cc5ce

Please sign in to comment.