.

Author: lihaoyi

.github/workflows/actions.yml

@@ -46,36 +46,23 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     env:
-      SONATYPE_PGP_PRIVATE_KEY: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY }}
-      SONATYPE_PGP_PRIVATE_KEY_PASSWORD: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY_PASSWORD }}
-      SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      MILL_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+      MILL_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      MILL_PGP_SECRET_BASE64: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY }}
+      MILL_PGP_PASSPHRASE: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY_PASSWORD }}
       LANG: "en_US.UTF-8"
       LC_MESSAGES: "en_US.UTF-8"
       LC_ALL: "en_US.UTF-8"
+
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 11
       - name: Publish to Maven Central
-        run: |
-          if [[ $(git tag --points-at HEAD) != '' ]]; then
-            echo $SONATYPE_PGP_PRIVATE_KEY | base64 --decode > gpg_key
-            gpg --import --no-tty --batch --yes gpg_key
-            rm gpg_key
-            ./mill -i mill.scalalib.PublishModule/publishAll \
-              --sonatypeCreds $SONATYPE_USER:$SONATYPE_PASSWORD \
-              --gpgArgs --passphrase=$SONATYPE_PGP_PRIVATE_KEY_PASSWORD,--no-tty,--pinentry-mode,loopback,--batch,--yes,-a,-b \
-              --publishArtifacts __.publishArtifacts \
-              --readTimeout 600000 \
-              --awaitTimeout 600000 \
-              --release true \
-              --signed true
-          fi
+        run: ./mill -i mill.scalalib.SonatypeCentralPublishModule/
+
       - name: Create GitHub Release
         id: create_gh_release
         uses: actions/create-release@v1.1.4

.mill-version

@@ -1,13 +1,13 @@
+//| mill-version: 1.0.0-RC1-24-d74b52
+//| mvnDeps:
+//| - com.github.lolgab::mill-mima_mill1.0.0-RC1:0.2.0-M1
 package build
-// plugins
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
-import $ivy.`com.github.lolgab::mill-mima::0.0.23`
 
 // imports
 import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
-import de.tobiasroeser.mill.vcs.version.VcsVersion
+import mill.main.VcsVersion
 import com.github.lolgab.mill.mima._
-import mill.scalalib.api.ZincWorkerUtil
+import mill.scalalib.api.JvmWorkerUtil
 
 val communityBuildDottyVersion = sys.props.get("dottyVersion").toList
 
@@ -17,10 +17,10 @@ val scalaVersions = Seq(
   "2.12.17",
 ) ++ communityBuildDottyVersion
 
-trait MimaCheck extends Mima {
-  override def mimaPreviousVersions = T{
+trait MimaCheck extends ScalaModule with Mima {
+  override def mimaPreviousVersions = Task {
     val sv = scalaVersion()
-    val is3 = ZincWorkerUtil.isScala3(sv)
+    val is3 = JvmWorkerUtil.isScala3(sv)
     val is211 = sv.startsWith("2.11.")
     val isNative = this.isInstanceOf[ScalaNativeModule]
     Seq(
@@ -39,7 +39,7 @@ trait MimaCheck extends Mima {
   )
 
   def mimaReportBinaryIssues() =
-    if (this.isInstanceOf[ScalaNativeModule] || this.isInstanceOf[ScalaJSModule]) T.command()
+    if (this.isInstanceOf[ScalaNativeModule] || this.isInstanceOf[ScalaJSModule]) Task.Command{}
     else super.mimaReportBinaryIssues()
 }
 
@@ -64,12 +64,12 @@ trait GenyPublishModule extends PublishModule with MimaCheck {
 }
 
 trait Common extends CrossScalaModule {
-  def millSourcePath = build.millSourcePath / "geny"
-  def sources = T.sources(millSourcePath / "src")
+  def moduleDir = build.moduleDir / "geny"
+  def sources = Task.Sources("src")
 }
 
 trait CommonTestModule extends ScalaModule with TestModule.Utest {
-  override def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.3")
+  override def mvnDeps = Seq(mvn"com.lihaoyi::utest::0.8.3")
 }
 
 object geny extends Module {
@@ -81,13 +81,13 @@ object geny extends Module {
   object js extends Cross[JSGenyModule](scalaVersions)
   trait JSGenyModule extends Common with ScalaJSModule with GenyPublishModule {
     def scalaJSVersion = "1.12.0"
-    private def sourceMapOptions = T.task {
+    private def sourceMapOptions = Task.Anon {
       val vcsState = VcsVersion.vcsState()
       vcsState.lastTag.collect {
         case tag if vcsState.commitsSinceLastTag == 0 =>
           val baseUrl = pomSettings().url.replace("github.com", "raw.githubusercontent.com")
-          val sourcesOptionName = if(ZincWorkerUtil.isScala3(crossScalaVersion)) "-scalajs-mapSourceURI" else "-P:scalajs:mapSourceURI"
-          s"$sourcesOptionName:${T.workspace.toIO.toURI}->$baseUrl/$tag/"
+          val sourcesOptionName = if(JvmWorkerUtil.isScala3(crossScalaVersion)) "-scalajs-mapSourceURI" else "-P:scalajs:mapSourceURI"
+          s"$sourcesOptionName:${Task.workspace.toIO.toURI}->$baseUrl/$tag/"
       }
     }
     override def scalacOptions = super.scalacOptions() ++ sourceMapOptions()