diff --git a/build.gradle b/build.gradle index 15e07f1..771c934 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,12 @@ -buildscript { - repositories { - mavenCentral() - jcenter() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - } -} - plugins { + id 'maven-publish' + id 'org.jetbrains.kotlin.jvm' version '1.2.70' + id 'org.jetbrains.dokka' version '0.9.17' id 'com.github.ben-manes.versions' version '0.20.0' id 'com.jfrog.bintray' version '1.8.4' id 'net.researchgate.release' version '2.7.0' - id 'org.jetbrains.dokka' version '0.9.17' } -apply plugin: 'kotlin' -apply plugin: 'maven-publish' - description = 'A Result monad for modelling success or failure operations.' repositories { @@ -26,13 +14,13 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' - testImplementation "junit:junit:$junitVersion" - testImplementation "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion" - testImplementation "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion" - testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion" - testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" + testImplementation 'junit:junit:4.12' + testImplementation 'org.jetbrains.kotlin:kotlin-test-common' + testImplementation 'org.jetbrains.kotlin:kotlin-test-annotations-common' + testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' + testImplementation 'org.jetbrains.kotlin:kotlin-test' } compileKotlin { diff --git a/example/build.gradle b/example/build.gradle index 44e486e..17b97aa 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,5 +1,7 @@ -apply plugin: 'application' -apply plugin: 'kotlin' +plugins { + id 'application' + id 'org.jetbrains.kotlin.jvm' +} mainClassName = 'io.ktor.server.netty.DevelopmentEngine' @@ -15,7 +17,7 @@ dependencies { implementation "io.ktor:ktor-server-core:$ktorVersion" implementation "io.ktor:ktor-server-netty:$ktorVersion" implementation "io.ktor:ktor-gson:$ktorVersion" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } compileKotlin { diff --git a/gradle.properties b/gradle.properties index 0f14906..b08b637 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,2 @@ group=com.michael-bull.kotlin-result version=1.1.1-SNAPSHOT - -junitVersion=4.12 -kotlinVersion=1.2.70