diff --git a/build.gradle b/build.gradle index a052834..359ad5c 100644 --- a/build.gradle +++ b/build.gradle @@ -26,12 +26,14 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion" - testCompile "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion" - testCompile "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion" + testImplementation "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion" + testImplementation "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion" } dokka { + kotlinTasks { [] } + sourceDirs = sourceSets.main.kotlin.srcDirs outputFormat = 'javadoc' outputDirectory = "${docsDir}/javadoc" } diff --git a/gradle.properties b/gradle.properties index 7ca5c36..982193f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=com.github.michaelbull version=1.0.9-SNAPSHOT -dokkaVersion=0.9.14 -hamkrestVersion=1.4.2.0 +dokkaVersion=0.9.17 +hamkrestVersion=1.6.0.0 junitVersion=4.12 -kotlinVersion=1.2.60 +kotlinVersion=1.2.70 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 58d9f15..b10568f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Dec 16 19:22:51 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/js/build.gradle b/js/build.gradle index e2aea25..ee037f6 100644 --- a/js/build.gradle +++ b/js/build.gradle @@ -5,7 +5,8 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion" expectedBy project(":") - testCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion" + + testImplementation "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion" } diff --git a/jvm/build.gradle b/jvm/build.gradle index 1a6a636..f455925 100644 --- a/jvm/build.gradle +++ b/jvm/build.gradle @@ -5,11 +5,26 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" expectedBy project(":") - testCompile "junit:junit:$junitVersion" - testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion" - testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" + + testImplementation "junit:junit:$junitVersion" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion" + testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" +} + +compileKotlin { + kotlinOptions { + freeCompilerArgs = [ "-Xjsr305=strict" ] + jvmTarget = "1.8" + } +} + +compileTestKotlin { + kotlinOptions { + freeCompilerArgs = [ "-Xjsr305=strict" ] + jvmTarget = "1.8" + } } publishing { diff --git a/settings.gradle b/settings.gradle index 9c6c6b8..e7bb3bf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,3 +2,4 @@ rootProject.name = 'kotlin-result' include 'example', 'js', 'jvm' +enableFeaturePreview('STABLE_PUBLISHING')