From f712133fe1f436abb862b284fabf27cd6c35cbd0 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Sun, 16 Jun 2024 14:26:54 +0200 Subject: [PATCH] Update Gradle --- build.gradle | 23 ------------------- build.gradle.kts | 29 ++++++++++++++++++++++++ gradle.properties | 8 ------- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- settings.gradle => settings.gradle.kts | 0 6 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 gradle.properties rename settings.gradle => settings.gradle.kts (100%) diff --git a/build.gradle b/build.gradle deleted file mode 100644 index b931348..0000000 --- a/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ - -plugins { - id "org.jetbrains.kotlin.jvm" version "1.9.23" -} - -// Build configuration is taken from helper scripts in Hexagon's repository -apply(from: "$gradleScripts/kotlin.gradle") -apply(from: "$gradleScripts/application.gradle") - -defaultTasks("test") - -mainClassName = "com.hexagonkt.todokt.backend.ApplicationKt" -applicationDefaultJvmArgs = [ "-Xms64M", "-Xmx2G", "-XX:+UseNUMA", "-XX:+UseParallelGC" ] - -dependencies { - implementation("com.hexagonkt:http_server_jetty:$hexagonVersion") - implementation("com.hexagonkt:serialization_jackson_json:$hexagonVersion") - implementation("com.hexagonkt.extra:store_mongodb:$hexagonExtraVersion") - implementation("com.hexagonkt.extra:converters:$hexagonExtraVersion") -} - -task stage(dependsOn: ['build', 'clean']) -build.mustRunAfter clean diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..4239b3c --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,29 @@ +import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL + +plugins { + kotlin("jvm") version("2.0.0") + id("org.graalvm.buildtools.native") version("0.10.2") +} + +val hexagonVersion = "3.5.3" +val hexagonExtraVersion = "3.5.3" +val gradleScripts = "https://raw.githubusercontent.com/hexagontk/hexagon/$hexagonVersion/gradle" + +ext.set("options", "-Xms64M -Xmx1G -XX:+UseNUMA") +ext.set("applicationClass", "com.hexagonkt.todokt.backend.ApplicationKt") + +apply(from = "$gradleScripts/kotlin.gradle") +apply(from = "$gradleScripts/application.gradle") +apply(from = "$gradleScripts/native.gradle") + +dependencies { + implementation("com.hexagonkt:http_server_jetty:$hexagonVersion") + implementation("com.hexagonkt:serialization_jackson_json:$hexagonVersion") + implementation("com.hexagonkt.extra:store_mongodb:$hexagonExtraVersion") + implementation("com.hexagonkt.extra:converters:$hexagonExtraVersion") +} + +tasks.wrapper { + gradleVersion = "8.8" + distributionType = ALL +} diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 6b73a78..0000000 --- a/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# suppress inspection "UnusedProperty" for whole file - -# BUILD PROPERTIES -gradleScripts=https://raw.githubusercontent.com/hexagonkt/hexagon/3.5.3/gradle - -# VERSIONS -hexagonVersion=3.5.3 -hexagonExtraVersion=3.4.6 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..6f7a6eb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/settings.gradle b/settings.gradle.kts similarity index 100% rename from settings.gradle rename to settings.gradle.kts