diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index d6c5981..ac476f9 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index af515ca..1e47788 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.FileInputStream
import java.net.URL
+import java.util.Date
import java.util.Properties
plugins {
@@ -11,13 +12,13 @@ plugins {
`maven-publish`
id("com.github.ben-manes.versions") version "0.28.0"
id("com.jfrog.bintray") version "1.8.5"
- id("io.gitlab.arturbosch.detekt") version "1.7.4"
+ id("io.gitlab.arturbosch.detekt") version "1.9.1"
id("net.thauvin.erik.gradle.semver") version "1.0.4"
id("org.jetbrains.dokka") version "0.10.1"
id("org.jetbrains.kotlin.jvm") version "1.3.72"
id("org.jetbrains.kotlin.kapt") version "1.3.72"
id("org.jetbrains.kotlin.plugin.serialization") version "1.3.72"
- id("org.sonarqube") version "2.8"
+ id("org.sonarqube") version "3.0"
}
group = "net.thauvin.erik"
@@ -33,7 +34,7 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
val publicationName = "mavenJava"
object VersionInfo {
- const val okhttp = "4.5.0"
+ const val okhttp = "4.7.2"
}
val versions: VersionInfo by extra { VersionInfo }
@@ -69,7 +70,6 @@ dependencies {
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.3.3")
testImplementation("org.testng:testng:7.2.0")
}
@@ -227,6 +227,12 @@ tasks {
val bintrayUpload by existing(BintrayUploadTask::class) {
dependsOn(publishToMavenLocal, gitTag)
+ doFirst {
+ versionName = "${project.version}"
+ versionDesc = "${project.name} ${project.version}"
+ versionVcsTag = "${project.version}"
+ versionReleased = Date().toString()
+ }
}
register("release") {
@@ -256,6 +262,7 @@ bintray {
githubReleaseNotesFile = "README.md"
vcsUrl = "$mavenUrl.git"
setLabels("kotlin", "java", "akismet", "comments", "spam", "blog", "automattic", "kismet")
+ setLicenses("BSD 3-Clause")
publicDownloadNumbers = true
version.apply {
name = project.version as String
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index c88d826..f24d8c1 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -69,7 +69,8 @@ complexity:
threshold: 60
LongParameterList:
active: false
- threshold: 6
+ constructorThreshold: 6
+ functionThreshold: 6
ignoreDefaultParameters: false
MethodOverloading:
active: false
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index f3f5cae..a45bf50 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
- id("org.jetbrains.kotlin.jvm") version "1.3.71"
+ id("org.jetbrains.kotlin.jvm") version "1.3.72"
+ id("com.github.ben-manes.versions") version "0.28.0"
application
}
@@ -19,7 +20,7 @@ dependencies {
implementation("javax.servlet:javax.servlet-api:4.0.1")
- implementation("net.thauvin.erik:akismet-kotlin:0.9.1-beta")
+ implementation("net.thauvin.erik:akismet-kotlin:0.9.2")
}
application {
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..62d4c05 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 a2bf131..622ab64 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-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 2fe81a7..fbd7c51 100644
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index 62bd9b9..5093609 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda8..62d4c05 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 a4b4429..622ab64 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7..fbd7c51 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 62bd9b9..5093609 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
diff --git a/pom.xml b/pom.xml
index b868220..f99fa7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,13 @@
4.0.0
net.thauvin.erik
akismet-kotlin
- 0.9.1-beta
+ 0.9.2
org.jetbrains.kotlin
kotlin-bom
- 1.3.70
+ 1.3.72
pom
import
@@ -30,19 +30,19 @@
com.squareup.okhttp3
okhttp
- 4.4.1
+ 4.7.2
runtime
com.squareup.okhttp3
logging-interceptor
- 4.4.1
+ 4.7.2
runtime
org.jetbrains.kotlin
kotlin-stdlib
- 1.3.70
+ 1.3.72
runtime