Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
distribution: "temurin"
java-version: ${{ matrix.java-version }}

- name: Test
- name: Unit tests and verification tasks
run: ./gradlew check

- name: Publish Release
Expand Down
11 changes: 11 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
alias(libs.plugins.spotless)
}

extensions.configure(SpotlessExtension::class) {
kotlin {
target("**/src/**/*.kt")
ktlint(libs.versions.ktlint.get())
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.livefront.generate

import com.livefront.annotation.AutoEmit
import com.google.auto.service.AutoService
import com.google.devtools.ksp.getVisibility
import com.google.devtools.ksp.processing.CodeGenerator
Expand All @@ -15,6 +14,7 @@ import com.google.devtools.ksp.symbol.KSPropertyDeclaration
import com.google.devtools.ksp.symbol.Modifier.DATA
import com.google.devtools.ksp.symbol.Origin
import com.google.devtools.ksp.symbol.Visibility.PUBLIC
import com.livefront.annotation.AutoEmit
import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.CodeBlock
import com.squareup.kotlinpoet.FileSpec
Expand Down Expand Up @@ -62,9 +62,8 @@ public class AutoEmitProcessor(
AutoEmit::class.qualifiedName!!,
),
)?.containingFile,
)
),
)

}
return emptyList()
}
Expand Down Expand Up @@ -131,7 +130,7 @@ internal data class AutoEmitFileSpec(
fileSpecBuilder.addImport(
packageName = "kotlinx.coroutines.flow",
"StateFlow",
"MutableStateFlow"
"MutableStateFlow",
)

fileSpecBuilder.addImport(packageName = "kotlin.properties", "Delegates")
Expand All @@ -145,7 +144,7 @@ internal data class AutoEmitFileSpec(
.delegate(
fieldPattern(
fieldName = field.simpleName.asString(),
)
),
)
.build()
}
Expand Down Expand Up @@ -180,18 +179,18 @@ internal data class AutoEmitFileSpec(
.addAnnotation(Generated::class)
.addSuperinterface(
StateFlow::class.asTypeName().parameterizedBy(ksClass.toClassName()),
delegate = CodeBlock.of("_state")
delegate = CodeBlock.of("_state"),
)
.primaryConstructor(constructor)
.addProperties(properties)
.addProperty(
PropertySpec.builder(
"_state",
MutableStateFlow::class.asTypeName().parameterizedBy(ksClass.toClassName())
MutableStateFlow::class.asTypeName().parameterizedBy(ksClass.toClassName()),
)
.initializer("_state")
.addModifiers(listOf(PRIVATE))
.build()
.build(),
)
.addType(companionObject)
.build()
Expand All @@ -206,5 +205,5 @@ internal data class AutoEmitFileSpec(
if (old == new) return@observable
_state.value = _state.value.copy($fieldName = new)
}
""".trimIndent()
""".trimIndent()
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class AutoEmitProcessorTest {
public fun MyData.emitter(): MyDataEmitter = MyDataEmitter(this)
}
}
""".trimIndent()
""".trimIndent(),
)
}

Expand Down Expand Up @@ -85,7 +85,7 @@ class AutoEmitProcessorTest {
public fun ParentClass.MyData.emitter(): MyDataEmitter = MyDataEmitter(this)
}
}
""".trimIndent()
""".trimIndent(),
)
}

Expand Down
20 changes: 10 additions & 10 deletions generate/src/test/java/com/livefront/generate/KspAssertions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
package com.livefront.generate

import com.google.devtools.ksp.processing.SymbolProcessorProvider
import com.livefront.generate.AutoEmitProcessorProvider
import com.tschuchort.compiletesting.JvmCompilationResult
import com.tschuchort.compiletesting.KotlinCompilation
import com.tschuchort.compiletesting.KotlinCompilation.ExitCode.OK
import com.tschuchort.compiletesting.SourceFile
import com.tschuchort.compiletesting.configureKsp
import com.tschuchort.compiletesting.kspSourcesDir
import com.tschuchort.compiletesting.kspWithCompilation
import com.tschuchort.compiletesting.symbolProcessorProviders
import org.intellij.lang.annotations.Language
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
import org.junit.jupiter.api.Assertions.assertEquals
Expand All @@ -27,7 +25,7 @@ fun assertGeneratedFile(
sourceFileName: String,
@Language("kotlin") source: String,
generatedResultFileName: String,
@Language("kotlin") generatedSource: String
@Language("kotlin") generatedSource: String,
) {
val compilation = KotlinCompilation().apply {
configureKsp(useKsp2 = true) {
Expand All @@ -37,25 +35,27 @@ fun assertGeneratedFile(
kspWithCompilation = true

sources = listOf(
SourceFile.kotlin(sourceFileName, source)
SourceFile.kotlin(sourceFileName, source),
)
}
val result = compilation.compile()
if (result.exitCode != OK) {
print("""
print(
"""
Error when generating files:
${result.outputDirectory.absolutePath}
""".trimIndent())
""".trimIndent(),
)
}
assertEquals(OK, result.exitCode)

val generated = File(
compilation.kspSourcesDir,
"kotlin/$generatedResultFileName"
"kotlin/$generatedResultFileName",
)
assertEquals(
generatedSource.trimIndent(),
generated.readText().trimIndent()
generated.readText().trimIndent(),
)
}

Expand All @@ -66,7 +66,7 @@ fun assertKspResult(
providers: List<SymbolProcessorProvider>,
sourceFileName: String,
@Language("kotlin") source: String,
block: (JvmCompilationResult) -> Unit
block: (JvmCompilationResult) -> Unit,
) {
val compilation = KotlinCompilation().apply {
configureKsp(useKsp2 = true) {
Expand All @@ -76,7 +76,7 @@ fun assertKspResult(
kspWithCompilation = true

sources = listOf(
SourceFile.kotlin(sourceFileName, source)
SourceFile.kotlin(sourceFileName, source),
)
}
block(compilation.compile())
Expand Down
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ junit5 = "5.10.0"
kotlin = "2.1.0"
kotlinpoet = "2.0.0"
ksp = "2.1.0-1.0.29"
ktlint = "0.48.1"
spotless = "7.0.4"

[plugins]
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
binaryCompat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.17.0" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

[libraries]
coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
Expand Down