Apply new CI publishing

Author: andreaTP

.circleci/config.yml

@@ -18,20 +18,6 @@ references:
     - image: codacy/ci-aws:3.0.2
     working_directory: ~/workdir/.aws
 
-  setup_aws_credentials: &setup_aws_credentials
-    run:
-      name: Setup AWS Credentials
-      command: |
-        mkdir -p ~/.aws && touch ~/.aws/credentials
-        cat >> ~/.aws/credentials << EOF
-        [default]
-        aws_access_key_id=$ACCESS_KEY_ID
-        aws_secret_access_key=$SECRET_ACCESS_KEY
-        [integration]
-        source_profile = default
-        role_arn = arn:aws:iam::$AWS_ACCOUNT_ID_INTEGRATION:role/$CONTINUOUS_DELIVERY_ROLE
-        region=eu-west-1
-
   restore_sbt_cache: &restore_sbt_cache
     restore_cache:
       keys:
@@ -56,21 +42,102 @@ references:
       - "~/.m2"
 
 jobs:
-  test:
+  checkout_and_version:
+    docker:
+      - image: codacy/git-version:latest
+    working_directory: ~/workdir
+    steps:
+      - checkout
+      - run:
+          name: Set version
+          command: /bin/git-version > .version
+      - run:
+          name: Set Sbt version
+          command: echo "version in ThisBuild := \"$(cat .version)\"" > version.sbt
+      - run:
+          name: Current version
+          command: cat .version
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - workdir/*
+
+  populate_cache:
+    <<: *default_sbt_job
+    steps:
+      - attach_workspace:
+          at: ~/
+      - *restore_sbt_cache
+      - run:
+          name: Safely populate caches
+          command: sbt ";set scalafmtUseIvy in ThisBuild := false;update"
+      - *clean_sbt_cache
+      - *save_sbt_cache
+
+  compile_and_test:
     <<: *default_sbt_job
     steps:
     - attach_workspace:
         at: ~/
     - *restore_sbt_cache
     - run:
-        name: Test
-        command: |
-          sbt +test
+        name: Compile / Test and send coverage results
+        command: sbt ";compile;test:compile;coverage;test;coverageReport;coverageAggregate;codacyCoverage"
+    - *clean_sbt_cache
+    - *save_sbt_cache
+
+  tag_version:
+    <<: *default_sbt_job
+    steps:
+    - attach_workspace:
+        at: ~/
+    - add_ssh_keys:
+        fingerprints:
+          - "df:83:d7:c7:d5:79:06:c2:3b:d1:fd:e2:a3:d1:12:c5"
+    - run:
+        name: Tag
+        command: git tag $(cat .version) && git push --tags
+
+  publish:
+    <<: *default_sbt_job
+    steps:
+      - attach_workspace:
+          at: ~/
+      - *restore_sbt_cache
+      - run:
+          name: Publish to sonatype
+          command: sbt ";clean;retrieveGPGKeys;+publishSigned;sonatypeReleaseAll"
 
 workflows:
   version: 2
   compile_deploy:
     jobs:
-    - test:
+      - checkout_and_version
+    - populate_cache:
+        requires:
+        - checkout_and_version
+    - checkfmt:
+        requires:
+        - populate_cache
+    - compile_and_test:
+        requires:
+        - populate_cache
+    - publish:
+        filters:
+          branches:
+            only:
+            - master
+            - newCI
+        context: CodacyAWS
+        requires:
+        - compile_and_test
+        - checkfmt
+    - tag_version:
+        filters:
+          branches:
+            only:
+            - master
+            - newCI
         context: CodacyAWS
-        requires:
+        requires:
+        - publish

build.sbt

@@ -1,22 +1,20 @@
-import Dependencies._
+import codacy.libs._
 
 import scala.io.Source
 import scala.util.parsing.json.JSON
 
 name := """bitbucket-scala-client"""
 
-version := "1.9.0-SNAPSHOT"
-
 scalaVersion := "2.11.12"
 
 scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-Ywarn-adapted-args", "-Xlint")
 
 resolvers += "Typesafe maven repository" at "http://repo.typesafe.com/typesafe/maven-releases/"
 
 libraryDependencies ++= Seq(
-  Dependencies.playWS,
-  Dependencies.playJson,
-  Dependencies.scalaTest
+  playWs,
+  playJson,
+  scalatest % Test
 )
 
 mimaPreviousArtifacts := {
@@ -32,33 +30,14 @@ val ignoredABIProblems = {
   Seq()
 }
 
-organization := "com.codacy"
-
 organizationName := "Codacy"
 
 organizationHomepage := Some(new URL("https://www.codacy.com"))
 
-publishMavenStyle := true
-
-publishArtifact in Test := false
-
-pomIncludeRepository := { _ => false }
-
-publishTo := sonatypePublishTo.value
-
-//Credentials for sonatype
-credentials += Credentials(
-  "Sonatype Nexus Repository Manager",
-  "oss.sonatype.org",
-  sys.env.getOrElse("SONATYPE_USER", "username"),
-  sys.env.getOrElse("SONATYPE_PASSWORD", "password"))
-
 startYear := Some(2014)
 
 description := "Bitbucket Scala Client"
 
-licenses := Seq("The Apache Software License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
-
 homepage := Some(url("https://github.com/codacy/bitbucket-scala-client.git"))
 
 pomExtra :=
@@ -75,3 +54,7 @@ pomExtra :=
         <url>https://github.com/rtfpessoa</url>
       </developer>
     </developers>
+
+resolvers ~= { _.filterNot(_.name.toLowerCase.contains("codacy")) }
+
+publicMvnPublish

project/Dependencies.scala

@@ -1,7 +1,5 @@
-import sbt._
+resolvers += Resolver.jcenterRepo
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
-
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
+addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "13.0.2")