Updated dependencies.

This commit is contained in:
Erik C. Thauvin 2020-03-05 22:47:39 -08:00
parent fc4b25bda4
commit 5550f076ca
11 changed files with 55 additions and 44 deletions

10
.gitignore vendored
View file

@ -1,10 +1,10 @@
__pycache__ .vscode/*
!.vscode/extensions.json !.vscode/extensions.json
!.vscode/launch.json !.vscode/launch.json
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
!gradle-wrapper.jar
.classpath __pycache__
.classpath .classpath
.DS_Store .DS_Store
.gradle .gradle
@ -17,19 +17,15 @@ __pycache__
.project .project
.scannerwork .scannerwork
.settings .settings
.vscode/*
*.class *.class
*.code-workspace *.code-workspace
*.ctxt *.ctxt
*.ear
*.iws *.iws
*.jar
*.log *.log
*.nar *.nar
*.rar *.rar
*.sublime-* *.sublime-*
*.tar.gz *.tar.gz
*.war
*.zip *.zip
/**/.idea_modules/ /**/.idea_modules/
/**/.idea/**/caches/build_file_checksums.ser /**/.idea/**/caches/build_file_checksums.ser

6
.idea/misc.xml generated
View file

@ -6,6 +6,12 @@
<list size="0" /> <list size="0" />
</component> </component>
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_12" project-jdk-name="13" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_12" project-jdk-name="13" project-jdk-type="JavaSDK" />
<component name="SuppressionsComponent"> <component name="SuppressionsComponent">
<option name="suppComments" value="[]" /> <option name="suppComments" value="[]" />

View file

@ -8,16 +8,16 @@ import java.util.Properties
plugins { plugins {
jacoco jacoco
java java
kotlin("jvm") version "1.3.61"
`maven-publish` `maven-publish`
id("com.github.ben-manes.versions") version "0.27.0" id("com.github.ben-manes.versions") version "0.28.0"
id("com.jfrog.bintray") version "1.8.4" id("com.jfrog.bintray") version "1.8.4"
id("io.gitlab.arturbosch.detekt") version "1.5.1" id("io.gitlab.arturbosch.detekt") version "1.6.0"
id("net.thauvin.erik.gradle.semver") version "1.0.4" id("net.thauvin.erik.gradle.semver") version "1.0.4"
id("org.jetbrains.dokka") version "0.10.1" id("org.jetbrains.dokka") version "0.10.1"
id("org.jetbrains.kotlin.kapt").version("1.3.61") id("org.jetbrains.kotlin.jvm") version "1.3.70"
id("org.jetbrains.kotlin.plugin.serialization").version("1.3.61") id("org.jetbrains.kotlin.kapt") version "1.3.70"
id("org.jmailen.kotlinter") version "2.3.0" id("org.jetbrains.kotlin.plugin.serialization") version "1.3.70"
id("org.jmailen.kotlinter") version "2.3.2"
id("org.sonarqube") version "2.8" id("org.sonarqube") version "2.8"
} }
@ -34,7 +34,7 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
val publicationName = "mavenJava" val publicationName = "mavenJava"
object VersionInfo { object VersionInfo {
const val okhttp = "4.3.1" const val okhttp = "4.4.0"
} }
val versions: VersionInfo by extra { VersionInfo } val versions: VersionInfo by extra { VersionInfo }
@ -61,15 +61,17 @@ dependencies {
kapt(semverProcessor) kapt(semverProcessor)
compileOnly(semverProcessor) compileOnly(semverProcessor)
compile("javax.servlet:javax.servlet-api:4.0.1") implementation("javax.servlet:javax.servlet-api:4.0.1")
compile("com.squareup.okhttp3:okhttp:${versions.okhttp}") implementation("com.squareup.okhttp3:okhttp:${versions.okhttp}")
compile("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}") implementation("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
compile(kotlin("stdlib")) // Align versions of all Kotlin components
compile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0") implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation(kotlin("stdlib"))
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0-1.3.70-eap-274-2")
testImplementation("org.mockito:mockito-core:3.2.4") testImplementation("org.mockito:mockito-core:3.3.1")
testImplementation("org.testng:testng:7.1.1") testImplementation("org.testng:testng:7.1.1")
} }
@ -96,6 +98,11 @@ jacoco {
toolVersion = "0.8.3" toolVersion = "0.8.3"
} }
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
sonarqube { sonarqube {
properties { properties {
property("sonar.projectKey", "ethauvin_$name") property("sonar.projectKey", "ethauvin_$name")
@ -152,7 +159,7 @@ tasks {
} }
} }
withType<KotlinCompile> { withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
@ -176,7 +183,7 @@ tasks {
configuration { configuration {
sourceLink { sourceLink {
path = "src/main/kotlin" path = file("$projectDir/src/main/kotlin").toURI().toString().replace("file:", "")
url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin" url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin"
lineSuffix = "#L" lineSuffix = "#L"
} }
@ -191,6 +198,7 @@ tasks {
includes = listOf("config/dokka/packages.md") includes = listOf("config/dokka/packages.md")
includeNonPublic = false includeNonPublic = false
} }
dependsOn(dokkaDocs)
} }
val copyToDeploy by registering(Copy::class) { val copyToDeploy by registering(Copy::class) {

View file

@ -1,5 +1,5 @@
plugins { plugins {
id("org.jetbrains.kotlin.jvm") version "1.3.50" id("org.jetbrains.kotlin.jvm") version "1.3.70"
application application
} }

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

29
examples/gradlew vendored
View file

@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else else
eval `echo args$i`="\"$arg\"" eval `echo args$i`="\"$arg\""
fi fi
i=$((i+1)) i=`expr $i + 1`
done done
case $i in case $i in
(0) set -- ;; 0) set -- ;;
(1) set -- "$args0" ;; 1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;; 2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;; 3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }
APP_ARGS=$(save "$@") APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules # 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" 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" "$@" exec "$JAVACMD" "$@"

View file

@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

3
gradlew.bat vendored
View file

@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

View file

@ -51,9 +51,9 @@ import java.util.logging.Level
import java.util.logging.Logger import java.util.logging.Logger
/** /**
* A Kotlin/Java library for accessing the Akismet service. * Provides access to the [Akismet API](https://akismet.com/development/api/).
* *
* @constructor Create new instance using the provided [Akismet](https://www.askimet.com/) API key. * @constructor Creates new instance using the provided [Akismet](https://www.askimet.com/) API key.
*/ */
@Version(properties = "version.properties", type = "kt") @Version(properties = "version.properties", type = "kt")
open class Akismet(apiKey: String) { open class Akismet(apiKey: String) {