From 70e290f9039b2ff84982da93817727a011c4c46d Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 27 Jan 2023 15:31:50 -0500 Subject: [PATCH 1/2] remove bintray and add gh-package flow Signed-off-by: Rui Chen --- Makefile | 2 -- README.md | 4 +++- build.sbt | 14 +++----------- project/build.properties | 2 +- project/plugins.sbt | 2 +- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index ef83540..9a7dba7 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,6 @@ package: -v $(CI_WORKDIR):/data \ -v $(CI_IVY_CACHE):/root/.ivy2 \ -v $(CI_SBT_CACHE):/root/.sbt \ - -v $(HOME)/.bintray:/root/.bintray \ -v /var/run/docker.sock:/var/run/docker.sock \ -e VERSION=$(VERSION) \ $(BUILDER_TAG) \ @@ -53,7 +52,6 @@ publish: package -v $(CI_WORKDIR):/data \ -v $(CI_IVY_CACHE):/root/.ivy2 \ -v $(CI_SBT_CACHE):/root/.sbt \ - -v $(HOME)/.bintray:/root/.bintray \ -e VERSION=$(VERSION) \ $(BUILDER_TAG) \ make publish-sbt diff --git a/README.md b/README.md index 3b1cecf..8579508 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Meetup SBT Plugins [![Build Status](https://travis-ci.org/meetup/sbt-plugins.svg?branch=master)](https://travis-ci.org/meetup/sbt-plugins) [ ![Download](https://api.bintray.com/packages/meetup/sbt-plugins/sbt-plugins/images/download.svg) ](https://bintray.com/meetup/sbt-plugins/sbt-plugins/_latestVersion) +# Meetup SBT Plugins + +[![Build Status](https://travis-ci.org/meetup/sbt-plugins.svg?branch=master)](https://travis-ci.org/meetup/sbt-plugins) A base collection of useful SBT settings that many projects should be able to take advantage of. diff --git a/build.sbt b/build.sbt index e38f8b9..c9cc5a0 100644 --- a/build.sbt +++ b/build.sbt @@ -1,21 +1,13 @@ - - - name := "sbt-plugins" scalaVersion := "2.10.6" - sbtPlugin := true addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0") - addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6") - addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") - addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0") - -resolvers += "softprops-maven" at "http://dl.bintray.com/content/softprops/maven" - -bintrayOrganization in ThisBuild := Some("meetup") +ThisBuild / githubOwner := "meetup" +ThisBuild / githubRepository := "meetup" +ThisBuild / githubTokenSource := TokenSource.Environment("GITHUB_TOKEN") diff --git a/project/build.properties b/project/build.properties index 8e682c5..0b2e09c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.18 +sbt.version=1.4.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 486fdad..6ad4d13 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,4 +5,4 @@ resolvers += Resolver.url( addSbtPlugin("com.eed3si9n" % "sbt-dirty-money" % "0.1.0") -addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0") +addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.2") From 4f6a092150828560fc62322a5bfc04687dde7336 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 27 Jan 2023 15:33:58 -0500 Subject: [PATCH 2/2] update workflow name and build badge Signed-off-by: Rui Chen --- .github/workflows/sbt-plugins.yml | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sbt-plugins.yml b/.github/workflows/sbt-plugins.yml index 34a9db5..66a6171 100644 --- a/.github/workflows/sbt-plugins.yml +++ b/.github/workflows/sbt-plugins.yml @@ -1,8 +1,8 @@ -name: Publish artifact +name: main + on: push: - paths: - - '**/**' + jobs: publish: runs-on: ubuntu-latest @@ -23,4 +23,4 @@ jobs: env: GITHUB_USER: ${{ secrets.GH_USER }} GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - run: make publish \ No newline at end of file + run: make publish diff --git a/README.md b/README.md index 8579508..46bb99d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Meetup SBT Plugins -[![Build Status](https://travis-ci.org/meetup/sbt-plugins.svg?branch=master)](https://travis-ci.org/meetup/sbt-plugins) +[![Publish artifact](https://github.com/meetup/sbt-plugins/actions/workflows/sbt-plugins.yml/badge.svg)](https://github.com/meetup/sbt-plugins/actions/workflows/sbt-plugins.yml) A base collection of useful SBT settings that many projects should be able to take advantage of.