diff --git a/DEV.md b/DEV.md index 9069178..85516b3 100644 --- a/DEV.md +++ b/DEV.md @@ -13,15 +13,21 @@ scala-cli compile examples\scala-cli # for local dev/test ./mill __.publishLocal +``` -git diff -git commit -am "msg" +```sh -$VERSION="0.7.5" -git commit --allow-empty -m "Release $VERSION" +# RELEASE +$VERSION="x.y.z" +git commit --allow-empty -am "Release $VERSION" git tag -a $VERSION -m "Release $VERSION" -git push --atomic origin main $VERSION +git push --atomic origin main --tags + +# prepare for NEXT version +# bump publishVersion to x.y.z-SNAPSHOT +$VERSION="x.y.z-SNAPSHOT" +git commit -am"Bump version to $VERSION" ``` diff --git a/build.sc b/build.mill similarity index 91% rename from build.sc rename to build.mill index be12f8d..ac509e9 100644 --- a/build.sc +++ b/build.mill @@ -1,9 +1,11 @@ -import $ivy.`io.chris-kipp::mill-ci-release::0.1.10` -import $ivy.`ba.sake::mill-hepek::0.0.2` +package build + +import $ivy.`com.lihaoyi::mill-contrib-sonatypecentral:` +import $ivy.`ba.sake::mill-hepek::0.1.0` import mill._ import mill.scalalib._, scalafmt._, publish._ -import io.kipp.mill.ci.release.CiReleaseModule +import mill.contrib.sonatypecentral.SonatypeCentralPublishModule import ba.sake.millhepek.MillHepekModule object sharaf extends SharafPublishModule { @@ -66,7 +68,9 @@ object validson extends SharafPublishModule { object test extends ScalaTests with SharafTestModule } -trait SharafPublishModule extends SharafCommonModule with CiReleaseModule { +trait SharafPublishModule extends SharafCommonModule with SonatypeCentralPublishModule { + + def publishVersion = "0.8.0-SNAPSHOT" def pomSettings = PomSettings( organization = "ba.sake", diff --git a/docs/src/utils/ScalaCliFiles.scala b/docs/src/utils/ScalaCliFiles.scala index 176cc52..dbc0295 100644 --- a/docs/src/utils/ScalaCliFiles.scala +++ b/docs/src/utils/ScalaCliFiles.scala @@ -33,4 +33,6 @@ object ScalaCliFiles: val validation = get("validation.sc") private def get(chunk: os.PathChunk) = - os.read(os.pwd / "examples" / "scala-cli" / chunk) + // os.pwd is sandboxed, this is called from plugin ! + val wd = os.Path(System.getenv("MILL_WORKSPACE_ROOT")) + os.read(wd / "examples" / "scala-cli" / chunk)