diff --git a/build.gradle.kts b/build.gradle.kts index b2c3fa3..e2bf956 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,21 +4,21 @@ plugins { `java-gradle-plugin` `kotlin-dsl` `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" } val url: String by extra repositories { - jcenter() + gradlePluginPortal() } 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") } - 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("sourceJar") { @@ -74,7 +74,3 @@ pluginBundle { } } } - -// Workaround for https://github.com/gradle/kotlin-dsl/issues/509 -configurations.compile.run { setExtendsFrom(extendsFrom.minus(configurations.embeddedKotlin)) } -configurations.compileOnly.extendsFrom(configurations.embeddedKotlin) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 736fb7d..0d4a951 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 52dd1f0..a95009c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 89f4110..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = name diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..52bed19 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,4 @@ +val name: String by settings +rootProject.name = name + +enableFeaturePreview("STABLE_PUBLISHING")