diff --git a/.gitignore b/.gitignore
index c595a03..f007981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
-__pycache__
+.vscode/*
!.vscode/extensions.json
!.vscode/launch.json
!.vscode/settings.json
!.vscode/tasks.json
-!gradle-wrapper.jar
-.classpath
+
+__pycache__
.classpath
.DS_Store
.gradle
@@ -17,19 +17,15 @@ __pycache__
.project
.scannerwork
.settings
-.vscode/*
*.class
*.code-workspace
*.ctxt
-*.ear
*.iws
-*.jar
*.log
*.nar
*.rar
*.sublime-*
*.tar.gz
-*.war
*.zip
/**/.idea_modules/
/**/.idea/**/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 59494d0..4562da9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,12 @@
+
+
+
+
+
+
diff --git a/build.gradle.kts b/build.gradle.kts
index 2ecdba1..14f81f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,16 +8,16 @@ import java.util.Properties
plugins {
jacoco
java
- kotlin("jvm") version "1.3.61"
`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("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("org.jetbrains.dokka") version "0.10.1"
- id("org.jetbrains.kotlin.kapt").version("1.3.61")
- id("org.jetbrains.kotlin.plugin.serialization").version("1.3.61")
- id("org.jmailen.kotlinter") version "2.3.0"
+ id("org.jetbrains.kotlin.jvm") version "1.3.70"
+ id("org.jetbrains.kotlin.kapt") version "1.3.70"
+ id("org.jetbrains.kotlin.plugin.serialization") version "1.3.70"
+ id("org.jmailen.kotlinter") version "2.3.2"
id("org.sonarqube") version "2.8"
}
@@ -34,7 +34,7 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
val publicationName = "mavenJava"
object VersionInfo {
- const val okhttp = "4.3.1"
+ const val okhttp = "4.4.0"
}
val versions: VersionInfo by extra { VersionInfo }
@@ -61,15 +61,17 @@ dependencies {
kapt(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}")
- compile("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
+ implementation("com.squareup.okhttp3:okhttp:${versions.okhttp}")
+ implementation("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
- compile(kotlin("stdlib"))
- compile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0")
+ // Align versions of all Kotlin components
+ 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")
}
@@ -96,6 +98,11 @@ jacoco {
toolVersion = "0.8.3"
}
+java {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+}
+
sonarqube {
properties {
property("sonar.projectKey", "ethauvin_$name")
@@ -152,7 +159,7 @@ tasks {
}
}
- withType {
+ withType().configureEach {
kotlinOptions.jvmTarget = "1.8"
}
@@ -176,7 +183,7 @@ tasks {
configuration {
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"
lineSuffix = "#L"
}
@@ -191,6 +198,7 @@ tasks {
includes = listOf("config/dokka/packages.md")
includeNonPublic = false
}
+ dependsOn(dokkaDocs)
}
val copyToDeploy by registering(Copy::class) {
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 19960b1..c4ebd8c 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,5 +1,5 @@
plugins {
- id("org.jetbrains.kotlin.jvm") version "1.3.50"
+ id("org.jetbrains.kotlin.jvm") version "1.3.70"
application
}
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..f3d88b1 100644
Binary files a/examples/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 7c4388a..a2bf131 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 83f2acf..2fe81a7 100644
--- a/examples/gradlew
+++ b/examples/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/examples/gradlew.bat b/examples/gradlew.bat
index 9618d8d..62bd9b9 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
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.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b16c34..a2bf131 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-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d..62bd9b9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
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.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
diff --git a/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt b/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt
index 51ee638..8718c6e 100644
--- a/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt
+++ b/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt
@@ -51,9 +51,9 @@ import java.util.logging.Level
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")
open class Akismet(apiKey: String) {