From c7fd0943fe87d71f3e551a758afed46aaeb24c74 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 13 Mar 2024 16:09:29 +0100 Subject: [PATCH] Fix publishing (#18) * move version/group setting to gradle.properties, publish all necessary artifacts * We dont need the : --------- Co-authored-by: rtm516 --- .github/workflows/build.yml | 2 +- .../src/main/kotlin/pack.publish-conventions.gradle.kts | 2 +- build.gradle.kts | 4 +--- gradle.properties | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 gradle.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b43363d..fcf1455 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,4 +54,4 @@ jobs: OPENCOLLAB_USERNAME: ${{ vars.DEPLOY_USER }} OPENCOLLAB_PASSWORD: ${{ secrets.DEPLOY_PASS }} with: - arguments: :converter:publish + arguments: publish diff --git a/build-logic/src/main/kotlin/pack.publish-conventions.gradle.kts b/build-logic/src/main/kotlin/pack.publish-conventions.gradle.kts index 60c3e34..cf471d3 100644 --- a/build-logic/src/main/kotlin/pack.publish-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/pack.publish-conventions.gradle.kts @@ -5,7 +5,7 @@ plugins { publishing { repositories { - val repoName = if (version.toString().endsWith("SNAPSHOT")) "maven-snapshots" else "maven-releases" + val repoName = if (project.version.toString().endsWith("SNAPSHOT")) "maven-snapshots" else "maven-releases" maven("https://repo.opencollab.dev/${repoName}/") { credentials.username = System.getenv("OPENCOLLAB_USERNAME") credentials.password = System.getenv("OPENCOLLAB_PASSWORD") diff --git a/build.gradle.kts b/build.gradle.kts index 30dc978..82b708e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,11 +2,9 @@ plugins { id("pack.base-conventions") } -subprojects{ +subprojects { plugins.apply("pack.base-conventions") plugins.apply("pack.publish-conventions") - group = "org.geysermc.pack" - version = "3.1-SNAPSHOT" java.sourceCompatibility = JavaVersion.VERSION_17 java.targetCompatibility = JavaVersion.VERSION_17 diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..b308af7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +group = org.geysermc.pack +version = 3.1-SNAPSHOT \ No newline at end of file