Skip to content

Commit ff21452

Browse files
authored
Merge pull request #200 from ThoughtWorksInc/no-useCoursier
Don't use coursier
2 parents 5bbf57f + 34aa67f commit ff21452

File tree

10 files changed

+53
-50
lines changed

10 files changed

+53
-50
lines changed

.scalafmt.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
version = "1.5.1"
12
maxColumn = 120

.travis.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ addons:
77

88
language: scala
99

10+
scala:
11+
- 2.11.12
12+
- 2.12.4
13+
1014
jdk:
11-
- oraclejdk8
15+
- openjdk8
1216

1317
before_install:
1418
- wget --quiet --output-document=/tmp/AMD-SDK.tar.bz2 http://cs.wisc.edu/~riccardo/assets/AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2
@@ -22,7 +26,7 @@ before_install:
2226
- export LD_LIBRARY_PATH=${AMDAPPSDK}/lib/x86_64/sdk:${LD_LIBRARY_PATH}
2327
- chmod +x ${AMDAPPSDK}/bin/x86_64/clinfo
2428
- ${AMDAPPSDK}/bin/x86_64/clinfo
25-
29+
2630
before_cache:
2731
- find $HOME/.sbt -name '*.lock' -delete
2832
- find $HOME/.ivy2 -name 'ivydata-*.properties' -delete
@@ -31,18 +35,16 @@ cache:
3135
directories:
3236
- $HOME/.ivy2/cache
3337
- $HOME/.sbt/boot/
38+
- $HOME/.coursier/
3439

3540
before_script:
3641

37-
script:
38-
- sbt +test
39-
4042
before_deploy:
4143

4244
deploy:
43-
skip_cleanup: true
44-
provider: script
45-
script: sbt "release with-defaults"
46-
on:
47-
condition: -e ./deploy.sbt
48-
all_branches: true
45+
- provider: script
46+
script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease
47+
skip_cleanup: true
48+
on:
49+
all_branches: true
50+
condition: $GITHUB_PERSONAL_ACCESS_TOKEN

build.sbt

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,9 @@ lazy val gpu = project.dependsOn(Tensors)
2020

2121
lazy val cpu = project.dependsOn(Tensors)
2222

23-
val defaultCrossTypeLevelScalaVersions = Seq(
24-
// "2.12.4-bin-typelevel-4" // Disabled due to https://github.com/typelevel/scala/issues/176
25-
)
26-
val crossLightbendScalaVersions = Seq("2.11.12", "2.12.4")
27-
28-
crossScalaVersions in ThisBuild := {
29-
crossLightbendScalaVersions ++
30-
(SettingKey[Seq[String]]("cross-typelevel-scala-versions") in ThisBuild)
31-
.??(defaultCrossTypeLevelScalaVersions)
32-
.value
33-
}
34-
35-
publishArtifact := false
23+
publish / skip := true
3624

37-
enablePlugins(StandaloneUnidoc, TravisUnidocTitle)
25+
enablePlugins(ScalaUnidocPlugin)
3826

3927
unidocProjectFilter in ScalaUnidoc in unidoc := inAggregates(LocalRootProject)
4028

@@ -53,3 +41,5 @@ scalacOptions in ThisBuild ++= {
5341
None
5442
}
5543
}
44+
45+
ThisBuild / useCoursier := false

cpu/build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.2.2" % Optional).jar().classi
2323
}
2424
}
2525

26-
fork := true
26+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test
27+
28+
fork := true

deploy.sbt.disabled

Lines changed: 0 additions & 20 deletions
This file was deleted.

gpu/build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.2.2" % Optional).jar().classi
2121
}
2222
}
2323

24-
fork := true
24+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test
25+
26+
fork := true

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.8
1+
sbt.version=1.3.2

project/plugins.sbt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.2.0")
1+
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1")
2+
3+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
4+
5+
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
6+
7+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
8+
9+
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
210

311
addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1")
412

secret.sbt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
lazy val secret = {
2+
for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) yield {
3+
val secret = project.settings(publish / skip := true).in {
4+
val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
5+
IO.delete(secretDirectory)
6+
org.eclipse.jgit.api.Git
7+
.cloneRepository()
8+
.setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git")
9+
.setDirectory(secretDirectory)
10+
.setCredentialsProvider(
11+
new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "")
12+
)
13+
.call()
14+
.close()
15+
secretDirectory
16+
}
17+
secret
18+
}
19+
}.getOrElse(null)

version.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)