Update Gradle wrapper and dependencies

This commit is contained in:
Minecrell 2018-07-24 14:04:52 +02:00
parent b98f371662
commit 4b26f6335e
5 changed files with 9 additions and 10 deletions

View file

@ -4,21 +4,21 @@ plugins {
`java-gradle-plugin` `java-gradle-plugin`
`kotlin-dsl` `kotlin-dsl`
`maven-publish` `maven-publish`
id("com.gradle.plugin-publish") version "0.9.8" id("com.gradle.plugin-publish") version "0.9.10"
id("net.minecrell.licenser") version "0.3" id("net.minecrell.licenser") version "0.3"
} }
val url: String by extra val url: String by extra
repositories { repositories {
jcenter() gradlePluginPortal()
} }
dependencies { dependencies {
compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.1") { compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.6") {
exclude(group = "org.jetbrains.kotlin") exclude(group = "org.jetbrains.kotlin")
} }
compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.1") compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.6")
} }
var sourceJar = task<Jar>("sourceJar") { var sourceJar = task<Jar>("sourceJar") {
@ -74,7 +74,3 @@ pluginBundle {
} }
} }
} }
// Workaround for https://github.com/gradle/kotlin-dsl/issues/509
configurations.compile.run { setExtendsFrom(extendsFrom.minus<Configuration>(configurations.embeddedKotlin)) }
configurations.compileOnly.extendsFrom(configurations.embeddedKotlin)

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

View file

@ -1 +0,0 @@
rootProject.name = name

4
settings.gradle.kts Normal file
View file

@ -0,0 +1,4 @@
val name: String by settings
rootProject.name = name
enableFeaturePreview("STABLE_PUBLISHING")