From a1a2293af47620eb6a68e78b4882de3e5c31be41 Mon Sep 17 00:00:00 2001 From: TopchetoEU <36534413+TopchetoEU@users.noreply.github.com> Date: Thu, 22 May 2025 11:35:04 +0300 Subject: [PATCH] fixing gradle (*again*) --- ....gradle.kts => j2s-common-java.gradle.kts} | 2 +- ...ommon.gradle.kts => j2s-common.gradle.kts} | 34 ++++++++++--------- common/build.gradle.kts | 2 +- compilation/build.gradle.kts | 2 +- lib/build.gradle.kts | 2 +- repl/build.gradle.kts | 2 +- runtime/build.gradle.kts | 2 +- 7 files changed, 24 insertions(+), 22 deletions(-) rename buildSrc/src/main/kotlin/{common-java.gradle.kts => j2s-common-java.gradle.kts} (92%) rename buildSrc/src/main/kotlin/{common.gradle.kts => j2s-common.gradle.kts} (56%) diff --git a/buildSrc/src/main/kotlin/common-java.gradle.kts b/buildSrc/src/main/kotlin/j2s-common-java.gradle.kts similarity index 92% rename from buildSrc/src/main/kotlin/common-java.gradle.kts rename to buildSrc/src/main/kotlin/j2s-common-java.gradle.kts index 81e491c..a3cf62c 100644 --- a/buildSrc/src/main/kotlin/common-java.gradle.kts +++ b/buildSrc/src/main/kotlin/j2s-common-java.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("common"); + id("j2s-common"); } java { diff --git a/buildSrc/src/main/kotlin/common.gradle.kts b/buildSrc/src/main/kotlin/j2s-common.gradle.kts similarity index 56% rename from buildSrc/src/main/kotlin/common.gradle.kts rename to buildSrc/src/main/kotlin/j2s-common.gradle.kts index 2577f0a..2ab2f2c 100644 --- a/buildSrc/src/main/kotlin/common.gradle.kts +++ b/buildSrc/src/main/kotlin/j2s-common.gradle.kts @@ -22,26 +22,28 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher"); } +if (System.getenv("REPO_URL") != null) { + publishing { + repositories { + maven { + name = "Gitea"; + url = uri(System.getenv("REPO_URL") ?: ""); -publishing { - repositories { - maven { - name = "Gitea"; - url = uri(System.getenv("REPO_URL") ?: ""); + credentials(HttpHeaderCredentials::class) { + name = "Authorization"; + value = "token ${System.getenv("ACCESS_TOKEN")}"; + } - credentials(HttpHeaderCredentials::class) { - name = "Authorization"; - value = "token ${System.getenv("ACCESS_TOKEN")}"; - } - - authentication { - create("header"); + authentication { + create("header"); + } } } - } - publications { - create("maven") { - from(components["java"]); + publications { + create("maven") { + from(components["java"]); + } } } } + diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 0416b61..c06becd 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("common-java"); + id("j2s-common-java"); } description = "A collection of utils and structures for the rest of the project"; diff --git a/compilation/build.gradle.kts b/compilation/build.gradle.kts index 8a6997b..d01c727 100644 --- a/compilation/build.gradle.kts +++ b/compilation/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("common-java"); + id("j2s-common-java"); } description = "A compiler of EcmaScript 5 code to J2S bytecode"; diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index fb7e197..a8fdcec 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -1,7 +1,7 @@ import com.github.gradle.node.npm.task.NpmTask; plugins { - id("common-java"); + id("j2s-common-java"); id("com.github.node-gradle.node") version "5.0.0"; } diff --git a/repl/build.gradle.kts b/repl/build.gradle.kts index 5251db3..bbef865 100644 --- a/repl/build.gradle.kts +++ b/repl/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("common-java"); + id("j2s-common-java"); id("com.gradleup.shadow") version "9.0.0-beta4"; } diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts index e03c94f..7d96bc9 100644 --- a/runtime/build.gradle.kts +++ b/runtime/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("common-java"); + id("j2s-common-java"); } description = "The runtime of J2S, used to execute J2S bytecode";