Skip to content

Commit

Permalink
Merge pull request scalamacros#98 from xeno-by/master
Browse files Browse the repository at this point in the history
get rid of roles
  • Loading branch information
xeno-by authored Oct 19, 2016
2 parents 38070ac + 6e0067b commit e509043
Show file tree
Hide file tree
Showing 16 changed files with 1,322 additions and 1,447 deletions.
2 changes: 1 addition & 1 deletion .drone.sec
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.Zgu6kmNyJOQXwjmKqMJlUUV3ldfv6-QhsLV1fothBSnmEubNofJG91Okvb0uL19zJtlOxiphpzLAejz9OhyEsEvtui5Rpdp46RF_UOen8-EZbP4FL5muDqNGqJKkncOE46PiXmQObTNEV4Vfgrz8KjG9_8UswApkoOXaYeAxoRAWn-TK0tldpl5zb7BSpd0IcwoG4trTzhLgRL-QX1pJv2Na0rQ-UU7bjKn3SnOIJyj_33QKZvhTje1nzy1RPtrxnlVynwydZJLmBYwVlTIuGB8y9gpVsE-DmyL0KISRuSIoD-G89WfA3YwMrePIsLXinOwUv327gwZPjJy4XJMoZw.tfOdUCLGV3-GB2vq.o72w7HjYca42hu4cJi3q3ybap_gGzZiuE5XjhHRnsLsaZ3GsnVMgvxdFycE0Z1ye7riuv3R8Ye7oTqg22IKrkjdSr_F5bD9Oz_CI1YNHTY72n82braMD4glZUU09Lm46XFIGBAdsInYlHMiE7jz9QG4ttsj7nFbIvR99I_v16KKYi9OFFtl5q53mtW7GG2ob5JV0fglVIU1hqS26-6j0jy0TWEgxfz8F0oHsxrjowUec.E5Z6EH2-j7UL_s0NJ_o8RQ
eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.dIIZHpAI8RR6iZukVmTJD-_NU2tHa74zSX2rV4Bk0Tb-kVFVT6XeK4ehqAHEBmkoP6gFMh3_Fl6XcyHJVEvw1LyJG4aWU6bKfeJ3gf-7xCWlVvsRdpSHFKSrcqeo3g7FKHlY-YPmPDQLO-eTi8c9KQqlPKLey6IAPSCSDpUsyVeUEZNtfpeIujUYE71B150GMZSOhOqw0nXiZPfNi_jBTszYnJAItWkn6Vl0OKMDMfZHSo-JH4MjHQ2EB2R0v1SzEK_kIV8WAYPsyP8ElfVO07v2k7vpR_NLEpurFkmzfGJ-jRvAD068iT7xYWQHQb7LAkWDwRgHOB2_mEhrwzqxJQ.aGw9B2zobQh29ydl.iQd-u6HdaigSV5yF3rxF2pkFw9FlLzRO2VqhxAbwPyAWnATZ6_TOuV_R75Zg4DsGYDsWVBCqLUMUKUHbUv32ntGkcMYXyvkNXbpxbYspqz9HA0MpbDNXFABd8DyfVaHpYJf1UfAb9yZcUKhGT_8OAi-5kq0-RysdX9_OMBf1EenDmQAeqZJtvXjZ5kpkujsfD5GKI8_oAnZze4xUR77FBZ3dT4uoPyjz82Ashojpxw0T.2nm-7QruXMF0Fv5GICLuHw
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build:
environment:
- COURSIER_CACHE=/drone/cache/coursier
commands:
- ./bin/scalafmt --dir /drone/cache/scalafmt --version 0.4.5 --test
- ./bin/scalafmt --dir /drone/cache/scalafmt --version 0.4.7 --test
- sbt -Dsbt.ivy.home=/drone/cache/ivy2 clean test
publish:
image: olafurpg/scalafix:0.0.1
Expand All @@ -18,4 +18,4 @@ build:
branch: [master, 4.x]
cache:
mount:
- /drone/cache
- /drone/cache
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lazy val ScalaVersions = Seq("2.11.8")
lazy val MetaVersion = "1.3.0.521"
lazy val MetaVersion = "1.3.0.522"
lazy val LibraryVersion = "3.0.0-SNAPSHOT"
lazy val isSnapshot = LibraryVersion.endsWith("SNAPSHOT")
lazy val PRVersion = latestPullRequestVersion()
Expand Down Expand Up @@ -53,7 +53,7 @@ def exposePaths(projectName: String, config: Configuration) = {
def uncapitalize(s: String) =
if (s.length == 0) ""
else { val chars = s.toCharArray; chars(0) = chars(0).toLower; new String(chars) }
val prefix = "sbt.paths." + projectName + "." + uncapitalize(config.name) + "."
val prefix = "sbt.paths." + projectName + "." + uncapitalize(config.name) + "."
Seq(
sourceDirectory in config := {
val defaultValue = (sourceDirectory in config).value
Expand Down
Loading

0 comments on commit e509043

Please sign in to comment.