Skip to content

Commit 0ac3b44

Browse files
smyrickdariuszkuc
authored andcommitted
Update dependency versions and docs (#571)
Update various dependencies. The only minor version update is for JUnit, detekt, and ktlint so there shouldn't be any library code we need to update to take advantage of new features. At the same time, I cleaned up a couple docs and README files that reference maven still.
1 parent d3ba558 commit 0ac3b44

File tree

8 files changed

+43
-21
lines changed

8 files changed

+43
-21
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Or you can navigate to each module to build them individually.
3232

3333
We are using [mockk](http://mockk.io), [JUnit](https://junit.org/junit5/), and [jacoco](https://www.eclemma.org/jacoco/) for our main testing libraries. This ensures we have good code coverage and can easily test all cases of schema generation.
3434

35-
To run tests use Maven
35+
To run tests:
3636

3737
```shell script
3838
./gradlew check
@@ -41,7 +41,7 @@ To run tests use Maven
4141
You can also view the code coverage reports published to Codecov. This validates that our coverage levels are maintained. Links are in the README.
4242

4343
### Linting
44-
We are also [ktlint](https://ktlint.github.io/) and [detekt](https://arturbosch.github.io/detekt/) for code style checking and linting. These can be run with the following Maven commands
44+
We are also [ktlint](https://ktlint.github.io/) and [detekt](https://arturbosch.github.io/detekt/) for code style checking and linting.
4545

4646
**Note**:
4747
These will be run as part of the `validate` phase of a full build but if you want to run them manually you will have to navigate to each module directory and run the command

docs/examples.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@ in this documentation should be available in the sample app.
1414

1515
In order to run it you can run
1616
[Application.kt](https://github.com/ExpediaGroup/graphql-kotlin/blob/master/examples/spring/src/main/kotlin/com/expediagroup/graphql/examples/Application.kt)
17-
directly from your IDE. Alternatively you can also use the Spring Boot maven plugin by running `mvn spring-boot:run`
18-
from the command line. Once the app has started you can explore the example schema by opening Playground endpoint at
17+
directly from your IDE. Alternatively you can also use the Spring Boot plugin from the command line.
18+
19+
```shell script
20+
./gradlew bootRun
21+
```
22+
23+
Once the app has started you can explore the example schema by opening Playground endpoint at
1924
[http://localhost:8080/playground](http://localhost:8080/playground).
2025

2126
## Federation Example

examples/federation/README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ You can make queries against the spring apps directly or combined queries from t
1313
Build the spring applications by running the following commands in the `/federation` directory
1414

1515
```shell script
16-
mvn clean install
17-
```
16+
./gradlew clean build
17+
```
1818

1919
Start the servers:
2020

2121
* Run each `Application.kt` directly from your IDE
22-
* Alternatively you can also use the spring boot maven plugin by running `mvn spring-boot:run` from the command line.
22+
* Alternatively you can also use the spring boot plugin from the command line.
23+
24+
```shell script
25+
./gradlew bootRun
26+
```
2327

2428

2529
Once the app has started you can explore the example schema by opening Playground endpoint

examples/federation/base-app/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ Build the application by running the following from examples root directory:
1818
Start the server:
1919

2020
* Run `Application.kt` directly from your IDE
21-
* Alternatively you can also use the spring boot maven plugin by running `./gradlew ::federation-example:base-app:bootRun` from the command line in the root examples directory.
21+
* Alternatively you can also use the spring boot plugin from the command line in the root examples directory.
22+
23+
```shell script
24+
./gradlew ::federation-example:base-app:bootRun
25+
```
2226

2327

2428
Once the app has started you can explore the example schema by opening Playground endpoint at http://localhost:8080/playground.

examples/federation/extend-app/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ Build the application by running the following from examples root directory:
1818
Start the server:
1919

2020
* Run `Application.kt` directly from your IDE
21-
* Alternatively you can also use the spring boot maven plugin by running `./gradlew :federation-example:extend-app:bootRun` from the command line in the root examples directory.
21+
* Alternatively you can also use the spring boot plugin from the command line in the root examples directory.
22+
23+
```shell script
24+
./gradlew :federation-example:extend-app:bootRun
25+
```
2226

2327

2428
Once the app has started you can explore the example schema by opening Playground endpoint at http://localhost:8080/playground.

examples/spring/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ From the root examples directory you can run the following:
2121
Then to start the server:
2222

2323
* Run `Application.kt` directly from your IDE
24-
* Alternatively you can also use the spring boot maven plugin by running `./gradlew :spring-example:bootRun` from the command line in the root examples directory.
24+
* Alternatively you can also use the spring boot plugin from the command line in the root examples directory.
25+
26+
```shell script
27+
./gradlew :spring-example:bootRun
28+
```
2529

2630
Once the app has started you can explore the example schema by opening the GraphQL Playground endpoint at http://localhost:8080/playground.

gradle.properties

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ org.gradle.caching=true
66
org.gradle.parallel=true
77

88
# dependencies
9-
kotlinVersion = 1.3.50
10-
kotlinCoroutinesVersion = 1.3.2
9+
kotlinVersion = 1.3.60
10+
kotlinCoroutinesVersion = 1.3.3
1111

1212
graphQLJavaVersion = 14.0
13-
jacksonVersion = 2.10.1
14-
springBootVersion = 2.2.1.RELEASE
15-
classGraphVersion = 4.8.53
16-
reactorVersion = 3.3.0.RELEASE
17-
reactorExtensionsVersion = 1.0.0.RELEASE
13+
jacksonVersion = 2.10.2
14+
springBootVersion = 2.2.4.RELEASE
15+
classGraphVersion = 4.8.60
16+
reactorVersion = 3.3.2.RELEASE
17+
reactorExtensionsVersion = 1.0.2.RELEASE
1818

1919
# test dependency versions
20-
junitVersion = 5.5.2
20+
junitVersion = 5.6.0
2121
mockkVersion = 1.9.3
2222

2323
# plugin versions
24-
detektVersion = 1.1.1
24+
detektVersion = 1.4.0
2525
dokkaVersion = 0.10.0
2626
jacocoVersion = 0.8.5
27-
ktlintVersion = 0.35.0
27+
ktlintVersion = 0.36.0
2828
ktlintPluginVersion = 9.1.1
2929
nexusPublishPluginVersion = 0.3.0
3030
stagingPluginVersion = 0.21.2

graphql-kotlin-schema-generator/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ val graphQLJavaVersion: String by project
55
val jacksonVersion: String by project
66
val kotlinVersion: String by project
77
val kotlinCoroutinesVersion: String by project
8+
val rxjavaVersion = "2.2.17"
89

910
dependencies {
1011
api("com.graphql-java:graphql-java:$graphQLJavaVersion")
@@ -13,7 +14,7 @@ dependencies {
1314
api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
1415
api("io.github.classgraph:classgraph:$classGraphVersion")
1516
api("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
16-
testImplementation("io.reactivex.rxjava2:rxjava:2.2.14")
17+
testImplementation("io.reactivex.rxjava2:rxjava:$rxjavaVersion")
1718
}
1819

1920
tasks {

0 commit comments

Comments
 (0)