From fb8faffe2e20bef7f2db18b31e5a4056dece0cb9 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Mon, 28 Aug 2023 12:15:05 +0200 Subject: [PATCH] feat: moved to groovy dsl, registered cargo gradle tasks --- build.gradle | 57 +++++++++++++++++++ build.gradle.kts | 47 --------------- settings.gradle.kts => settings.gradle | 0 src/main/java/com/codemp/intellij/CodeMP.java | 1 - 4 files changed, 57 insertions(+), 48 deletions(-) create mode 100644 build.gradle delete mode 100644 build.gradle.kts rename settings.gradle.kts => settings.gradle (100%) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..c5135a9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,57 @@ +plugins { + id 'java' + id 'org.jetbrains.intellij' version '1.14.1' +} + +group = "com.codemp" +version = "1.0-SNAPSHOT" + +java { + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 +} + +repositories { + mavenCentral() +} + +// Configure Gradle IntelliJ Plugin +// Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html +intellij { + version.set("2022.2.5") + type.set("IC") // Target IDE Platform + + //plugins.set(listOf(/* Plugin Dependencies */)) +} + +tasks { + patchPluginXml { + sinceBuild.set("222") + untilBuild.set("232.*") + } + + signPlugin { + certificateChain.set(System.getenv("CERTIFICATE_CHAIN")) + privateKey.set(System.getenv("PRIVATE_KEY")) + password.set(System.getenv("PRIVATE_KEY_PASSWORD")) + } + + publishPlugin { + token.set(System.getenv("PUBLISH_TOKEN")) + } +} + +//define rust tasks +tasks.register('cargoBuild', Exec) { + workingDir '.' + commandLine 'cargo', 'build' +} + +compileJava.dependsOn cargoBuild + +tasks.register('cargoClean', Exec) { + workingDir '.' + commandLine 'cargo', 'clean' +} + +clean.dependsOn cargoClean + diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 8d70212..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,47 +0,0 @@ -plugins { - id("java") - id("org.jetbrains.kotlin.jvm") version "1.8.22" - id("org.jetbrains.intellij") version "1.14.1" -} - -group = "com.codemp" -version = "1.0-SNAPSHOT" - -repositories { - mavenCentral() -} - -// Configure Gradle IntelliJ Plugin -// Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html -intellij { - version.set("2022.2.5") - type.set("IC") // Target IDE Platform - - plugins.set(listOf(/* Plugin Dependencies */)) -} - -tasks { - // Set the JVM compatibility versions - withType { - sourceCompatibility = "17" - targetCompatibility = "17" - } - withType { - kotlinOptions.jvmTarget = "17" - } - - patchPluginXml { - sinceBuild.set("222") - untilBuild.set("232.*") - } - - signPlugin { - certificateChain.set(System.getenv("CERTIFICATE_CHAIN")) - privateKey.set(System.getenv("PRIVATE_KEY")) - password.set(System.getenv("PRIVATE_KEY_PASSWORD")) - } - - publishPlugin { - token.set(System.getenv("PUBLISH_TOKEN")) - } -} diff --git a/settings.gradle.kts b/settings.gradle similarity index 100% rename from settings.gradle.kts rename to settings.gradle diff --git a/src/main/java/com/codemp/intellij/CodeMP.java b/src/main/java/com/codemp/intellij/CodeMP.java index 2d56730..92a42e9 100644 --- a/src/main/java/com/codemp/intellij/CodeMP.java +++ b/src/main/java/com/codemp/intellij/CodeMP.java @@ -1,5 +1,4 @@ package com.codemp.intellij; public class CodeMP { - public static native void connect(String addr); }