Skip to content

Commit 36f8dcf

Browse files
committed
feat: support projectmatrix and support better crossbuilding
1 parent 97f3900 commit 36f8dcf

File tree

32 files changed

+2102
-433
lines changed

32 files changed

+2102
-433
lines changed

Diff for: .github/workflows/ci.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
- name: Cache Dependencies
4040
uses: coursier/cache-action@v6
4141
- name: Check all code compiles
42-
run: sbt +Test/compile
42+
run: sbt Test/compile
4343
- name: Check artifacts build process
44-
run: sbt +publishLocal
44+
run: sbt publishLocal
4545
- name: Check website build process
4646
run: sbt docs/clean; sbt docs/buildWebsite
4747
lint:
@@ -94,7 +94,7 @@ jobs:
9494
with:
9595
fetch-depth: '0'
9696
- name: Test
97-
run: sbt +test
97+
run: sbt test
9898
update-readme:
9999
name: Update README
100100
runs-on: ubuntu-latest
@@ -196,6 +196,8 @@ jobs:
196196
PGP_SECRET: ${{ secrets.PGP_SECRET }}
197197
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
198198
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
199+
CI_RELEASE: publishSigned
200+
CI_SNAPSHOT_RELEASE: publish
199201
release-docs:
200202
name: Release Docs
201203
runs-on: ubuntu-latest

Diff for: .sbtopts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Dsbt.io.implicit.relative.glob.conversion=allow

Diff for: README.md

+218-28
Large diffs are not rendered by default.

Diff for: build.sbt

+35-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ addCommandAlias("test", "scripted")
99

1010
inThisBuild(
1111
List(
12-
name := "ZIO SBT",
13-
startYear := Some(2022),
14-
scalaVersion := Scala212,
15-
crossScalaVersions := Seq(scalaVersion.value),
12+
name := "ZIO SBT",
13+
startYear := Some(2022),
14+
scalaVersion := Scala212,
15+
defaultCrossScalaVersions := Seq(Scala212),
1616
developers := List(
1717
Developer("khajavi", "Milad Khajavi", "[email protected]", url("https://github.com/khajavi"))
1818
),
@@ -27,13 +27,27 @@ lazy val root = project
2727
publish / skip := true
2828
)
2929
.aggregate(
30+
`zio-sbt-shared`,
3031
`zio-sbt-githubactions`,
3132
`zio-sbt-website`,
33+
`zio-sbt-project`,
3234
`zio-sbt-ecosystem`,
3335
`zio-sbt-ci`,
3436
`zio-sbt-tests`
3537
)
36-
.enablePlugins(ZioSbtCiPlugin)
38+
39+
lazy val `zio-sbt-shared` =
40+
project
41+
.settings(stdSettings())
42+
.settings(
43+
headerEndYear := Some(2024),
44+
scriptedLaunchOpts := {
45+
scriptedLaunchOpts.value ++
46+
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
47+
},
48+
scriptedBufferLog := false
49+
)
50+
.enablePlugins(SbtPlugin)
3751

3852
lazy val `zio-sbt-tests` =
3953
project
@@ -56,6 +70,20 @@ lazy val `zio-sbt-website` =
5670
)
5771
.enablePlugins(SbtPlugin)
5872

73+
lazy val `zio-sbt-project` =
74+
project
75+
.settings(stdSettings())
76+
.settings(
77+
headerEndYear := Some(2024),
78+
scriptedLaunchOpts := {
79+
scriptedLaunchOpts.value ++
80+
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
81+
},
82+
scriptedBufferLog := false
83+
)
84+
.enablePlugins(SbtPlugin)
85+
.dependsOn(`zio-sbt-shared`)
86+
5987
lazy val `zio-sbt-ecosystem` =
6088
project
6189
.settings(stdSettings())
@@ -68,6 +96,7 @@ lazy val `zio-sbt-ecosystem` =
6896
scriptedBufferLog := false
6997
)
7098
.enablePlugins(SbtPlugin)
99+
.dependsOn(`zio-sbt-project`)
71100

72101
lazy val `zio-sbt-ci` =
73102
project
@@ -81,7 +110,7 @@ lazy val `zio-sbt-ci` =
81110
scriptedBufferLog := false
82111
)
83112
.enablePlugins(SbtPlugin)
84-
.dependsOn(`zio-sbt-githubactions`)
113+
.dependsOn(`zio-sbt-githubactions`, `zio-sbt-project`)
85114

86115
lazy val `zio-sbt-githubactions` =
87116
project

0 commit comments

Comments
 (0)