Skip to content

Add Toml & Edit Struct Name #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crowforkotlin wants to merge 2 commits into from
Closed

Add Toml & Edit Struct Name #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85ac851
Add Toml & Edit Struct Name
crowforkotlin Nov 10, 2025
950db48
Add Toml & Edit Struct Name
crowforkotlin Nov 10, 2025
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
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.build.config)
alias(libs.plugins.binary.compatibility.validator) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.kotlin.binary.compatibility.validator) apply false
alias(libs.plugins.buildconfig) apply false
}

allprojects {
Expand Down
29 changes: 25 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,35 @@
[versions]
# https://github.com/JetBrains/kotlin
kotlin = "2.2.20"
build-config = "5.6.5"
bcv = "0.16.3"

# https://github.com/Kotlin/binary-compatibility-validator
kotlin-binaryCompatibilityValidator = "0.16.3"

# https://github.com/junit-team/junit4
junit = "4.13.2"

# https://github.com/gmazzo/gradle-buildconfig-plugin
buildconfig = "5.6.5"


[libraries]
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
kotlin-test-junit5 = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit5", version.ref = "kotlin" }
kotlin-test-framework = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-internal-test-framework", version.ref = "kotlin" }
kotlin-annotations-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-annotations-jvm", version.ref = "kotlin" }
kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler", version.ref = "kotlin" }
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
kotlin-gradle-plugin-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api", version.ref = "kotlin" }
Copy link

Copilot AI Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra trailing space after kotlin-gradle-plugin-api. Consider removing the space for consistency with other library declarations.

Suggested change
kotlin-gradle-plugin-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api", version.ref = "kotlin" }
kotlin-gradle-plugin-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api", version.ref = "kotlin" }

Copilot uses AI. Check for mistakes.

junit = { module = "junit:junit", version.ref = "junit" }

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
build-config = { id = "com.github.gmazzo.buildconfig", version.ref = "build-config" }
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "bcv" }
kotlin-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlin-binaryCompatibilityValidator"}
Copy link

Copilot AI Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing space after closing brace. Should be kotlin-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlin-binaryCompatibilityValidator" }

Suggested change
kotlin-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlin-binaryCompatibilityValidator"}
kotlin-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlin-binaryCompatibilityValidator" }

Copilot uses AI. Check for mistakes.
buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig"}
Copy link

Copilot AI Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing space after closing brace. Should be buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" }

Suggested change
buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig"}
buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" }

Copilot uses AI. Check for mistakes.

gradle-java-test-fixtures = { id = "java-test-fixtures" }
gradle-idea = { id = "idea" }
gradle-plugin = { id = "java-gradle-plugin" }
6 changes: 3 additions & 3 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ dependencyResolutionManagement {

rootProject.name = "compiler-plugin-template"

include("compiler-plugin")
include("gradle-plugin")
include("plugin-annotations")
include("template-compiler-plugin")
include("template-gradle-plugin")
include("template-plugin-annotations")
26 changes: 13 additions & 13 deletions compiler-plugin/build.gradle.kts → template-compiler-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
kotlin("jvm")
`java-test-fixtures`
id("com.github.gmazzo.buildconfig")
idea
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.buildconfig)
alias(libs.plugins.gradle.java.test.fixtures)
alias(libs.plugins.gradle.idea)
}

sourceSets {
Expand All @@ -26,20 +26,20 @@ idea {
val annotationsRuntimeClasspath: Configuration by configurations.creating { isTransitive = false }

dependencies {
compileOnly(kotlin("compiler"))
compileOnly(libs.kotlin.compiler)

testFixturesApi(kotlin("test-junit5"))
testFixturesApi(kotlin("compiler-internal-test-framework"))
testFixturesApi(kotlin("compiler"))
testFixturesApi(libs.kotlin.test.junit5)
testFixturesApi(libs.kotlin.test.framework)
testFixturesApi(libs.kotlin.compiler)

annotationsRuntimeClasspath(project(":plugin-annotations"))
annotationsRuntimeClasspath(project(":template-plugin-annotations"))

// Dependencies required to run the internal test framework.
testRuntimeOnly(libs.junit)
testRuntimeOnly(kotlin("reflect"))
testRuntimeOnly(kotlin("test"))
testRuntimeOnly(kotlin("script-runtime"))
testRuntimeOnly(kotlin("annotations-jvm"))
testRuntimeOnly(libs.kotlin.reflect)
testRuntimeOnly(libs.kotlin.test)
testRuntimeOnly(libs.kotlin.script.runtime)
testRuntimeOnly(libs.kotlin.annotations.jvm)
}

buildConfig {
Expand Down
0 ...tlin.compiler.plugin.CommandLineProcessor → ...tlin.compiler.plugin.CommandLineProcessor
View file
Open in desktop
File renamed without changes.
0 ...n.compiler.plugin.CompilerPluginRegistrar → ...n.compiler.plugin.CompilerPluginRegistrar
View file
Open in desktop
File renamed without changes.
0 ...in/template/SimpleCommandLineProcessor.kt → ...in/template/SimpleCommandLineProcessor.kt
View file
Open in desktop
File renamed without changes.
0 ...emplate/SimplePluginComponentRegistrar.kt → ...emplate/SimplePluginComponentRegistrar.kt
View file
Open in desktop
File renamed without changes.
0 .../plugin/template/SimplePluginRegistrar.kt → .../plugin/template/SimplePluginRegistrar.kt
View file
Open in desktop
File renamed without changes.
0 ...ugin/template/fir/SimpleClassGenerator.kt → ...ugin/template/fir/SimpleClassGenerator.kt
View file
Open in desktop
File renamed without changes.
0 ...ate/ir/AbstractTransformerForGenerator.kt → ...ate/ir/AbstractTransformerForGenerator.kt
View file
Open in desktop
File renamed without changes.
0 ...ugin/template/ir/SimpleIrBodyGenerator.kt → ...ugin/template/ir/SimpleIrBodyGenerator.kt
View file
Open in desktop
File renamed without changes.
0 ...emplate/ir/SimpleIrGenerationExtension.kt → ...emplate/ir/SimpleIrGenerationExtension.kt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...compiler/plugin/template/GenerateTests.kt → ...compiler/plugin/template/GenerateTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5

fun main() {
generateTestGroupSuiteWithJUnit5 {
testGroup(testDataRoot = "compiler-plugin/testData", testsRoot = "compiler-plugin/test-gen") {
testGroup(testDataRoot = "template-compiler-plugin/testData", testsRoot = "template-compiler-plugin/test-gen") {
testClass<AbstractJvmDiagnosticTest> {
model("diagnostics")
}
Expand Down
0 ...in/template/runners/AbstractJvmBoxTest.kt → ...in/template/runners/AbstractJvmBoxTest.kt
View file
Open in desktop
File renamed without changes.
0 ...late/runners/AbstractJvmDiagnosticTest.kt → ...late/runners/AbstractJvmDiagnosticTest.kt
View file
Open in desktop
File renamed without changes.
0 ...ervices/ExtensionRegistrarConfigurator.kt → ...ervices/ExtensionRegistrarConfigurator.kt
View file
Open in desktop
File renamed without changes.
0 ...ate/services/PluginAnnotationsProvider.kt → ...ate/services/PluginAnnotationsProvider.kt
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...template/runners/JvmBoxTestGenerated.java → ...template/runners/JvmBoxTestGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@

/** This class is generated by {@link org.jetbrains.kotlin.compiler.plugin.template.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler-plugin/testData/box")
@TestMetadata("template-compiler-plugin/testData/box")
@TestDataPath("$PROJECT_ROOT")
public class JvmBoxTestGenerated extends AbstractJvmBoxTest {
@Test
public void testAllFilesPresentInBox() {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("template-compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}

@Test
@TestMetadata("anotherBoxTest.kt")
public void testAnotherBoxTest() {
runTest("compiler-plugin/testData/box/anotherBoxTest.kt");
runTest("template-compiler-plugin/testData/box/anotherBoxTest.kt");
}

@Test
@TestMetadata("simple.kt")
public void testSimple() {
runTest("compiler-plugin/testData/box/simple.kt");
runTest("template-compiler-plugin/testData/box/simple.kt");
}
}
8 changes: 4 additions & 4 deletions ...e/runners/JvmDiagnosticTestGenerated.java → ...e/runners/JvmDiagnosticTestGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@

/** This class is generated by {@link org.jetbrains.kotlin.compiler.plugin.template.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler-plugin/testData/diagnostics")
@TestMetadata("template-compiler-plugin/testData/diagnostics")
@TestDataPath("$PROJECT_ROOT")
public class JvmDiagnosticTestGenerated extends AbstractJvmDiagnosticTest {
@Test
public void testAllFilesPresentInDiagnostics() {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("template-compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}

@Test
@TestMetadata("anotherDiagnosticTest.kt")
public void testAnotherDiagnosticTest() {
runTest("compiler-plugin/testData/diagnostics/anotherDiagnosticTest.kt");
runTest("template-compiler-plugin/testData/diagnostics/anotherDiagnosticTest.kt");
}

@Test
@TestMetadata("simple.kt")
public void testSimple() {
runTest("compiler-plugin/testData/diagnostics/simple.kt");
runTest("template-compiler-plugin/testData/diagnostics/simple.kt");
}
}
0 ...in/testData/box/anotherBoxTest.fir.ir.txt → ...in/testData/box/anotherBoxTest.fir.ir.txt
View file
Open in desktop
File renamed without changes.
0 ...lugin/testData/box/anotherBoxTest.fir.txt → ...lugin/testData/box/anotherBoxTest.fir.txt
View file
Open in desktop
File renamed without changes.
0 ...ler-plugin/testData/box/anotherBoxTest.kt → ...ler-plugin/testData/box/anotherBoxTest.kt
View file
Open in desktop
File renamed without changes.
0 ...ler-plugin/testData/box/simple.fir.ir.txt → ...ler-plugin/testData/box/simple.fir.ir.txt
View file
Open in desktop
File renamed without changes.
0 compiler-plugin/testData/box/simple.fir.txt → ...mpiler-plugin/testData/box/simple.fir.txt
View file
Open in desktop
File renamed without changes.
0 compiler-plugin/testData/box/simple.kt → ...te-compiler-plugin/testData/box/simple.kt
View file
Open in desktop
File renamed without changes.
0 ...diagnostics/anotherDiagnosticTest.fir.txt → ...diagnostics/anotherDiagnosticTest.fir.txt
View file
Open in desktop
File renamed without changes.
0 ...Data/diagnostics/anotherDiagnosticTest.kt → ...Data/diagnostics/anotherDiagnosticTest.kt
View file
Open in desktop
File renamed without changes.
0 ...lugin/testData/diagnostics/simple.fir.txt → ...lugin/testData/diagnostics/simple.fir.txt
View file
Open in desktop
File renamed without changes.
0 ...ler-plugin/testData/diagnostics/simple.kt → ...ler-plugin/testData/diagnostics/simple.kt
View file
Open in desktop
File renamed without changes.
15 changes: 7 additions & 8 deletions gradle-plugin/build.gradle.kts → template-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm")
id("com.github.gmazzo.buildconfig")
id("java-gradle-plugin")
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.buildconfig)
alias(libs.plugins.gradle.plugin)
}

sourceSets {
Expand All @@ -16,22 +16,21 @@ sourceSets {
}

dependencies {
implementation(kotlin("gradle-plugin-api"))

testImplementation(kotlin("test-junit5"))
implementation(libs.kotlin.gradle.plugin.api)
testImplementation(libs.kotlin.test.junit5)
}

buildConfig {
packageName(project.group.toString())

buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"${rootProject.group}\"")

val pluginProject = project(":compiler-plugin")
val pluginProject = project(":template-compiler-plugin")
buildConfigField("String", "KOTLIN_PLUGIN_GROUP", "\"${pluginProject.group}\"")
buildConfigField("String", "KOTLIN_PLUGIN_NAME", "\"${pluginProject.name}\"")
buildConfigField("String", "KOTLIN_PLUGIN_VERSION", "\"${pluginProject.version}\"")

val annotationsProject = project(":plugin-annotations")
val annotationsProject = project(":template-plugin-annotations")
buildConfigField(
type = "String",
name = "ANNOTATIONS_LIBRARY_COORDINATES",
Expand Down
0 .../plugin/template/SimpleGradleExtension.kt → .../plugin/template/SimpleGradleExtension.kt
View file
Open in desktop
File renamed without changes.
0 ...ler/plugin/template/SimpleGradlePlugin.kt → ...ler/plugin/template/SimpleGradlePlugin.kt
View file
Open in desktop
File renamed without changes.
0 ...in-annotations/api/plugin-annotations.api → ...in-annotations/api/plugin-annotations.api
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions plugin-annotations/build.gradle.kts → template-plugin-annotations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl

plugins {
kotlin("multiplatform")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.binary.compatibility.validator)
}

kotlin {
Expand Down
0 ...ompiler/plugin/template/SomeAnnotation.kt → ...ompiler/plugin/template/SomeAnnotation.kt
View file
Open in desktop
File renamed without changes.