Skip to content

Commit cc8e5fc

Browse files
committed
feat: support projectmatrix and support better crossbuilding
extend welcome message based on build settings add checkMima task and add to lint command support custom jdk distributions in ci job
1 parent 3fe9f88 commit cc8e5fc

File tree

28 files changed

+2082
-399
lines changed

28 files changed

+2082
-399
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: README.md

+213-23
Large diffs are not rendered by default.

Diff for: build.sbt

+36-6
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ 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
),
19+
checkMima / skip := true,
1920
ciEnabledBranches := Seq("main")
2021
)
2122
)
@@ -27,13 +28,27 @@ lazy val root = project
2728
publish / skip := true
2829
)
2930
.aggregate(
31+
`zio-sbt-shared`,
3032
`zio-sbt-githubactions`,
3133
`zio-sbt-website`,
34+
`zio-sbt-project`,
3235
`zio-sbt-ecosystem`,
3336
`zio-sbt-ci`,
3437
`zio-sbt-tests`
3538
)
36-
.enablePlugins(ZioSbtCiPlugin)
39+
40+
lazy val `zio-sbt-shared` =
41+
project
42+
.settings(stdSettings())
43+
.settings(
44+
headerEndYear := Some(2024),
45+
scriptedLaunchOpts := {
46+
scriptedLaunchOpts.value ++
47+
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
48+
},
49+
scriptedBufferLog := false
50+
)
51+
.enablePlugins(SbtPlugin)
3752

3853
lazy val `zio-sbt-tests` =
3954
project
@@ -56,6 +71,20 @@ lazy val `zio-sbt-website` =
5671
)
5772
.enablePlugins(SbtPlugin)
5873

74+
lazy val `zio-sbt-project` =
75+
project
76+
.settings(stdSettings())
77+
.settings(
78+
headerEndYear := Some(2024),
79+
scriptedLaunchOpts := {
80+
scriptedLaunchOpts.value ++
81+
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
82+
},
83+
scriptedBufferLog := false
84+
)
85+
.enablePlugins(SbtPlugin)
86+
.dependsOn(`zio-sbt-shared`)
87+
5988
lazy val `zio-sbt-ecosystem` =
6089
project
6190
.settings(stdSettings())
@@ -68,6 +97,7 @@ lazy val `zio-sbt-ecosystem` =
6897
scriptedBufferLog := false
6998
)
7099
.enablePlugins(SbtPlugin)
100+
.dependsOn(`zio-sbt-project`)
71101

72102
lazy val `zio-sbt-ci` =
73103
project
@@ -81,7 +111,7 @@ lazy val `zio-sbt-ci` =
81111
scriptedBufferLog := false
82112
)
83113
.enablePlugins(SbtPlugin)
84-
.dependsOn(`zio-sbt-githubactions`)
114+
.dependsOn(`zio-sbt-githubactions`, `zio-sbt-project`)
85115

86116
lazy val `zio-sbt-githubactions` =
87117
project

0 commit comments

Comments
 (0)