diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts index 254b329..1f98f83 100644 --- a/gradle/plugins/build.gradle.kts +++ b/gradle/plugins/build.gradle.kts @@ -27,7 +27,7 @@ dependencies { val compileKotlin: KotlinCompile by tasks compileKotlin.kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } gradlePlugin { diff --git a/gradle/plugins/src/main/java/apigen/ApiGeneratorPlugin.kt b/gradle/plugins/src/main/java/apigen/ApiGeneratorPlugin.kt index fcaf17a..e366b3f 100644 --- a/gradle/plugins/src/main/java/apigen/ApiGeneratorPlugin.kt +++ b/gradle/plugins/src/main/java/apigen/ApiGeneratorPlugin.kt @@ -52,7 +52,7 @@ abstract class ApiGeneratorPlugin : Plugin { val outputLanguage = extension.outputLanguage ?: throw IllegalStateException("Configure output language code for api generator plugin") javaexec { - main = "-jar" + setMain("-jar") workingDir = rootDir args = listOfNotNull( configurations.getByName("apiGenerator").asPath, diff --git a/gradle/plugins/src/main/java/apigen/SwaggerApiGeneratorAndroidPlugin.kt b/gradle/plugins/src/main/java/apigen/SwaggerApiGeneratorAndroidPlugin.kt index fa7887b..7496309 100644 --- a/gradle/plugins/src/main/java/apigen/SwaggerApiGeneratorAndroidPlugin.kt +++ b/gradle/plugins/src/main/java/apigen/SwaggerApiGeneratorAndroidPlugin.kt @@ -63,7 +63,7 @@ class SwaggerApiGeneratorAndroidPlugin : Plugin { workingDir = file(taskWorkingDir) classpath = files(configurations.getByName(GENERATOR_CONFIG).asPath, configurations.getByName(TI_GENERATOR_CONFIG).asPath) - main = "io.swagger.codegen.v3.cli.SwaggerCodegen" + setMain("io.swagger.codegen.v3.cli.SwaggerCodegen") args = listOfNotNull( "generate", "-i", diff --git a/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt b/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt index 68e4be7..709fd22 100644 --- a/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt +++ b/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt @@ -3,6 +3,7 @@ package static_analysis.linters import de.aaschmid.gradle.plugins.cpd.Cpd import de.aaschmid.gradle.plugins.cpd.CpdExtension import org.gradle.api.Project +import org.gradle.api.file.RegularFileProperty import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.withType import static_analysis.errors.CpdError @@ -42,7 +43,7 @@ class CpdLinter : Linter { } tasks.withType { reports.xml.required.set(true) - reports.xml.destination = getCpdReportFile() + reports.xml.setDestination(getCpdReportFile()) ignoreFailures = true source = getSources(extension.excludes) }