Skip to content
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.

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

chore(dependency): upgrade kotlin to 1.5.32 #1119

Merged
merged 1 commit into from
Nov 21, 2023
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 gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlinVersion=1.4.32
kotlinVersion=1.5.32
org.gradle.parallel=true
spinnakerGradleVersion=8.31.0
targetJava11=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/kotlin-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {

compileTestKotlin {
kotlinOptions {
languageVersion = "1.4"
languageVersion = "1.5"
jvmTarget = "11"
}
}
4 changes: 2 additions & 2 deletions gradle/kotlin.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ dependencies {

compileKotlin {
kotlinOptions {
languageVersion = "1.4"
languageVersion = "1.5"
jvmTarget = "11"
}
}

compileTestKotlin {
kotlinOptions {
languageVersion = "1.4"
languageVersion = "1.5"
jvmTarget = "11"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class PluginSecretTest : JUnit5Minutests {
}

@TestConfiguration
private class TestSecretEngineConfiguration {
class TestSecretEngineConfiguration {
@Bean
fun testSecretEngine(): SecretEngine = object : SecretEngine {
override fun clearCache() = Unit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ class ComplexInjectionScenarioTest : JUnit5Minutests {

@TestConfiguration
@ComponentScan("com.netflix.spinnaker.kork.plugins.v2.scenarios.fixtures")
private class ComplexInjectionTestConfiguration {
class ComplexInjectionTestConfiguration {
@Bean
fun injectsPluginExtensions(testExtensions: List<TestExtension>): InjectsPluginExtensions {
return InjectsPluginExtensions(testExtensions)
}
}

private class InjectsPluginExtensions(val testExtensions: List<TestExtension>) {
class InjectsPluginExtensions(val testExtensions: List<TestExtension>) {
@PostConstruct
fun tryOutExtensions() {
// Verify that extensions can be used immediately.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class ServiceDependenciesScenarioTest : JUnit5Minutests {

@Configuration
@ComponentScan("com.netflix.spinnaker.kork.plugins.v2.scenarios.fixtures")
private class TestApplicationConfiguration
class TestApplicationConfiguration

companion object {
private val GENERATED = testPlugin {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ class ServiceInjectionScenarioTest : JUnit5Minutests {
}

@TestConfiguration
private class ServiceInjectionTestConfiguration {
class ServiceInjectionTestConfiguration {
@Bean
fun injectsPluginExtensions(testExtensions: List<TestExtension>): InjectsPluginExtensions {
return InjectsPluginExtensions(testExtensions)
}
}

private class InjectsPluginExtensions(val testExtensions: List<TestExtension>) {
class InjectsPluginExtensions(val testExtensions: List<TestExtension>) {
@PostConstruct
fun tryOutExtensions() {
// Verify that extensions can be used immediately.
Expand Down
2 changes: 1 addition & 1 deletion spinnaker-dependencies/spinnaker-dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
// 2.16.0 is subject to CVE-2021-45105. 2.17.0 is subject to CVE-2021-44832, so use >= 2.17.1.
api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))

api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.4.3"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"))
//kotlinVersion comes from gradle.properties since we have kotlin code in
// this project and need to configure gradle plugins etc.
api(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion"))
Expand Down