Remove watchosDeviceArm64 (#33)

* kotlin/ktor/gradle/APG update

* Fix gradle version.

* Remove deprecated build conf

* Update versions and dependencies

* Lint fixes

* build.gradle.kts update

* build.gradle.kts update. convert dawinMain to appleMain

* workflow updates. java version to 17. deploy fixed on macos-latest

* Remove todo

* Detekt fix. SonarQube updated to 5.0.0

* AppleMain fix

* rework appleMain and dependent sources

* Revert "rework appleMain and dependent sources"

This reverts commit f1d7d5a.

* rework nativeMain to nativeRestMain

* rework nativeTest to nativeRestTest

* Fix sonar report link.
Added missing watchosDeviceArm64()
Added fetch-depth: 0 to yml report uploads

* Update version and readme

* Fix version format.
Remove watchosDeviceArm64 (no ktpr support)

* Using random SDK keys in tests

* Small changes

* Update ConfigCatClientTests.kt

* Fix tests

* Fixup sonar issues

* Fix lint

* Fixup tests

* Update ConfigService.kt

---------

Co-authored-by: Peter Csajtai <[email protected]>

Author: novalisdenahi

.editorconfig

@@ -20,13 +20,13 @@ ConfigCat is a <a href="https://configcat.com" target="_blank">hosted feature fl
 
 ### 1. Install the ConfigCat SDK
 ```kotlin
-val CONFIGCAT_VERSION: String by project
+val configcatVersion: String by project
 
 kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("com.configcat:configcat-kotlin-client:$CONFIGCAT_VERSION")
+                implementation("com.configcat:configcat-kotlin-client:$configcatVersion")
             }
         }
     }

README.md

@@ -88,7 +88,6 @@ kotlin {
     watchosArm64()
     watchosX64()
     watchosSimulatorArm64()
-    watchosDeviceArm64()
 
     tvosArm64()
     tvosX64()
@@ -219,8 +218,13 @@ detekt {
 }
 
 ktlint {
+    additionalEditorconfig.set(
+        mapOf(
+            "max_line_length" to "120"
+        )
+    )
     filter {
-        exclude { element -> element.file.path.contains("build.gradle.kts") }
+        exclude { element -> element.file.path.contains("build.gradle.kts") || element.file.path.contains("Test") }
     }
 }
 

build.gradle.kts

@@ -15,7 +15,7 @@ complexity:
     thresholdInClasses: 22
     thresholdInInterfaces: 17
   LongMethod:
-    threshold: 70
+    threshold: 80
   LongParameterList:
     constructorThreshold: 10
     functionThreshold: 7

detekt.yml

@@ -11,12 +11,10 @@ import io.ktor.client.engine.mock.MockEngine
 import io.ktor.client.engine.mock.respond
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.fail
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class DarwinEvaluationTests {
     @Test
     fun testComparators() =
@@ -68,7 +66,10 @@ class DarwinEvaluationTests {
 
             val result: Any? = client.getAnyValue(settingKey, test.defaultValue, test.user)
             if (test.returnValue != result) {
-                errors.add("Return value mismatch for test: %s Test Key: $settingKey Expected: ${test.returnValue}, Result: $result \n")
+                errors.add(
+                    "Return value mismatch for test: %s Test Key: " +
+                        "$settingKey Expected: ${test.returnValue}, Result: $result \n",
+                )
             }
             val expectedLog = test.expectedLog
             val logResultBuilder = StringBuilder()
@@ -82,7 +83,9 @@ class DarwinEvaluationTests {
             }
             val logResult: String = logResultBuilder.toString()
             if (expectedLog != logResult) {
-                errors.add("Log mismatch for test: %s Test Key: $settingKey Expected:\n$expectedLog\nResult:\n$logResult\n")
+                errors.add(
+                    "Log mismatch for test: %s Test Key: $settingKey Expected:\n$expectedLog\nResult:\n$logResult\n",
+                )
             }
             evaluationTestLogger.resetLogList()
         }

src/appleTest/kotlin/com/configcat/DarwinEvaluationTests.kt

@@ -797,6 +797,6 @@ internal class Client private constructor(
     }
 
     internal object SettingTypeHelper {
-        fun Int.toSettingTypeOrNull(): SettingType? = SettingType.values().firstOrNull { it.id == this }
+        fun Int.toSettingTypeOrNull(): SettingType? = SettingType.entries.firstOrNull { it.id == this }
     }
 }

src/commonMain/kotlin/com/configcat/ConfigCatClient.kt

@@ -8,6 +8,7 @@ import com.configcat.model.Entry
 import com.configcat.model.Setting
 import korlibs.crypto.sha1
 import korlibs.time.DateTime
+import kotlinx.atomicfu.AtomicRef
 import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
@@ -47,10 +48,10 @@ internal class ConfigService(
     private val initialized = atomic(false)
     private val offline = atomic(options.offline)
     private val mode = options.pollingMode
+    private val fetchJob: AtomicRef<Deferred<Pair<Entry, String?>>?> = atomic(null)
     private var pollingJob: Job? = null
     private var cachedEntry = Entry.empty
     private var cachedJsonString = ""
-    private var fetchJob: Deferred<Pair<Entry, String?>>? = null
     private var fetching = false
 
     val isOffline: Boolean get() = offline.value
@@ -140,12 +141,11 @@ internal class ConfigService(
                 return Pair(cachedEntry, null)
             }
 
-            val runningJob = fetchJob
-            if (runningJob == null || !fetching) {
+            if (fetchJob.value == null || !fetching) {
                 // No fetch is running, initiate a new one.
                 fetching = true
                 val eTag = cachedEntry.eTag
-                fetchJob =
+                fetchJob.value =
                     coroutineScope.async {
                         if (mode is AutoPollMode && !initialized.value) {
                             // Waiting for the client initialization.
@@ -174,7 +174,7 @@ internal class ConfigService(
             }
         }
         // Await the fetch routine.
-        val result = fetchJob?.await()
+        val result = fetchJob.value?.await()
 
         mutex.withLock {
             return result?.let { value ->

src/commonMain/kotlin/com/configcat/ConfigService.kt

@@ -44,12 +44,16 @@ internal data class EvaluationContext(
 )
 
 internal object ComparatorHelp {
-    fun Int.toComparatorOrNull(): Evaluator.UserComparator? = Evaluator.UserComparator.values().firstOrNull { it.id == this }
+    fun Int.toComparatorOrNull(): Evaluator.UserComparator? =
+        Evaluator.UserComparator.entries.firstOrNull { it.id == this }
 
     fun Int.toPrerequisiteComparatorOrNull(): Evaluator.PrerequisiteComparator? =
-        Evaluator.PrerequisiteComparator.values().firstOrNull { it.id == this }
+        Evaluator.PrerequisiteComparator.entries.firstOrNull { it.id == this }
 
-    fun Int.toSegmentComparatorOrNull(): Evaluator.SegmentComparator? = Evaluator.SegmentComparator.values().firstOrNull { it.id == this }
+    fun Int.toSegmentComparatorOrNull(): Evaluator.SegmentComparator? =
+        Evaluator.SegmentComparator.entries.firstOrNull {
+            it.id == this
+        }
 }
 
 private const val USER_OBJECT_IS_MISSING = "cannot evaluate, User Object is missing"

src/commonMain/kotlin/com/configcat/Evaluator.kt

@@ -41,19 +41,21 @@ public data class LazyLoadConfiguration(
 /**
  * Creates an auto polling configuration.
  */
-public fun autoPoll(block: AutoPollConfiguration.() -> Unit = {}): PollingMode = AutoPollMode(AutoPollConfiguration().apply(block))
+public fun autoPoll(block: AutoPollConfiguration.() -> Unit = {}): PollingMode =
+    AutoPollMode(AutoPollConfiguration().apply(block))
 
 /**
  * Creates a lazy load polling configuration.
  */
-public fun lazyLoad(block: LazyLoadConfiguration.() -> Unit = {}): PollingMode = LazyLoadMode(LazyLoadConfiguration().apply(block))
+public fun lazyLoad(block: LazyLoadConfiguration.() -> Unit = {}): PollingMode =
+    LazyLoadMode(LazyLoadConfiguration().apply(block))
 
 /**
  * Creates a manual polling configuration.
  */
 public fun manualPoll(): PollingMode = ManualPollMode()
 
-internal class AutoPollMode constructor(val configuration: AutoPollConfiguration) : PollingMode {
+internal class AutoPollMode(val configuration: AutoPollConfiguration) : PollingMode {
     override val identifier: String = "a"
 
     init {
@@ -62,7 +64,7 @@ internal class AutoPollMode constructor(val configuration: AutoPollConfiguration
     }
 }
 
-internal class LazyLoadMode constructor(val configuration: LazyLoadConfiguration) : PollingMode {
+internal class LazyLoadMode(val configuration: LazyLoadConfiguration) : PollingMode {
     override val identifier: String = "l"
 
     init {

src/commonMain/kotlin/com/configcat/PollingModes.kt

@@ -5,7 +5,6 @@ import com.configcat.model.Preferences
 import com.configcat.model.Segment
 import com.configcat.model.Setting
 import com.configcat.model.SettingValue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
@@ -16,7 +15,6 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class CommonUtilsTests {
     @Test
     fun testValidateSettingValueType() =