From 78761dba8e7866e86742a1c22b53168d9089d86a Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sun, 14 Jan 2024 15:23:22 -0700 Subject: [PATCH] Remove mavenLocal() --- .github/workflows/build.yml | 28 ++++++++++++++-------------- settings.gradle.kts | 9 --------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23a25d48..27448a45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,17 +29,17 @@ jobs: else echo "STATUS=release" >> $GITHUB_ENV fi - - name: Publish Snapshot - if: "${{ env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}" - run: ./gradlew publish - env: - ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}" - ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}" - - name: Publish Release - if: "${{ env.STATUS == 'release' && github.event_name == 'release' }}" - run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository - env: - ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}" - ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}" - ORG_GRADLE_PROJECT_signingKey: "${{ secrets.SIGNING_KEY }}" - ORG_GRADLE_PROJECT_signingPassword: "${{ secrets.SIGNING_PASSWORD }}" + #- name: Publish Snapshot + # if: "${{ env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}" + # run: ./gradlew publish + # env: + # ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}" + # ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}" + #- name: Publish Release + # if: "${{ env.STATUS == 'release' && github.event_name == 'release' }}" + # run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository + # env: + # ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}" + # ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}" + # ORG_GRADLE_PROJECT_signingKey: "${{ secrets.SIGNING_KEY }}" + # ORG_GRADLE_PROJECT_signingPassword: "${{ secrets.SIGNING_PASSWORD }}" diff --git a/settings.gradle.kts b/settings.gradle.kts index 1e95761b..c0b87c1f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,15 +11,6 @@ plugins { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - // TODO temporary - mavenLocal { - mavenContent { - includeGroup("cloud.commandframework") - includeGroup("org.incendo") - snapshotsOnly() - } - } - mavenCentral() maven("https://oss.sonatype.org/content/repositories/snapshots/") { name = "sonatypeOssSnapshots"