Skip to content

Commit 66d05ba

Browse files
Bump the gradle group across 1 directory with 5 updates (#242)
* Bump the gradle group across 1 directory with 5 updates Bumps the gradle group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.jetbrains.kotlin:kotlin-compiler-embeddable](https://github.com/JetBrains/kotlin) | `2.2.0` | `2.2.10` | | org.jetbrains.kotlin:kotlin-maven-plugin | `2.2.0` | `2.2.10` | | [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) | `2.2.0` | `2.2.10` | | [org.jetbrains.kotlin.multiplatform](https://github.com/JetBrains/kotlin) | `2.2.0` | `2.2.10` | | [org.assertj:assertj-core](https://github.com/assertj/assertj) | `3.27.3` | `3.27.4` | Updates `org.jetbrains.kotlin:kotlin-compiler-embeddable` from 2.2.0 to 2.2.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.2.0...v2.2.10) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.2.0 to 2.2.10 Updates `org.jetbrains.kotlin.jvm` from 2.2.0 to 2.2.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.2.0...v2.2.10) Updates `org.jetbrains.kotlin.multiplatform` from 2.2.0 to 2.2.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.2.0...v2.2.10) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.2.0 to 2.2.10 Updates `org.assertj:assertj-core` from 3.27.3 to 3.27.4 - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.27.3...assertj-build-3.27.4) Updates `org.jetbrains.kotlin.jvm` from 2.2.0 to 2.2.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.2.0...v2.2.10) Updates `org.jetbrains.kotlin.multiplatform` from 2.2.0 to 2.2.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.2.0...v2.2.10) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-compiler-embeddable dependency-version: 2.2.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-version: 2.2.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.jetbrains.kotlin.jvm dependency-version: 2.2.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.jetbrains.kotlin.multiplatform dependency-version: 2.2.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-version: 2.2.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.assertj:assertj-core dependency-version: 3.27.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.jetbrains.kotlin.jvm dependency-version: 2.2.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.jetbrains.kotlin.multiplatform dependency-version: 2.2.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle ... Signed-off-by: dependabot[bot] <support@github.com> * Updated version and fixed tests --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: stefankoppier <stefan.koppier@outlook.com>
1 parent c1fcf44 commit 66d05ba

File tree

10 files changed

+956
-494
lines changed

10 files changed

+956
-494
lines changed

compiler-plugin/src/main/kotlin/tech/mappie/MappieCompilerPluginRegistrar.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ package tech.mappie
33
import tech.mappie.MappieCommandLineProcessor.Companion.ARGUMENT_STRICTNESS_ENUMS
44
import tech.mappie.MappieCommandLineProcessor.Companion.ARGUMENT_STRICTNESS_VISIBILITY
55
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
6-
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys.MODULE_CHUNK
76
import org.jetbrains.kotlin.cli.common.messages.MessageCollector.Companion.NONE
8-
import org.jetbrains.kotlin.cli.common.modules.ModuleChunk
7+
import org.jetbrains.kotlin.cli.common.moduleChunk
98
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
109
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
1110
import org.jetbrains.kotlin.config.CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY
@@ -39,8 +38,9 @@ class MappieCompilerPluginRegistrar : CompilerPluginRegistrar() {
3938
}
4039

4140
private fun isStartedWithTestFixtures(configuration: CompilerConfiguration) =
42-
configuration.get(MODULE_CHUNK, ModuleChunk(emptyList())).modules
43-
.firstOrNull { it.getModuleName() == "main" }
41+
configuration.moduleChunk
42+
?.modules
43+
?.firstOrNull { it.getModuleName() == "main" }
4444
?.getClasspathRoots()
4545
?.any { it.matches(Regex(".*compiler-plugin-.*-test-fixtures.*\\.jar")) }
4646
?: false

gradle-plugin/src/test/kotlin/tech/mappie/testing/TestBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ abstract class TestBase {
2121

2222
protected open val gradleVersion: String? = null
2323

24-
protected open val kotlinVersion = "2.2.0"
24+
protected open val kotlinVersion = "2.2.10"
2525

2626
@BeforeEach
2727
fun setup() {

gradle-plugin/src/test/kotlin/tech/mappie/testing/compatibility/kotlin/OlderKotlinVersionCompatibilityTest.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@ package tech.mappie.testing.compatibility.kotlin
22

33
import org.assertj.core.api.Assertions.assertThat
44
import org.junit.jupiter.api.Test
5+
import tech.mappie.BuildConfig
56

67
class OlderKotlinVersionCompatibilityTest : KotlinCompatibilityTestBase() {
78

8-
override val kotlinVersion = "2.1.10"
9+
override val kotlinVersion = "2.2.0"
910

1011
@Test
11-
fun `test compatibility with kotlin 2_1_0`() {
12-
val result = runner.withArguments("build").buildAndFail()
12+
fun `test compatibility with kotlin 2_2_0`() {
13+
val result = runner.withArguments("build").run()
14+
15+
val exptectedVersion = BuildConfig.VERSION.split('-').first()
1316

1417
assertThat(result.output.lines())
15-
.anyMatch { it == "Mappie unsupported Kotlin version 2.1.10, 2.2.0 was expected. This is highly likely to lead to compilation failure." }
18+
.anyMatch { it == "Mappie unsupported Kotlin version $kotlinVersion, $exptectedVersion was expected. This is highly likely to lead to compilation failure." }
1619
}
1720
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.2.0-1.4.1
1+
version=2.2.10-1.4.2
22

33
org.gradle.configuration-cache=true
44
org.gradle.configuration-cache.parallel=true

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
2-
kotlin = "2.2.0"
2+
kotlin = "2.2.10"
33

44
[libraries]
55
kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
66
kotlin-maven-plugin = { module = "org.jetbrains.kotlin:kotlin-maven-plugin", version.ref = "kotlin" }
77
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin" }
88
classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.181" }
99
okio = { module = "com.squareup.okio:okio", version = "3.16.0" }
10-
assertj-core = { module = "org.assertj:assertj-core", version = "3.27.3" }
10+
assertj-core = { module = "org.assertj:assertj-core", version = "3.27.4" }
1111
maven-project = { module = "org.apache.maven:maven-project", version = "2.2.1" }
1212
maven-core = { module = "org.apache.maven:maven-core", version = "3.9.11" }
1313
maven-invoker = { module = "org.apache.maven.shared:maven-invoker", version = "3.3.0" }

0 commit comments

Comments
 (0)