Skip to content

Commit 0f3864a

Browse files
SethTisueSethTisue
authored
more Haoyiverse! add upickle + requests-scala + castor (#1324)
1 parent fa3ad60 commit 0f3864a

File tree

10 files changed

+86
-35
lines changed

10 files changed

+86
-35
lines changed

‎community.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ include "proj/boopickle.conf"
177177
include "proj/breeze.conf"
178178
include "proj/cachecontrol.conf"
179179
include "proj/case-app.conf"
180+
include "proj/castor.conf"
180181
include "proj/cats-effect-testing.conf"
181182
include "proj/cats-effect-tutorial.conf"
182183
include "proj/cats-effect.conf"
@@ -257,6 +258,7 @@ include "proj/metaconfig.conf"
257258
include "proj/metrics-scala.conf"
258259
include "proj/minitest.conf"
259260
include "proj/mockito-scala.conf"
261+
include "proj/moduload.conf"
260262
include "proj/monix-bio.conf"
261263
include "proj/monix-nio.conf"
262264
include "proj/monix.conf"
@@ -288,6 +290,7 @@ include "proj/reactive-mongo.conf"
288290
include "proj/reactive-mongo-bson.conf"
289291
include "proj/redis4cats.conf"
290292
include "proj/refined.conf"
293+
include "proj/requests-scala.conf"
291294
include "proj/runtime-scaladoc-reader.conf"
292295
include "proj/sbinary.conf"
293296
include "proj/sbt-io.conf"
@@ -380,6 +383,7 @@ include "proj/twotails.conf"
380383
include "proj/typename.conf"
381384
include "proj/unfiltered.conf"
382385
include "proj/unique.conf"
386+
include "proj/upickle.conf"
383387
include "proj/utest.conf"
384388
include "proj/vault.conf"
385389
include "proj/verify.conf"

‎dependencies.txt

Lines changed: 18 additions & 13 deletions
Large diffs are not rendered by default.

‎proj/castor.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// https://github.com/scalacommunitybuild/castor.git#community-build-2.13 # was lihaoyi, master
2+
3+
vars.proj.castor: ${vars.base} {
4+
name: "castor"
5+
uri: "https://github.com/scalacommunitybuild/castor.git#a0d47381db2466a744a63061fbf53defc55ebc24"
6+
7+
}

‎proj/metaconfig.conf

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
// https://github.com/olafurpg/metaconfig.git#master
1+
// https://github.com/scalacommunitybuild/metaconfig.git#community-build-2.13 # was olafurpg, master
2+
3+
// forked (December 2020) to be compatible with current upickle/ujson. didn't bother PRing it upstream
4+
// since the repo hasn't been touched in a while. also because not all tests pass (filtered below), and
5+
// trying to fix it turned into a time sink
26

37
vars.proj.metaconfig: ${vars.base} {
48
name: "metaconfig"
5-
uri: "https://github.com/olafurpg/metaconfig.git#aaab8feb0d7b22f6ae78dda3f291839537e2006b"
9+
uri: "https://github.com/scalacommunitybuild/metaconfig.git#99020fd1c366e017979af1c76b548064802149e5"
610

711
extra.exclude: ["docs", "*JS"]
812
// I guess dbuild is getting confused by the extra _1.14
@@ -12,6 +16,9 @@ vars.proj.metaconfig: ${vars.base} {
1216
]
1317
check-missing: false
1418
extra.settings: ${vars.base.extra.settings} [
15-
"conflictWarning in ThisBuild := ConflictWarning.disable"
19+
"ThisBuild / conflictWarning := ConflictWarning.disable"
20+
]
21+
extra.commands: ${vars.default-commands} [
22+
"""set testsJVM / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "JsonConfParserSuite.scala""""
1623
]
1724
}

‎proj/moduload.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// https://github.com/outr/moduload.git#master
2+
3+
vars.proj.moduload: ${vars.base} {
4+
name: "moduload"
5+
uri: "https://github.com/outr/moduload.git#409a968eff560a8aa40c7130683e06367ab2b0be"
6+
7+
}

‎proj/requests-scala.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// https://github.com/scalacommunitybuild/requests-scala.git#community-build-2.13 # was lihaoyi, master
2+
3+
// forked to add sbt build (instead of mill)
4+
5+
vars.proj.requests-scala: ${vars.base} {
6+
name: "requests-scala"
7+
uri: "https://github.com/scalacommunitybuild/requests-scala.git#9bc9c132588726d711fb6c95e1e84f0dcd685db1"
8+
9+
}

‎proj/scribe.conf

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
// https://github.com/outr/scribe.git#fdc7b430755d71b7e2533aa2e27da4246eb616ff # was master
2-
3-
// frozen (November 2020) at known-green commit before they moved to
4-
// a source-incompatible version of sourcecode. at some point we may want
5-
// to move to the newer sourcecode, but we don't need to do it now.
6-
// (upgrading Haoyi-world takes some work, since we're using forks
7-
// that have sbt builds)
1+
// https://github.com/outr/scribe.git#master
82

93
vars.proj.scribe: ${vars.base} {
104
name: "scribe"
11-
uri: "https://github.com/outr/scribe.git#fdc7b430755d71b7e2533aa2e27da4246eb616ff"
5+
uri: "https://github.com/outr/scribe.git#83da5bbf7817c6b328c3b612b4d666c54cd39f6f"
126

13-
extra.projects: ["coreJVM", "macrosJVM", "slf4j"]
7+
extra.projects: ["coreJVM", "slf4j"]
148
extra.commands: ${vars.default-commands} [
159
// intermittently failing test I haven't gotten around to reporting upstream
1610
"set excludeFilter in (Test, unmanagedSources) in coreJVM := HiddenFileFilter || \"FileLoggingSpec.scala\""

‎proj/sourcecode.conf

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
// https://github.com/scalacommunitybuild/sourcecode.git#community-build-2.13 # was lihaoyi, master
22

3-
// frozen (June 2019) at April 2019 commit just before sbt->mill move
4-
// and then forked (May 2020) from that freeze point because Symbol#toString changed
5-
// and also (October 2020) to bump the sbt-osgi version, for JDK 15 compat
3+
// forked (December 2020) to add sbt build (instead of mill)
64

75
vars.proj.sourcecode: ${vars.base} {
86
name: "sourcecode"
9-
uri: "https://github.com/scalacommunitybuild/sourcecode.git#e0f432b63089ea2972927e2124342c401e06c288"
7+
uri: "https://github.com/scalacommunitybuild/sourcecode.git#286c5c21b77b36d131819207fcfd1e698faf3d1f"
108

11-
// no Scala.js plz
12-
extra.projects: ["sourcecodeJVM"]
13-
extra.settings: ${vars.base.extra.settings} [
14-
// I don't know why, but without overriding this, dbuild chokes with a scala.MatchError
15-
"""version := "0.0.0""""
16-
]
179
}

‎proj/upickle.conf

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// https://github.com/scalacommunitybuild/upickle.git#community-build-2.13 # was lihaoyi, master
2+
3+
// forked to add sbt build (instead of mill)
4+
5+
vars.proj.upickle: ${vars.base} {
6+
name: "upickle"
7+
uri: "https://github.com/scalacommunitybuild/upickle.git#f31d6712602af7c3dcd6e21eda94914417dee101"
8+
9+
extra.projects: ["core", "implicits", "ujson"]
10+
}
11+
12+
// includes:
13+
// * tests
14+
// * integrations with argonaut, circe, json4s, play-json
15+
16+
vars.proj.upickle-more: ${vars.base} {
17+
name: "upickle-more"
18+
uri: "https://github.com/scalacommunitybuild/upickle.git#f31d6712602af7c3dcd6e21eda94914417dee101"
19+
20+
extra.exclude: ["core", "implicits", "ujson"] // already built above
21+
}

‎projs.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ build += {
4242
${vars.proj.breeze}
4343
${vars.proj.cachecontrol}
4444
${vars.proj.case-app}
45+
${vars.proj.castor}
4546
${vars.proj.cats-effect-testing}
4647
${vars.proj.cats-effect-tutorial}
4748
${vars.proj.cats-effect}
@@ -125,6 +126,7 @@ build += {
125126
${vars.proj.metrics-scala}
126127
${vars.proj.minitest}
127128
${vars.proj.mockito-scala}
129+
${vars.proj.moduload}
128130
${vars.proj.monix-bio}
129131
${vars.proj.monix-nio}
130132
${vars.proj.monix}
@@ -159,6 +161,7 @@ build += {
159161
${vars.proj.redis4cats}
160162
${vars.proj.refined-more}
161163
${vars.proj.refined}
164+
${vars.proj.requests-scala}
162165
${vars.proj.runtime-scaladoc-reader}
163166
${vars.proj.sbinary}
164167
${vars.proj.sbt-collections}
@@ -264,6 +267,8 @@ build += {
264267
${vars.proj.typename}
265268
${vars.proj.unfiltered}
266269
${vars.proj.unique}
270+
${vars.proj.upickle}
271+
${vars.proj.upickle-more}
267272
${vars.proj.utest}
268273
${vars.proj.vault}
269274
${vars.proj.verify}

0 commit comments

Comments
 (0)