From 999bc2e4b0a7b8be29f459ff3f9894cd9f716fb3 Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Mon, 1 Mar 2021 02:01:09 -0600 Subject: [PATCH] Add kotlin-scripting-compiler-embeddable for Kotlin DSL and fix outdated documentation wih respect to Rest Assured. (#1617) Fixes gh-1600 --- docs/src/main/asciidoc/_project-features-contract.adoc | 4 ++-- docs/src/main/asciidoc/gradle-project.adoc | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/src/main/asciidoc/_project-features-contract.adoc b/docs/src/main/asciidoc/_project-features-contract.adoc index e20fe4db12..9641302159 100644 --- a/docs/src/main/asciidoc/_project-features-contract.adoc +++ b/docs/src/main/asciidoc/_project-features-contract.adoc @@ -153,8 +153,6 @@ buildscript { } dependencies { classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${scContractVersion}" - // remember to add this: - classpath "org.springframework.cloud:spring-cloud-contract-spec-kotlin:${scContractVersion}" } } @@ -163,6 +161,8 @@ dependencies { // Remember to add this for the DSL support in the IDE and on the consumer side testImplementation "org.springframework.cloud:spring-cloud-contract-spec-kotlin" + // Kotlin versions are very particular down to the patch version. The needs to be the same as you have imported for your project. + testImplementation "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" } ---- ==== diff --git a/docs/src/main/asciidoc/gradle-project.adoc b/docs/src/main/asciidoc/gradle-project.adoc index 6f240540b0..356219bf1d 100644 --- a/docs/src/main/asciidoc/gradle-project.adoc +++ b/docs/src/main/asciidoc/gradle-project.adoc @@ -140,7 +140,7 @@ dependencies { == Gradle and Rest Assured 2.0 By default, Rest Assured 3.x is added to the classpath. However, to use Rest Assured 2.x, -you can add it to the plugins classpath, as the following listing shows: +you can add it instead, as the following listing shows: ==== [source,groovy,indent=0] @@ -152,8 +152,6 @@ buildscript { dependencies { classpath "org.springframework.boot:spring-boot-gradle-plugin:${springboot_version}" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${verifier_version}" - classpath "com.jayway.restassured:rest-assured:2.5.0" - classpath "com.jayway.restassured:spring-mock-mvc:2.5.0" } } @@ -172,13 +170,13 @@ and modifies the imports accordingly. [[gradle-snapshot-versions]] == Snapshot Versions for Gradle -You can add the additional snapshot repository to your `build.gradle` to use snapshot versions, +You can add the additional snapshot repository to your `settings.gradle` to use snapshot versions, which are automatically uploaded after every successful build, as the following listing shows: ==== [source,groovy,indent=0] ---- -include::{standalone_samples_path}/http-server/build.gradle[tags=repos,indent=0] +include::{standalone_samples_path}/http-server/settings.gradle[tags=repos,indent=0] } ---- ====