Fix OptionalExpectation false positive when not building Android (#571)

05nelsonm · web-flow · commit 9fba851f628e · 2025-02-22T06:11:25.000-05:00
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/AbstractKmpTorServiceUIConfig.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/AbstractKmpTorServiceUIConfig.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui
 
 import io.matthewnelson.kmp.tor.common.api.ExperimentalKmpTorApi
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUIInstanceState.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUIInstanceState.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui
 
 import io.matthewnelson.immutable.collections.immutableSetOf
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/-CommonPlatform.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/-CommonPlatform.kt
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING", "KotlinRedundantDiagnosticSuppress")
+@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING", "KotlinRedundantDiagnosticSuppress", "OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE", "NOTHING_TO_INLINE")
 
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal
 
 internal expect abstract class NumberFormat {
     internal fun format(number: Long): String
 }
 
-@Suppress("NOTHING_TO_INLINE")
 internal expect inline fun numberFormat(): NumberFormat
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/ButtonAction.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/ButtonAction.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal
 
 internal enum class ButtonAction {
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/IconState.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/IconState.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal
 
 internal enum class IconState(internal val colorize: Boolean) {
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/Progress.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/Progress.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal
 
 import io.matthewnelson.kmp.tor.runtime.TorState
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/UIState.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/UIState.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal
 
 import io.matthewnelson.immutable.collections.toImmutableSet
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentAction.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentAction.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal.content
 
 import io.matthewnelson.kmp.tor.runtime.Action
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentBandwidth.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentBandwidth.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal.content
 
 import io.matthewnelson.kmp.tor.runtime.service.ui.internal.NumberFormat
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentBootstrap.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentBootstrap.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal.content
 
 import kotlin.jvm.JvmSynthetic
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentMessage.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentMessage.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal.content
 
 import kotlin.jvm.JvmSynthetic
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentNetworkWaiting.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentNetworkWaiting.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal.content
 
 internal object ContentNetworkWaiting: ContentText<Unit>() {
diff --git a/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentText.kt b/library/runtime-service-ui/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/content/ContentText.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+@file:Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
+
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal.content
 
 internal sealed class ContentText<T: Any> {
diff --git a/library/runtime-service-ui/src/darwinMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/DarwinPlatform.kt b/library/runtime-service-ui/src/darwinMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/DarwinPlatform.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING", "KotlinRedundantDiagnosticSuppress")
+@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING", "KotlinRedundantDiagnosticSuppress", "NOTHING_TO_INLINE")
 
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal
 
@@ -27,5 +27,4 @@ internal actual abstract class NumberFormat private constructor() {
     }
 }
 
-@Suppress("NOTHING_TO_INLINE")
 internal actual inline fun numberFormat(): NumberFormat = NumberFormat.INSTANCE
diff --git a/library/runtime-service-ui/src/jvmAndroidMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/-JvmAndroidPlatform.kt b/library/runtime-service-ui/src/jvmAndroidMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/internal/-JvmAndroidPlatform.kt
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING", "NOTHING_TO_INLINE")
 
 package io.matthewnelson.kmp.tor.runtime.service.ui.internal
 
 @Suppress("ACTUAL_WITHOUT_EXPECT")
 internal actual typealias NumberFormat = java.text.NumberFormat
 
-@Suppress("NOTHING_TO_INLINE")
 internal actual inline fun numberFormat(): NumberFormat {
     return NumberFormat.getInstance(java.util.Locale.getDefault())
 }
diff --git a/library/runtime-service/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/AbstractTorServiceUI.kt b/library/runtime-service/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/AbstractTorServiceUI.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-@file:Suppress("RemoveRedundantQualifierName")
+@file:Suppress("RemoveRedundantQualifierName", "OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
 
 package io.matthewnelson.kmp.tor.runtime.service
 
