Publish for Scala 2.11

- Add publish from Github Actions
- Update mill so docJar works on Scala 3
- Adapt code to be compatible with Scala 2.11

Author: lolgab

.github/workflows/build.yml

@@ -1,7 +1,13 @@
-on: [push, pull_request]
+name: ci
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
 
 jobs:
-  build:
+  test:
     strategy:
       fail-fast: false
       matrix:
@@ -27,3 +33,36 @@ jobs:
         if: matrix.os != 'windows-latest'
       - run: ./mill.bat -i -k __.jvm.__.test
         if: matrix.os == 'windows-latest'
+
+  publish-sonatype:
+    if: github.repository == 'com-lihaoyi/os-lib' && contains(github.ref, 'refs/tags/')
+    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 }}
+      LANG: "en_US.UTF-8"
+      LC_MESSAGES: "en_US.UTF-8"
+      LC_ALL: "en_US.UTF-8"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - 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

.mill-version

@@ -1 +1 @@
-0.9.4-29-9d1d6f
+0.9.5-52-ef6d5d

build.sc

@@ -10,7 +10,7 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion
 
 val dottyVersions = sys.props.get("dottyVersion").toList
 
-val scalaVersions = "2.12.13" :: "2.13.4" :: "3.0.0-RC1" :: dottyVersions
+val scalaVersions = "2.12.13" :: "2.13.4" :: "2.11.12" :: "3.0.0-RC1" :: dottyVersions
 val scala2Versions = scalaVersions.filter(_.startsWith("2."))
 
 val scalaJSVersions = for {
@@ -98,20 +98,10 @@ trait OsLibModule extends CrossScalaModule with PublishModule{
     millSourcePath / "src",
     millSourcePath / s"src-$platformSegment"
   )
-  def acyclicDep: T[Agg[Dep]] = T { if (!isDotty) Agg(ivy"com.lihaoyi::acyclic:0.2.0") else Agg() }
+  def acyclicDep: T[Agg[Dep]] = T { if (!isDotty) Agg(ivy"com.lihaoyi::acyclic:0.2.1") else Agg() }
   def compileIvyDeps = acyclicDep
   def scalacOptions = T { if (!isDotty) Seq("-P:acyclic:force") else Seq.empty }
   def scalacPluginIvyDeps = acyclicDep
-  // FIXME: scaladoc 3 is not supported by mill yet. Remove the override
-  // once it is.
-  override def docJar =
-    if (crossScalaVersion.startsWith("2")) super.docJar
-    else T {
-      val outDir = T.ctx().dest
-      val javadocDir = outDir / 'javadoc
-      _root_.os.makeDir.all(javadocDir)
-      mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
-    }
 }
 
 trait OsLibTestModule extends ScalaModule with TestModule{
@@ -134,10 +124,9 @@ trait OsModule extends OsLibModule{
   def artifactName = "os-lib"
 
   def ivyDeps = Agg(
-    ivy"com.lihaoyi::geny::0.6.5"
+    ivy"com.lihaoyi::geny::0.6.7"
   )
-  //def scalacOptions = Seq("-release", "8")
-  def scalacOptions = T{ if (scalaVersion().startsWith("3")) Seq() else Seq("-release", "8") }
+  def scalacOptions = T{ if (scalaVersion().startsWith("3") || scalaVersion().startsWith("2.11.")) Seq() else Seq("-release", "8") }
 }
 
 trait WatchModule extends OsLibModule{

mill

@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.9.4-29-9d1d6f
+DEFAULT_MILL_VERSION=0.9.5-52-ef6d5d
 
 set -e
 

os/watch/src/package.scala

@@ -36,7 +36,11 @@ package object watch{
       case osName => throw new Exception(s"watch not supported on operating system: $osName")
     }
 
-    val thread = new Thread(() => watcher.run())
+    val thread = new Thread {
+      override def run(): Unit = {
+        watcher.run()
+      }
+    }
     thread.setDaemon(true)
     thread.start()
     watcher

os/watch/test/src/WatchTests.scala

@@ -8,7 +8,7 @@ object WatchTests extends TestSuite{
       val changedPaths = collection.mutable.Set.empty[os.Path]
       _root_.os.watch.watch(
         Seq(wd),
-        onEvent = _.foreach(changedPaths.add),
+        onEvent = _.foreach(changedPaths.add)
 //        (s, v) => println(s + " " + v)
       )
 
@@ -75,7 +75,7 @@ object WatchTests extends TestSuite{
           os.sub / "folder3" / "nestedA",
           os.sub / "folder3" / "nestedA" / "a.txt",
           os.sub / "folder3" / "nestedB",
-          os.sub / "folder3" / "nestedB" / "b.txt",
+          os.sub / "folder3" / "nestedB" / "b.txt"
         )
       )
 
@@ -122,7 +122,7 @@ object WatchTests extends TestSuite{
             Set(
               //os.sub / "newlink3",
               os.sub / "folder3" / "nestedA",
-              os.sub / "folder3" / "nestedA" / "a.txt",
+              os.sub / "folder3" / "nestedA" / "a.txt"
             )
         }
       )