Skip to content

Commit 7527d65

Browse files
committed
Some improvements
Upgrade kotlinVersion from 1.6.20 to 1.7.0 Remove cosmotech-api-common check (as module is no longer here) for openapi generation Upgrade kotlin source compatibility from 1.5 to 1.7 Add task dependency to "openApiGenerate" for "KotlinCompile" task to remove warnings during build
1 parent fecbcfc commit 7527d65

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import pl.allegro.tech.build.axion.release.domain.TagNameSerializationConfig
2323
// See https://docs.gradle.org/current/userguide/organizing_gradle_projects.html#sec:build_sources
2424

2525
plugins {
26-
val kotlinVersion = "1.6.20"
26+
val kotlinVersion = "1.7.0"
2727
kotlin("jvm") version kotlinVersion
2828
kotlin("plugin.spring") version kotlinVersion apply false
2929
id("pl.allegro.tech.build.axion-release") version "1.13.6"
@@ -217,18 +217,17 @@ subprojects {
217217

218218
developmentOnly("org.springframework.boot:spring-boot-devtools")
219219

220-
221220
api("com.github.Cosmo-Tech:cosmotech-api-common:$cosmotechApiCommonVersion")
222221
api("com.github.Cosmo-Tech:cosmotech-api-azure:$cosmotechApiAzureVersion")
223222
}
224223

225-
if (!name.startsWith("cosmotech-api-common")) {
226-
tasks.withType<AbstractCompile> { dependsOn("openApiGenerate") }
227-
}
224+
tasks.withType<AbstractCompile> { dependsOn("openApiGenerate") }
228225

229226
tasks.withType<KotlinCompile> {
227+
dependsOn("openApiGenerate")
228+
230229
kotlinOptions {
231-
languageVersion = "1.5"
230+
languageVersion = "1.7"
232231
freeCompilerArgs = listOf("-Xjsr305=strict")
233232
jvmTarget = kotlinJvmTarget.toString()
234233
java { toolchain { languageVersion.set(JavaLanguageVersion.of(kotlinJvmTarget)) } }

0 commit comments

Comments
 (0)