From 0a1180d11428c58406edbfc5a55b48c9ec193bbf Mon Sep 17 00:00:00 2001 From: Bogdan Terehov Date: Wed, 27 Dec 2023 23:34:41 +0300 Subject: [PATCH] =?UTF-8?q?feature=20MIR-6740:=20[Android]=20=D0=94=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20Android=2014?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit migrate to gradle 8.0 --- gradle/plugins/build.gradle.kts | 2 +- gradle/plugins/src/main/java/apigen/ApiGeneratorPlugin.kt | 2 +- .../src/main/java/apigen/SwaggerApiGeneratorAndroidPlugin.kt | 2 +- .../plugins/src/main/java/static_analysis/linters/CpdLinter.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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..d160858 100644 --- a/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt +++ b/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt @@ -42,7 +42,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) } -- 2.40.1