SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated kotlin samples to use gradle.properties

Browse Source
This commit is contained in:
Tim Ysewyn
2019-08-14 15:34:37 +02:00
parent 3c4772bb6f
commit 4ae10f5d41
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/standalone/kotlin/http-client/build.gradle.kts
View File

@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("org.springframework.boot") version "2.2.0.BUILD-SNAPSHOT"
id("org.springframework.boot")
id("io.spring.dependency-management") version "1.0.7.RELEASE"
id("maven-publish")
kotlin("jvm") version "1.3.41"

1
samples/standalone/kotlin/http-client/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.daemon=false
BOM_VERSION=Hoxton.BUILD-SNAPSHOT
bootVersion=2.2.0.BUILD-SNAPSHOT

3
samples/standalone/kotlin/http-client/settings.gradle.kts
View File

@@ -8,9 +8,10 @@ pluginManagement {
gradlePluginPortal()
}
resolutionStrategy {
val bootVersion: String by settings
eachPlugin {
if (requested.id.id == "org.springframework.boot") {
useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
useModule("org.springframework.boot:spring-boot-gradle-plugin:$bootVersion")
}
}
}

6
samples/standalone/kotlin/http-server/build.gradle.kts
View File

@@ -2,9 +2,9 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("org.springframework.boot") version "2.2.0.M5"
id("org.springframework.boot")
id("io.spring.dependency-management") version "1.0.7.RELEASE"
id("spring-cloud-contract") version "2.2.0.BUILD-SNAPSHOT"
id("spring-cloud-contract")
id("maven-publish")
kotlin("jvm") version "1.3.41"
kotlin("plugin.spring") version "1.3.41"
@@ -91,4 +91,4 @@ tasks.withType<KotlinCompile> {
freeCompilerArgs = listOf("-Xjsr305=strict")
jvmTarget = "1.8"
}
}
}

2
samples/standalone/kotlin/http-server/gradle.properties
View File

@@ -1,2 +1,4 @@
org.gradle.daemon=false
verifierVersion=2.2.0.BUILD-SNAPSHOT
BOM_VERSION=Hoxton.BUILD-SNAPSHOT
bootVersion=2.2.0.BUILD-SNAPSHOT

6
samples/standalone/kotlin/http-server/settings.gradle.kts
View File

@@ -8,12 +8,14 @@ pluginManagement {
gradlePluginPortal()
}
resolutionStrategy {
val bootVersion: String by settings
val verifierVersion: String by settings
eachPlugin {
if (requested.id.id == "org.springframework.boot") {
useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
useModule("org.springframework.boot:spring-boot-gradle-plugin:$bootVersion")
}
if (requested.id.id == "spring-cloud-contract") {
useModule("org.springframework.cloud:spring-cloud-contract-gradle-plugin:${requested.version}")
useModule("org.springframework.cloud:spring-cloud-contract-gradle-plugin:$verifierVersion")
}
}
}