From 0d82430968c72b4f6d0d21113e16f21d5322cb4d Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Fri, 1 Sep 2023 19:57:54 +1000 Subject: [PATCH] Reformat publishing section of build.gradle.kts --- build.gradle.kts | 59 +++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cfc5190..3ab93d3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,6 @@ repositories { dependencies { implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.3.3") - testImplementation(kotlin("test")) } @@ -40,39 +39,33 @@ gradlePlugin { } publishing { - repositories { - mavenLocal() - - var githubPackagesToken = System.getenv("GITHUB_TOKEN") - if (githubPackagesToken == null) { - githubPackagesToken = project.findProperty("github.token") as String? - } - - var gitlabPackagesToken = System.getenv("GITLAB_TOKEN") - if (gitlabPackagesToken == null) { - gitlabPackagesToken = project.findProperty("gitlab.com.accessToken") as String? - } + repositories { + mavenLocal() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/gaypizzaspecifications/drywall") - credentials { - username = project.findProperty("github.username") as String? ?: "gaypizzaspecifications" - password = githubPackagesToken - } - } + val githubPackagesToken = System.getenv("GITHUB_TOKEN") + ?: project.findProperty("github.token") as String? + val gitlabPackagesToken = System.getenv("GITLAB_TOKEN") + ?: project.findProperty("gitlab.com.accessToken") as String? - maven { - name = "GitLab" - url = uri("https://gitlab.com/api/v4/projects/47347654/packages/maven") - credentials(HttpHeaderCredentials::class.java) { - name = "Private-Token" - value = gitlabPackagesToken - } + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/gaypizzaspecifications/drywall") + credentials { + username = project.findProperty("github.username") as String? ?: "gaypizzaspecifications" + password = githubPackagesToken + } + } - authentication { - create("header") - } - } - } + maven { + name = "GitLab" + url = uri("https://gitlab.com/api/v4/projects/47347654/packages/maven") + credentials(HttpHeaderCredentials::class.java) { + name = "Private-Token" + value = gitlabPackagesToken + } + authentication { + create("header") + } + } + } }