franklinblanco/kotlin-result
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Michael Bull 2018-09-18 18:26:45 +01:00
parent 916760ac6d
commit cc1ab4940d
6 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -26,12 +26,14 @@ repositories {
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion"
} }
dokka { dokka {
kotlinTasks { [] }
sourceDirs = sourceSets.main.kotlin.srcDirs
outputFormat = 'javadoc' outputFormat = 'javadoc'
outputDirectory = "${docsDir}/javadoc" outputDirectory = "${docsDir}/javadoc"
} }

6
gradle.properties
View File

@ -1,7 +1,7 @@
group=com.github.michaelbull group=com.github.michaelbull
version=1.0.9-SNAPSHOT version=1.0.9-SNAPSHOT
dokkaVersion=0.9.14 dokkaVersion=0.9.17
hamkrestVersion=1.4.2.0 hamkrestVersion=1.6.0.0
junitVersion=4.12 junitVersion=4.12
kotlinVersion=1.2.60 kotlinVersion=1.2.70

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,5 @@
#Sat Dec 16 19:22:51 GMT 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

5
js/build.gradle
View File

@ -5,7 +5,8 @@ repositories {
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion"
expectedBy project(":") expectedBy project(":")
testCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion"
testImplementation "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion"
} }

23
jvm/build.gradle
View File

@ -5,11 +5,26 @@ repositories {
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
expectedBy project(":") expectedBy project(":")
testCompile "junit:junit:$junitVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion" testImplementation "junit:junit:$junitVersion"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" 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 { publishing {

1
settings.gradle
View File

@ -2,3 +2,4 @@ rootProject.name = 'kotlin-result'
include 'example', 'js', 'jvm' include 'example', 'js', 'jvm'
enableFeaturePreview('STABLE_PUBLISHING')