Skip to content

Commit dbafcdd

Browse files
authored
Updated all the dependencies to latest versions I could find (#13)
* Updated all the dependencies to latest versions I could find * Moved @file:OptIn below copyright
1 parent 2e7e037 commit dbafcdd

File tree

6 files changed

+31
-24
lines changed

6 files changed

+31
-24
lines changed

.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ end_of_line = lf
55
insert_final_newline = true
66

77
[*.{kt,kts}]
8+
ktlint_code_style = intellij_idea
89
indent_style = space
910
indent_size = 2

build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ buildscript {
33
}
44

55
plugins {
6-
kotlin("jvm") version "1.7.10" apply false
7-
id("org.jetbrains.dokka") version "1.7.10" apply false
8-
id("com.gradle.plugin-publish") version "1.0.0" apply false
9-
id("com.github.gmazzo.buildconfig") version "3.1.0" apply false
6+
kotlin("jvm") version "1.9.22" apply false
7+
id("org.jetbrains.dokka") version "1.9.10" apply false
8+
id("com.gradle.plugin-publish") version "1.2.1" apply false
9+
id("com.github.gmazzo.buildconfig") version "5.3.5" apply false
1010
}
1111

1212
allprojects {

kotlin-ir-plugin/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ plugins {
77
dependencies {
88
compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable")
99

10-
kapt("com.google.auto.service:auto-service:1.0.1")
11-
compileOnly("com.google.auto.service:auto-service-annotations:1.0.1")
10+
kapt("com.google.auto.service:auto-service:1.1.1")
11+
compileOnly("com.google.auto.service:auto-service-annotations:1.1.1")
1212

1313
testImplementation(kotlin("test-junit"))
1414
testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
15-
testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.4.9")
15+
testImplementation("dev.zacsweers.kctfork:core:0.4.0")
1616
}
1717

1818
buildConfig {

kotlin-ir-plugin/src/main/kotlin/com/bnorm/template/TemplateCommandLineProcessor.kt

+3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17+
@file:OptIn(ExperimentalCompilerApi::class)
18+
1719
package com.bnorm.template
1820

1921
import com.google.auto.service.AutoService
2022
import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
2123
import org.jetbrains.kotlin.compiler.plugin.CliOption
2224
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
25+
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
2326
import org.jetbrains.kotlin.config.CompilerConfiguration
2427
import org.jetbrains.kotlin.config.CompilerConfigurationKey
2528

kotlin-ir-plugin/src/main/kotlin/com/bnorm/template/TemplateComponentRegistrar.kt kotlin-ir-plugin/src/main/kotlin/com/bnorm/template/TemplateCompilerRegistrar.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,36 @@
1414
* limitations under the License.
1515
*/
1616

17+
@file:OptIn(ExperimentalCompilerApi::class)
18+
1719
package com.bnorm.template
1820

1921
import com.google.auto.service.AutoService
2022
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
2123
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
2224
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
23-
import org.jetbrains.kotlin.com.intellij.mock.MockProject
24-
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
25+
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
26+
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
2527
import org.jetbrains.kotlin.config.CompilerConfiguration
2628

27-
@AutoService(ComponentRegistrar::class)
28-
class TemplateComponentRegistrar(
29+
@AutoService(CompilerPluginRegistrar::class)
30+
class TemplateCompilerRegistrar(
2931
private val defaultString: String,
3032
private val defaultFile: String,
31-
) : ComponentRegistrar {
33+
) : CompilerPluginRegistrar() {
34+
override val supportsK2 = true
3235

3336
@Suppress("unused") // Used by service loader
3437
constructor() : this(
3538
defaultString = "Hello, World!",
3639
defaultFile = "file.txt"
3740
)
3841

39-
override fun registerProjectComponents(
40-
project: MockProject,
41-
configuration: CompilerConfiguration
42-
) {
42+
override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
4343
val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
4444
val string = configuration.get(TemplateCommandLineProcessor.ARG_STRING, defaultString)
4545
val file = configuration.get(TemplateCommandLineProcessor.ARG_FILE, defaultFile)
4646

47-
IrGenerationExtension.registerExtension(project, TemplateIrGenerationExtension(messageCollector, string, file))
47+
IrGenerationExtension.registerExtension(TemplateIrGenerationExtension(messageCollector, string, file))
4848
}
4949
}

kotlin-ir-plugin/src/test/kotlin/com/bnorm/template/IrPluginTest.kt

+10-7
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17+
@file:OptIn(ExperimentalCompilerApi::class)
18+
1719
package com.bnorm.template
1820

21+
import com.tschuchort.compiletesting.JvmCompilationResult
1922
import com.tschuchort.compiletesting.KotlinCompilation
2023
import com.tschuchort.compiletesting.SourceFile
24+
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
2125
import kotlin.test.assertEquals
22-
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
26+
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
2327
import org.junit.Test
2428

2529
class IrPluginTest {
@@ -42,19 +46,18 @@ fun debug() = "Hello, World!"
4246

4347
fun compile(
4448
sourceFiles: List<SourceFile>,
45-
plugin: ComponentRegistrar = TemplateComponentRegistrar(),
46-
): KotlinCompilation.Result {
49+
plugin: CompilerPluginRegistrar = TemplateCompilerRegistrar(),
50+
): JvmCompilationResult {
4751
return KotlinCompilation().apply {
4852
sources = sourceFiles
49-
useIR = true
50-
compilerPlugins = listOf(plugin)
53+
compilerPluginRegistrars = listOf(plugin)
5154
inheritClassPath = true
5255
}.compile()
5356
}
5457

5558
fun compile(
5659
sourceFile: SourceFile,
57-
plugin: ComponentRegistrar = TemplateComponentRegistrar(),
58-
): KotlinCompilation.Result {
60+
plugin: CompilerPluginRegistrar = TemplateCompilerRegistrar(),
61+
): JvmCompilationResult {
5962
return compile(listOf(sourceFile), plugin)
6063
}

0 commit comments

Comments
 (0)