From 7fa93efc6d6b0648c49fd50afea8578540fa4979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Fri, 4 Apr 2025 16:49:11 +0200 Subject: [PATCH] upgrade: Gradle Conventions 1.6.3 See https://gitlab.com/opensavvy/automation/gradle-conventions/-/releases/1.6.3 --- gradle/conventions/settings.gradle.kts | 2 +- gradle/templates/template-app/build.gradle.kts | 11 +++++------ settings.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index 374fdf7..504e1e1 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -45,7 +45,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.6.2" + id("dev.opensavvy.conventions.settings") version "1.6.3" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") diff --git a/gradle/templates/template-app/build.gradle.kts b/gradle/templates/template-app/build.gradle.kts index db2a969..47e8666 100644 --- a/gradle/templates/template-app/build.gradle.kts +++ b/gradle/templates/template-app/build.gradle.kts @@ -1,19 +1,18 @@ plugins { alias(opensavvyConventions.plugins.base) alias(opensavvyConventions.plugins.kotlin.application) - application } kotlin { jvm { - withJava() // required by the application plugin + binaries { + executable { + mainClass.set("opensavvy.playground.app.MainKt") + } + } } sourceSets.commonMain.dependencies { implementation(projects.gradle.templates.templateLib) } } - -application { - mainClass.set("opensavvy.playground.app.MainKt") -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 5cab16c..15475e7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -49,7 +49,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.6.2" + id("dev.opensavvy.conventions.settings") version "1.6.3" } include( -- 2.51.2