Fix some formatting and build issues.

touchlab · Jan 17, 2025 · 8301134 · 8301134
1 parent f900ac6
commit 8301134
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/example-skie-subplugin-api/build.gradle.kts b/example-skie-subplugin-api/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(11)
+
     androidTarget()
     iosX64()
     iosArm64()

diff --git a/example-skie-subplugin/src/main/kotlin/co/touchlab/example/ExampleSkieSubplugin.kt b/example-skie-subplugin/src/main/kotlin/co/touchlab/example/ExampleSkieSubplugin.kt
@@ -5,9 +5,9 @@ import co.touchlab.skie.phases.InitPhase
 import co.touchlab.skie.phases.swift.ConvertSirIrFilesToSourceFilesPhase
 import co.touchlab.skie.spi.SkiePluginRegistrar
 
-class ExampleSkieSubplugin: SkiePluginRegistrar {
+class ExampleSkieSubplugin : SkiePluginRegistrar {
     override val customConfigurationKeys: Set<ConfigurationKey<*>> = setOf(
-        IdentifiableConfigurationKey,
+        IdentifiableConfigurationKey
     )
 
     override fun register(initPhaseContext: InitPhase.Context) {

diff --git a/...ie-subplugin/src/main/kotlin/co/touchlab/example/GenerateIdentifiableConformancesPhase.kt b/...ie-subplugin/src/main/kotlin/co/touchlab/example/GenerateIdentifiableConformancesPhase.kt
@@ -7,7 +7,7 @@ import co.touchlab.skie.sir.element.SirExtension
 import co.touchlab.skie.sir.element.SirGetter
 import co.touchlab.skie.sir.element.SirProperty
 
-object GenerateIdentifiableConformancesPhase: SirPhase {
+object GenerateIdentifiableConformancesPhase : SirPhase {
     context(SirPhase.Context)
     override suspend fun execute() {
         val identifiableProtocol = SirClass(
@@ -18,11 +18,15 @@ object GenerateIdentifiableConformancesPhase: SirPhase {
         )
 
         kirProvider.kotlinClasses.forEach { kirClass ->
-            val identifiableConfig = kirClass.configuration[IdentifiableConfigurationKey] ?: return@forEach
+            val identifiableConfig = kirClass.configuration[IdentifiableConfigurationKey]
+                ?: return@forEach
             val identityProperty = identifiableConfig.propertyName?.let { propertyName ->
                 kirClass.callableDeclarations
                     .filterIsInstance<KirProperty>()
-                    .singleOrNull { it.kotlinName == propertyName } ?: error("Property $propertyName not found in class ${kirClass.kotlinFqName}!")
+                    .singleOrNull {
+                        it.kotlinName == propertyName
+                    }
+                    ?: error("Property $propertyName not found in class ${kirClass.kotlinFqName}!")
             }
             val sirClass = kirClass.primarySirClass
             val sirIdentityProperty = identityProperty?.primarySirProperty
@@ -31,13 +35,13 @@ object GenerateIdentifiableConformancesPhase: SirPhase {
                 SirExtension(
                     classDeclaration = sirClass,
                     superTypes = listOf(
-                        identifiableProtocol.defaultType,
-                    ),
+                        identifiableProtocol.defaultType
+                    )
                 ).apply {
                     if (sirIdentityProperty != null) {
                         SirProperty(
                             identifier = "id",
-                            type = sirIdentityProperty.type,
+                            type = sirIdentityProperty.type
                         ).apply {
                             SirGetter().apply {
                                 bodyBuilder.add {

diff --git a/example-skie-subplugin/src/main/kotlin/co/touchlab/example/IdentifiableConfig.kt b/example-skie-subplugin/src/main/kotlin/co/touchlab/example/IdentifiableConfig.kt
@@ -1,5 +1,5 @@
 package co.touchlab.example
 
 data class IdentifiableConfig(
-    val propertyName: String?,
+    val propertyName: String?
 )
diff --git a/example-skie-subplugin/src/main/kotlin/co/touchlab/example/IdentifiableConfigurationKey.kt b/example-skie-subplugin/src/main/kotlin/co/touchlab/example/IdentifiableConfigurationKey.kt
@@ -5,7 +5,8 @@ import co.touchlab.skie.configuration.ConfigurationScope
 import co.touchlab.skie.configuration.ConfigurationTarget
 import co.touchlab.skie.configuration.findAnnotation
 
-object IdentifiableConfigurationKey: ConfigurationKey<IdentifiableConfig?>, ConfigurationScope.Class {
+object IdentifiableConfigurationKey :
+    ConfigurationKey<IdentifiableConfig?>, ConfigurationScope.Class {
     override fun deserialize(value: String?): IdentifiableConfig? {
         return when (value) {
             null -> null