From ea45f1b9e52c0acf3c25cb486894b8b305bd06c4 Mon Sep 17 00:00:00 2001 From: Sergey Shkurov Date: Sun, 23 Apr 2023 23:08:49 +0300 Subject: [PATCH] Use gradle.kts --- build.gradle => build.gradle.kts | 29 +++++++++++++------------- settings.gradle => settings.gradle.kts | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) rename build.gradle => build.gradle.kts (55%) rename settings.gradle => settings.gradle.kts (71%) diff --git a/build.gradle b/build.gradle.kts similarity index 55% rename from build.gradle rename to build.gradle.kts index da71f7f..c579784 100644 --- a/build.gradle +++ b/build.gradle.kts @@ -1,19 +1,20 @@ plugins { id("org.springframework.boot") version "2.7.10" id("java") + id("io.spring.dependency-management") version "1.1.0" } -apply plugin: "io.spring.dependency-management" - group = "ru.serega6531" version = "1.0-SNAPSHOT" -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} configurations { - compileOnly { - extendsFrom annotationProcessor + get("compileOnly").apply { + extendsFrom(configurations.annotationProcessor.get()) } } @@ -28,15 +29,15 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-websocket") implementation("org.springframework.session:spring-session-core") implementation("com.github.jmnarloch:modelmapper-spring-boot-starter:1.1.0") - implementation(group: "org.apache.commons", name: "commons-lang3", version: "3.12.0") - implementation(group: "commons-io", name: "commons-io", version: "2.11.0") + implementation(group = "org.apache.commons", name = "commons-lang3", version = "3.12.0") + implementation(group = "commons-io", name = "commons-io", version = "2.11.0") implementation("org.pcap4j:pcap4j-core:1.8.2") implementation("org.pcap4j:pcap4j-packetfactory-static:1.8.2") - implementation(group: "com.google.guava", name: "guava", version: "31.0.1-jre") - implementation(group: "org.java-websocket", name: "Java-WebSocket", version: "1.5.1") - implementation(group: "org.bouncycastle", name: "bcprov-jdk15on", version: "1.69") - implementation(group: "org.bouncycastle", name: "bctls-jdk15on", version: "1.70") - implementation(group: "org.modelmapper", name: "modelmapper", version: "2.4.5") + implementation(group = "com.google.guava", name = "guava", version = "31.0.1-jre") + implementation(group = "org.java-websocket", name = "Java-WebSocket", version = "1.5.1") + implementation(group = "org.bouncycastle", name = "bcprov-jdk15on", version = "1.69") + implementation(group = "org.bouncycastle", name = "bctls-jdk15on", version = "1.70") + implementation(group = "org.modelmapper", name = "modelmapper", version = "2.4.5") compileOnly("org.jetbrains:annotations:22.0.0") compileOnly("org.projectlombok:lombok") runtimeOnly("org.springframework.boot:spring-boot-devtools") @@ -45,6 +46,6 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") } -test { +tasks.getByName("test") { useJUnitPlatform() } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle.kts similarity index 71% rename from settings.gradle rename to settings.gradle.kts index 091d258..1d2c8af 100644 --- a/settings.gradle +++ b/settings.gradle.kts @@ -3,4 +3,4 @@ pluginManagement { gradlePluginPortal() } } -rootProject.name = 'packmate' +rootProject.name = "packmate"