diff --git a/build.gradle.kts b/build.gradle.kts index bfb4a92..ac6dd5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,9 +16,9 @@ fun BintrayExtension.pkg(configure: BintrayExtension.PackageConfig.() -> Unit) { plugins { `maven-publish` - kotlin("jvm") version ("1.3.50") - id("org.jetbrains.dokka") version ("0.9.18") - id("com.github.ben-manes.versions") version ("0.25.0") + kotlin("jvm") version ("1.3.61") + id("org.jetbrains.dokka") version ("0.10.0") + id("com.github.ben-manes.versions") version ("0.27.0") id("com.jfrog.bintray") version ("1.8.4") id("net.researchgate.release") version ("2.8.1") } @@ -55,10 +55,8 @@ tasks.withType { } val dokka by tasks.existing(DokkaTask::class) { - sourceDirs = sourceSets["main"].kotlin.srcDirs outputFormat = "javadoc" outputDirectory = "$buildDir/docs/javadoc" - kotlinTasks(::defaultKotlinTasks) } val javadocJar by tasks.registering(Jar::class) { diff --git a/example/build.gradle.kts b/example/build.gradle.kts index 7d6bae3..06f2d91 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -13,7 +13,7 @@ repositories { } dependencies { - val ktorVersion = "1.2.4" + val ktorVersion = "1.2.6" implementation(rootProject) implementation(kotlin("stdlib-jdk8")) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..cc4fdc2 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 ca9d628..1ba7206 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-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 83f2acf..2fe81a7 100755 --- a/gradlew +++ b/gradlew @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/settings.gradle.kts b/settings.gradle.kts index 57f4d96..1049800 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,3 @@ -enableFeaturePreview("STABLE_PUBLISHING") - rootProject.name = "kotlin-result" include("example")