From 66279741f09930f908ad6efc7e9013c8a4e19fd5 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Thu, 19 Oct 2023 14:51:53 +0200 Subject: [PATCH] gradle-plugins: Use embedded Kotlin compiler --- build-logic/app-start-plugin/build.gradle | 17 -------------- build-logic/app-start-plugin/build.gradle.kts | 17 ++++++++++++++ build-logic/docker-image-builder/build.gradle | 17 -------------- .../docker-image-builder/build.gradle.kts | 17 ++++++++++++++ build-logic/gradle-tasks/build.gradle | 12 ---------- build-logic/gradle-tasks/build.gradle.kts | 11 ++++++++++ build-logic/packaging/build.gradle | 22 ------------------- build-logic/packaging/build.gradle.kts | 22 +++++++++++++++++++ build-logic/regtest/build.gradle | 17 -------------- build-logic/regtest/build.gradle.kts | 17 ++++++++++++++ build-logic/toolchain-resolver/build.gradle | 17 -------------- .../toolchain-resolver/build.gradle.kts | 17 ++++++++++++++ build-logic/tor-binary/build.gradle | 21 ------------------ build-logic/tor-binary/build.gradle.kts | 21 ++++++++++++++++++ 14 files changed, 122 insertions(+), 123 deletions(-) delete mode 100644 build-logic/app-start-plugin/build.gradle create mode 100644 build-logic/app-start-plugin/build.gradle.kts delete mode 100644 build-logic/docker-image-builder/build.gradle create mode 100644 build-logic/docker-image-builder/build.gradle.kts delete mode 100644 build-logic/gradle-tasks/build.gradle create mode 100644 build-logic/gradle-tasks/build.gradle.kts delete mode 100644 build-logic/packaging/build.gradle create mode 100644 build-logic/packaging/build.gradle.kts delete mode 100644 build-logic/regtest/build.gradle create mode 100644 build-logic/regtest/build.gradle.kts delete mode 100644 build-logic/toolchain-resolver/build.gradle create mode 100644 build-logic/toolchain-resolver/build.gradle.kts delete mode 100644 build-logic/tor-binary/build.gradle create mode 100644 build-logic/tor-binary/build.gradle.kts diff --git a/build-logic/app-start-plugin/build.gradle b/build-logic/app-start-plugin/build.gradle deleted file mode 100644 index 15b43f6ec0..0000000000 --- a/build-logic/app-start-plugin/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' -} - -repositories { - mavenCentral() -} - -gradlePlugin { - plugins { - simplePlugin { - id = 'bisq.gradle.app_start_plugin.AppStartPlugin' - implementationClass = 'bisq.gradle.app_start_plugin.AppStartPlugin' - } - } -} diff --git a/build-logic/app-start-plugin/build.gradle.kts b/build-logic/app-start-plugin/build.gradle.kts new file mode 100644 index 0000000000..e83b4f0406 --- /dev/null +++ b/build-logic/app-start-plugin/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + `java-gradle-plugin` + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +gradlePlugin { + plugins { + create("AppStartPlugin") { + id = "bisq.gradle.app_start_plugin.AppStartPlugin" + implementationClass = "bisq.gradle.app_start_plugin.AppStartPlugin" + } + } +} diff --git a/build-logic/docker-image-builder/build.gradle b/build-logic/docker-image-builder/build.gradle deleted file mode 100644 index 217492b4cc..0000000000 --- a/build-logic/docker-image-builder/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' -} - -repositories { - mavenCentral() -} - -gradlePlugin { - plugins { - simplePlugin { - id = 'bisq.gradle.docker.image_builder.DockerImageBuilderPlugin' - implementationClass = 'bisq.gradle.docker.image_builder.DockerImageBuilderPlugin' - } - } -} diff --git a/build-logic/docker-image-builder/build.gradle.kts b/build-logic/docker-image-builder/build.gradle.kts new file mode 100644 index 0000000000..26cdd11922 --- /dev/null +++ b/build-logic/docker-image-builder/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + `java-gradle-plugin` + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +gradlePlugin { + plugins { + create("DockerImageBuilderPlugin") { + id = "bisq.gradle.docker.image_builder.DockerImageBuilderPlugin" + implementationClass = "bisq.gradle.docker.image_builder.DockerImageBuilderPlugin" + } + } +} diff --git a/build-logic/gradle-tasks/build.gradle b/build-logic/gradle-tasks/build.gradle deleted file mode 100644 index 7c84d60149..0000000000 --- a/build-logic/gradle-tasks/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' -} - -repositories { - mavenCentral() -} - -dependencies { - implementation libs.bouncycastle.bcpg.jdk15on -} diff --git a/build-logic/gradle-tasks/build.gradle.kts b/build-logic/gradle-tasks/build.gradle.kts new file mode 100644 index 0000000000..e73f9f7fb0 --- /dev/null +++ b/build-logic/gradle-tasks/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +dependencies { + implementation(libs.bouncycastle.bcpg.jdk15on) +} diff --git a/build-logic/packaging/build.gradle b/build-logic/packaging/build.gradle deleted file mode 100644 index c29858e0ec..0000000000 --- a/build-logic/packaging/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' -} - -repositories { - mavenCentral() -} - -gradlePlugin { - plugins { - simplePlugin { - id = 'bisq.gradle.packaging.PackagingPlugin' - implementationClass = 'bisq.gradle.packaging.PackagingPlugin' - } - } -} - -dependencies { - implementation project(':gradle-tasks') - implementation libs.commons.codec -} diff --git a/build-logic/packaging/build.gradle.kts b/build-logic/packaging/build.gradle.kts new file mode 100644 index 0000000000..7f4dbb6a0b --- /dev/null +++ b/build-logic/packaging/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + `java-gradle-plugin` + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +gradlePlugin { + plugins { + create("PackagingPlugin") { + id = "bisq.gradle.packaging.PackagingPlugin" + implementationClass = "bisq.gradle.packaging.PackagingPlugin" + } + } +} + +dependencies { + implementation(project(":gradle-tasks")) + implementation(libs.commons.codec) +} diff --git a/build-logic/regtest/build.gradle b/build-logic/regtest/build.gradle deleted file mode 100644 index 8b2d374544..0000000000 --- a/build-logic/regtest/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' -} - -repositories { - mavenCentral() -} - -gradlePlugin { - plugins { - simplePlugin { - id = 'bisq.gradle.regtest_plugin.RegtestPlugin' - implementationClass = 'bisq.gradle.regtest_plugin.RegtestPlugin' - } - } -} diff --git a/build-logic/regtest/build.gradle.kts b/build-logic/regtest/build.gradle.kts new file mode 100644 index 0000000000..3b831557a4 --- /dev/null +++ b/build-logic/regtest/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + `java-gradle-plugin` + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +gradlePlugin { + plugins { + create("RegtestPlugin") { + id = "bisq.gradle.regtest_plugin.RegtestPlugin" + implementationClass = "bisq.gradle.regtest_plugin.RegtestPlugin" + } + } +} diff --git a/build-logic/toolchain-resolver/build.gradle b/build-logic/toolchain-resolver/build.gradle deleted file mode 100644 index 2922cf4c05..0000000000 --- a/build-logic/toolchain-resolver/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' -} - -repositories { - mavenCentral() -} - -gradlePlugin { - plugins { - simplePlugin { - id = 'bisq.gradle.toolchain_resolver.ToolchainResolverPlugin' - implementationClass = 'bisq.gradle.toolchain_resolver.ToolchainResolverPlugin' - } - } -} diff --git a/build-logic/toolchain-resolver/build.gradle.kts b/build-logic/toolchain-resolver/build.gradle.kts new file mode 100644 index 0000000000..3d2ed112ad --- /dev/null +++ b/build-logic/toolchain-resolver/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + `java-gradle-plugin` + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +gradlePlugin { + plugins { + create("ToolchainResolverPlugin") { + id = "bisq.gradle.toolchain_resolver.ToolchainResolverPlugin" + implementationClass = "bisq.gradle.toolchain_resolver.ToolchainResolverPlugin" + } + } +} diff --git a/build-logic/tor-binary/build.gradle b/build-logic/tor-binary/build.gradle deleted file mode 100644 index 5f4d40ed6e..0000000000 --- a/build-logic/tor-binary/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' -} - -repositories { - mavenCentral() -} - -gradlePlugin { - plugins { - simplePlugin { - id = 'bisq.gradle.tor_binary.BisqTorBinaryPlugin' - implementationClass = 'bisq.gradle.tor_binary.BisqTorBinaryPlugin' - } - } -} - -dependencies { - implementation project(':gradle-tasks') -} diff --git a/build-logic/tor-binary/build.gradle.kts b/build-logic/tor-binary/build.gradle.kts new file mode 100644 index 0000000000..034857091f --- /dev/null +++ b/build-logic/tor-binary/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + `java-gradle-plugin` + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +gradlePlugin { + plugins { + create("BisqTorBinaryPlugin") { + id = "bisq.gradle.tor_binary.BisqTorBinaryPlugin" + implementationClass = "bisq.gradle.tor_binary.BisqTorBinaryPlugin" + } + } +} + +dependencies { + implementation(project(":gradle-tasks")) +}