Updated to JDK 17 and Kotlin 1.6.10

TrueMB · TrueMB · commit 8f0d2652292e · 2022-01-31T15:34:43.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ allprojects {
     group = rootProject.ext.group
 
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -28,3 +28,19 @@ tasks.named("dependencyUpdates").configure {
 wrapper {
     gradleVersion = project.ext.gradleVersion
 }
+repositories {
+    mavenCentral()
+}
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048M -XX:MaxPermSize=512m -XX:MaxHeapSize=1024M -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048M -XX:MaxHeapSize=1024M -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
 
     api "com.squareup.retrofit2:retrofit:$retrofitVersion"
     api "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -1,29 +1,29 @@
 ext {
-    version = "5.3.2"
+    version = "5.3.4"
     group = "com.github.TrueMB"
 
-    gradleVersion = "6.7.1"
+    gradleVersion = "7.3.3"
 
-    kotlinVersion = "1.4.21"
-    kotlinCoroutinesVersion = "1.4.2"
-    dokkaVersion = "1.4.20"
+    kotlinVersion = "1.6.10"
+    kotlinCoroutinesVersion = "1.6.0"
+    dokkaVersion = "1.6.10"
 
-    jacocoVersion = "0.8.6"
-    ktlintPluginVersion = "9.4.1"
-    ktlintVersion = "0.40.0"
-    detektVersion = "1.15.0"
+    jacocoVersion = "0.8.7"
+    ktlintPluginVersion = "10.2.1"
+    ktlintVersion = "0.43.2"
+    detektVersion = "1.19.0"
 
-    gradleVersionsPluginVersion = "0.36.0"
-    buildConfigPluginVersion = "1.1.8"
+    gradleVersionsPluginVersion = "0.41.0"
+    buildConfigPluginVersion = "3.0.3"
 
     retrofitVersion = "2.9.0"
-    okHttpVersion = "4.9.0"
-    okioVersion = "2.9.0"
-    moshiVersion = "1.11.0"
+    okHttpVersion = "4.9.3"
+    okioVersion = "3.0.0"
+    moshiVersion = "1.13.0"
     moshiLazyAdaptersVersion = "2.2"
 
-    junitVersion = "5.7.0"
+    junitVersion = "5.8.2"
     concurrentUnitVersion = "0.4.6"
-    kluentVersion = "1.64"
-    mockkVersion = "1.10.3-jdk8"
+    kluentVersion = "1.68"
+    mockkVersion = "1.12.2"
 }
diff --git 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.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm"
+    id 'org.jetbrains.kotlin.jvm'
     id "org.jetbrains.kotlin.kapt"
     id "org.jetbrains.dokka"
 
@@ -10,7 +10,7 @@ plugins {
     id "io.gitlab.arturbosch.detekt"
     id "org.jlleitschuh.gradle.ktlint"
 
-    id "de.fuerstenau.buildconfig"
+    id "com.github.gmazzo.buildconfig"
 }
 
 apply from: "${rootDir}/gradle/dependencies.gradle"
@@ -48,7 +48,7 @@ task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         allWarningsAsErrors = true
         freeCompilerArgs = ["-Xjsr305=strict", "-progressive"]
     }
@@ -65,8 +65,11 @@ test {
 }
 
 buildConfig {
-    packageName = "me.proxer.library"
-    version = project.version
+    packageName("me.proxer.library")  // forces the package. Defaults to '${project.group}'
+
+    useKotlinOutput()   // adds `internal` modifier to all declarations
+    buildConfigField("String", "packageName", "\"me.proxer.library\"")
+    buildConfigField("String", "version", provider { "\"${project.version}\"" })
 }
 
 jacoco {
@@ -75,8 +78,8 @@ jacoco {
 
 jacocoTestReport {
     reports {
-        xml.enabled = true
-        html.enabled = false
+        xml.required = true
+        html.required = false
     }
 }
 
diff --git a/library/src/main/kotlin/me/proxer/library/ProxerApi.kt b/library/src/main/kotlin/me/proxer/library/ProxerApi.kt
@@ -75,7 +75,7 @@ class ProxerApi private constructor(retrofit: Retrofit) {
             "sha256/C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M="
         )
 
-        private const val DEFAULT_USER_AGENT = "ProxerLibJava/" + BuildConfig.VERSION
+        private const val DEFAULT_USER_AGENT = "ProxerLibJava/" + BuildConfig.version
     }
 
     /**
@@ -187,6 +187,7 @@ class ProxerApi private constructor(retrofit: Retrofit) {
         /**
          * Sets a custom login token manager.
          */
+        @Suppress("unused")
         fun loginTokenManager(loginTokenManager: LoginTokenManager) = this.apply {
             this.loginTokenManager = loginTokenManager
         }
@@ -196,6 +197,7 @@ class ProxerApi private constructor(retrofit: Retrofit) {
          *
          * If not set, it will default to "ProxerLibJava/<version>"
          */
+        @Suppress("unused")
         fun userAgent(userAgent: String) = this.apply { this.userAgent = userAgent }
 
         /**
diff --git a/library/src/main/kotlin/me/proxer/library/entity/info/Entry.kt b/library/src/main/kotlin/me/proxer/library/entity/info/Entry.kt
@@ -43,7 +43,7 @@ import me.proxer.library.internal.adapter.DelimitedEnumSet
 data class Entry(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
-    @field:DelimitedEnumSet @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
+    @field:DelimitedEnumSet(delimiter = " ") @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
     @Json(name = "description") val description: String,
     @Json(name = "medium") val medium: Medium,
     @Json(name = "count") val episodeAmount: Int,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/info/EntryCore.kt b/library/src/main/kotlin/me/proxer/library/entity/info/EntryCore.kt
@@ -34,8 +34,8 @@ import me.proxer.library.internal.adapter.DelimitedStringSet
 data class EntryCore(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
-    @field:DelimitedStringSet(valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
-    @field:DelimitedEnumSet @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
+    @field:DelimitedStringSet(delimiter = " ", valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
+    @field:DelimitedEnumSet(delimiter = " ") @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
     @Json(name = "description") val description: String,
     @Json(name = "medium") val medium: Medium,
     @Json(name = "count") val episodeAmount: Int,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/info/Recommendation.kt b/library/src/main/kotlin/me/proxer/library/entity/info/Recommendation.kt
@@ -36,8 +36,8 @@ import me.proxer.library.internal.adapter.NumberBasedBoolean
 data class Recommendation(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
-    @field:DelimitedStringSet(valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
-    @field:DelimitedEnumSet @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
+    @field:DelimitedStringSet(delimiter = " ", valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
+    @field:DelimitedEnumSet(delimiter = " ") @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
     @Json(name = "description") val description: String,
     @Json(name = "medium") val medium: Medium,
     @Json(name = "count") val episodeAmount: Int,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/info/Relation.kt b/library/src/main/kotlin/me/proxer/library/entity/info/Relation.kt
@@ -38,7 +38,7 @@ data class Relation(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
     @field:DelimitedStringSet(valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
-    @field:DelimitedEnumSet @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
+    @field:DelimitedEnumSet(delimiter = " ") @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
     @Json(name = "description") val description: String,
     @Json(name = "medium") val medium: Medium,
     @Json(name = "count") val episodeAmount: Int,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/list/IndustryProject.kt b/library/src/main/kotlin/me/proxer/library/entity/list/IndustryProject.kt
@@ -28,8 +28,8 @@ import me.proxer.library.internal.adapter.DelimitedStringSet
 data class IndustryProject(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
-    @field:DelimitedStringSet(valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
-    @field:DelimitedEnumSet @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
+    @field:DelimitedStringSet(delimiter = " ", valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
+    @field:DelimitedEnumSet(delimiter = " ") @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
     @Json(name = "medium") val medium: Medium,
     @Json(name = "type") val industryType: IndustryType,
     @Json(name = "state") val state: MediaState,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/list/MediaListEntry.kt b/library/src/main/kotlin/me/proxer/library/entity/list/MediaListEntry.kt
@@ -27,7 +27,7 @@ import me.proxer.library.internal.adapter.DelimitedStringSet
 data class MediaListEntry(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
-    @field:DelimitedStringSet(valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
+    @field:DelimitedStringSet(delimiter = " ", valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
     @Json(name = "medium") val medium: Medium,
     @Json(name = "count") val episodeAmount: Int,
     @Json(name = "state") val state: MediaState,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/list/TranslatorGroupProject.kt b/library/src/main/kotlin/me/proxer/library/entity/list/TranslatorGroupProject.kt
@@ -28,8 +28,8 @@ import me.proxer.library.internal.adapter.DelimitedStringSet
 data class TranslatorGroupProject(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
-    @field:DelimitedStringSet(valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
-    @field:DelimitedEnumSet @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
+    @field:DelimitedStringSet(delimiter = " ", valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
+    @field:DelimitedEnumSet(delimiter = " ") @Json(name = "fsk") val fskConstraints: Set<FskConstraint>,
     @Json(name = "medium") val medium: Medium,
     @Json(name = "type") val projectState: ProjectState,
     @Json(name = "state") val state: MediaState,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/media/CalendarEntry.kt b/library/src/main/kotlin/me/proxer/library/entity/media/CalendarEntry.kt
@@ -40,7 +40,7 @@ data class CalendarEntry(
     @Json(name = "industryname") val industryName: String?,
     @Json(name = "weekday") val weekDay: CalendarDay,
     @Json(name = "uptime") val uploadDate: Date,
-    @field:DelimitedStringSet(valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
+    @field:DelimitedStringSet(delimiter = " ", valuesToKeep = ["Slice of Life"]) @Json(name = "genre") val genres: Set<String>,
     @Json(name = "rate_sum") val ratingSum: Int,
     @Json(name = "rate_count") val ratingAmount: Int
 ) : ProxerIdItem, ProxerDateItem {
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/DelimitedEnumSetAdapterFactory.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/DelimitedEnumSetAdapterFactory.kt
@@ -12,7 +12,6 @@ import me.proxer.library.util.ProxerUtils
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 import java.util.EnumSet
-import java.util.Locale
 
 /**
  * @author Ruben Gees
@@ -45,23 +44,21 @@ internal class DelimitedEnumSetAdapterFactory : JsonAdapter.Factory {
         )
     }
 
-    private class DelimitedEnumSetAdapter<T : Enum<T>> internal constructor(
+    private class DelimitedEnumSetAdapter<T : Enum<T>>(
         private val enumType: Class<T>,
         private val delimiter: String
     ) : JsonAdapter<Set<T>>() {
 
-        private val enumMap = enumType.enumConstants
-            .map { constant ->
-                try {
-                    val annotation = enumType.getField(constant.name).getAnnotation(Json::class.java)
-                    val name = annotation?.name ?: constant.name
+        private val enumMap = enumType.enumConstants.associate { constant ->
+            try {
+                val annotation = enumType.getField(constant.name).getAnnotation(Json::class.java)
+                val name = annotation?.name ?: constant.name
 
-                    name.toLowerCase(Locale.US) to constant
-                } catch (error: NoSuchFieldException) {
-                    throw AssertionError("Missing field in ${enumType.name}", error)
-                }
+                name.lowercase() to constant
+            } catch (error: NoSuchFieldException) {
+                throw AssertionError("Missing field in ${enumType.name}", error)
             }
-            .toMap()
+        }
 
         private val fallbackEnum = enumType.getAnnotation(FallbackEnum::class.java)?.let {
             java.lang.Enum.valueOf(enumType, it.name)
@@ -73,7 +70,7 @@ internal class DelimitedEnumSetAdapterFactory : JsonAdapter.Factory {
 
                 emptySet()
             } else {
-                val rawParts = reader.nextString().trim().toLowerCase(Locale.US)
+                val rawParts = reader.nextString().trim().lowercase()
 
                 if (rawParts.isEmpty()) {
                     emptySet()
diff --git a/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedEnumSetAdapterFactoryTest.kt b/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedEnumSetAdapterFactoryTest.kt
@@ -164,7 +164,7 @@ class DelimitedEnumSetAdapterFactoryTest {
 
     @JsonClass(generateAdapter = true)
     data class GenderTestClass(
-        @field:DelimitedEnumSet val genders: Set<Gender>? = null
+        @field:DelimitedEnumSet(delimiter = " ") val genders: Set<Gender>? = null
     )
 
     @JsonClass(generateAdapter = true)
@@ -174,6 +174,6 @@ class DelimitedEnumSetAdapterFactoryTest {
 
     @JsonClass(generateAdapter = true)
     data class FskConstrainTestClass(
-        @field:DelimitedEnumSet val fskConstraints: Set<FskConstraint>? = null
+        @field:DelimitedEnumSet(delimiter = " ") val fskConstraints: Set<FskConstraint>? = null
     )
 }
diff --git a/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedStringSetAdapterFactoryTest.kt b/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedStringSetAdapterFactoryTest.kt
@@ -144,16 +144,16 @@ class DelimitedStringSetAdapterFactoryTest {
 
     @JsonClass(generateAdapter = true)
     data class StringSetTestClass(
-        @field:DelimitedStringSet val value: Set<String>
+        @field:DelimitedStringSet(delimiter = " ", valuesToKeep = []) val value: Set<String>
     )
 
     @JsonClass(generateAdapter = true)
     data class StringSetWithDelimiterTestClass(
-        @field:DelimitedStringSet(delimiter = ", ") val value: Set<String>
+        @field:DelimitedStringSet(delimiter = ", ", valuesToKeep = []) val value: Set<String>
     )
 
     @JsonClass(generateAdapter = true)
     data class StringSetWithValuesToKeepTestClass(
-        @field:DelimitedStringSet(valuesToKeep = ["a b"]) val value: Set<String>
+        @field:DelimitedStringSet(delimiter = " ", valuesToKeep = ["a b"]) val value: Set<String>
     )
 }
diff --git a/library/src/test/kotlin/me/proxer/library/internal/interceptor/HeaderInterceptorTest.kt b/library/src/test/kotlin/me/proxer/library/internal/interceptor/HeaderInterceptorTest.kt
@@ -3,7 +3,7 @@ package me.proxer.library.internal.interceptor
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
-import me.proxer.library.BuildConfig.VERSION
+import me.proxer.library.BuildConfig.version
 import me.proxer.library.ProxerApi
 import me.proxer.library.ProxerTest
 import me.proxer.library.runRequest
@@ -44,7 +44,7 @@ class HeaderInterceptorTest : ProxerTest() {
             api.notifications.news().build().execute()
         }
 
-        request.headers["User-Agent"] shouldBeEqualTo "ProxerLibJava/$VERSION"
+        request.headers["User-Agent"] shouldBeEqualTo "ProxerLibJava/$version"
     }
 
     @Test
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -3,20 +3,28 @@ plugins {
     id "application"
 }
 
-mainClassName = "me.proxer.sample.News"
-
-run {
-    standardInput = System.in
-}
-
 dependencies {
     implementation project(":library")
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         allWarningsAsErrors = true
         freeCompilerArgs = ["-Xjsr305=strict", "-progressive"]
     }
 }
+repositories {
+    mavenCentral()
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-org.gradle.jvmargs=-Xmx2048M -XX:MaxPermSize=512m -XX:MaxHeapSize=1024M -Dfile.encoding=UTF-8`
	`1`	`+org.gradle.jvmargs=-Xmx2048M -XX:MaxHeapSize=1024M -Dfile.encoding=UTF-8`
`2`	`2`	`org.gradle.parallel=true`
`3`	`3`	`org.gradle.caching=true`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class ProxerApi private constructor(retrofit: Retrofit) {`
`75`	`75`	`"sha256/C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M="`
`76`	`76`	`)`
`77`	`77`
`78`		`- private const val DEFAULT_USER_AGENT = "ProxerLibJava/" + BuildConfig.VERSION`
	`78`	`+ private const val DEFAULT_USER_AGENT = "ProxerLibJava/" + BuildConfig.version`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
`@@ -187,6 +187,7 @@ class ProxerApi private constructor(retrofit: Retrofit) {`
`187`	`187`	`/**`
`188`	`188`	`* Sets a custom login token manager.`
`189`	`189`	`*/`
	`190`	`+ @Suppress("unused")`
`190`	`191`	`fun loginTokenManager(loginTokenManager: LoginTokenManager) = this.apply {`
`191`	`192`	`this.loginTokenManager = loginTokenManager`
`192`	`193`	`}`
`@@ -196,6 +197,7 @@ class ProxerApi private constructor(retrofit: Retrofit) {`
`196`	`197`	`*`
`197`	`198`	`* If not set, it will default to "ProxerLibJava/<version>"`
`198`	`199`	`*/`
	`200`	`+ @Suppress("unused")`
`199`	`201`	`fun userAgent(userAgent: String) = this.apply { this.userAgent = userAgent }`
`200`	`202`
`201`	`203`	`/**`