Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

Release 0.6.3 #519

Merged
merged 1 commit into from
Sep 14, 2017
Merged

Release 0.6.3 #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,14 @@ after_success:
if grep -q "SNAPSHOT" version.sbt; then
sbt ^^$SBT_VERSION publish;
else
sbt ^^$SBT_VERSION release;
if [ "$SBT_VERSION" = "1.0.1" ]; then
sbt ^^$SBT_VERSION orgUpdateDocFiles;
git reset --hard HEAD;
git clean -f;
git checkout master;
git pull origin master;
sbt ^^$SBT_VERSION release;
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we releasing only for1.0.1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a temporary guard band to only run release for 1 of the builds. orgAfterCISuccess needs to reworked a little bit to allow cross sbt publishing.

"^ publishSigned" in releaseProcess publishes for both sbt 1.0 and sbt 0.13
https://github.com/47deg/sbt-org-policies/blob/master/src/main/scala/sbtorgpolicies/settings/AllSettings.scala#L85

fi
fi
- sbt ^^$SBT_VERSION publishLocal
Expand Down
3 changes: 1 addition & 2 deletions autocheck/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ lazy val `org-policies-auto-dep-check` = (project in file("."))
getEnvVarOrElse("TRAVIS_PULL_REQUEST") == "false"

if (isTravisMaster && currentPluginVersion.isDefined)
// Def.task(depUpdateDependencyIssues.value)
Def.task()
Def.task(depUpdateDependencyIssues.value)
else
Def.task(streams.value.log.warn("Skipping auto-dependency check"))
}.value
Expand Down
22 changes: 1 addition & 21 deletions project/ProjectPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import sbtorgpolicies.OrgPoliciesPlugin
import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
import sbtorgpolicies.runnable.syntax._
import sbtorgpolicies.templates.badges._
import sbtorgpolicies.model.scalac
import sbtorgpolicies.model.{sbtV, scalac}
import sbtbuildinfo.BuildInfoPlugin.autoImport._

object ProjectPlugin extends AutoPlugin {
Expand All @@ -17,26 +17,6 @@ object ProjectPlugin extends AutoPlugin {

override def trigger: PluginTrigger = allRequirements

object sbtV {
val `0.13`: String = "0.13.16"
val `1.0`: String = "1.0.1"

val crossSbtVersions: List[String] = List(`0.13`, `1.0`)
}

object scalac {

val `2.10`: String = "2.10.6"
val `2.11`: String = "2.11.11"
val `2.12`: String = "2.12.3"
val `2.13`: String = "2.13.0-M1"

val latestScalaVersion: String = `2.12`

val crossScalaVersions: List[String] = List(`2.11`, `2.12`)

}

object autoImport {

lazy val commonSettings: Seq[Def.Setting[_]] = Seq(
Expand Down
2 changes: 0 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
resolvers += Resolver.sonatypeRepo("snapshots")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.3-SNAPSHOT")
// remove after a version of sbt-org-policies is published with sbt-dependencies
addSbtPlugin("com.47deg" % "sbt-dependencies" % "0.2.0")
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.6.3-SNAPSHOT"
version in ThisBuild := "0.6.3"