Update Mill and fixed build (#3)

Fix #4

Pull request: #3

.github/workflows/build.yml

@@ -0,0 +1,62 @@
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '**'
+  pull_request:
+  workflow_dispatch:
+
+# cancel older runs of a pull request;
+# this will not cancel anything for normal git pushes
+concurrency:
+  group: cancel-old-pr-runs-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        java-version: [8, 11, 17]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: temurin
+
+      - run: ./mill __.compile + __.test + __.publishLocal testrepo
+
+  publish:
+    needs: [build]
+    if: github.repository == 'lefou/domino-java' && (startsWith( github.ref, 'refs/tags/') || (github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' ) )
+
+    runs-on: ubuntu-latest
+    concurrency: publish-{{ github.sha }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 8
+          distribution: temurin
+
+      - name: Setup GPG secrets for publish
+        run: |
+          gpg --version
+          cat <(echo "${{ secrets.GPG_SECRET_KEY }}") | base64 --decode | gpg --batch --import
+          gpg --list-secret-keys --keyid-format LONG
+
+      - name: Publish to Maven Central
+        run: ./millw -i mill.scalalib.PublishModule/publishAll --sonatypeCreds "${{ secrets.SONATYPE_CREDS }}" --gpgArgs "--passphrase=${{ secrets.GPG_SECRET_KEY_PASS}},--batch,--yes,-a,-b,--pinentry-mode,loopback" --publishArtifacts __.publishArtifacts --readTimeout 600000 --awaitTimeout 600000 --release true --signed true

.mill-version

@@ -1 +1 @@
-0.3.6-88-ecfbc9
+0.10.15

build.sc

@@ -1,3 +1,6 @@
+import $ivy.`de.tototec::de.tobiasroeser.mill.osgi::0.5.0`
+import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
+
 import java.io.File
 
 import mill._
@@ -7,19 +10,15 @@ import mill.modules.Util
 import mill.scalalib._
 import mill.scalalib.publish._
 
-import $ivy.`de.tototec::de.tobiasroeser.mill.osgi:0.0.6`
 import de.tobiasroeser.mill.osgi._
-
-import $ivy.`de.tototec::de.tobiasroeser.mill.publishM2:0.1.0`
-import de.tobiasroeser.mill.publishM2._
+import de.tobiasroeser.mill.vcs.version.VcsVersion
 
 object main
   extends MavenModule
   with PublishModule
-  with OsgiBundleModule
-  with PublishM2Module {
+  with OsgiBundleModule {
 
-  override def publishVersion = "0.3.1-SNAPSHOT"
+  override def publishVersion = VcsVersion.vcsState().format()
 
   val url = "https://github.com/domino-osgi/domino-java"
 
@@ -41,16 +40,16 @@ object main
   override def artifactName = "domino-java"
   override def bundleSymbolicName = "domino.java"
 
-  def osgiHeaders = T {
+  override def osgiHeaders = T {
     super.osgiHeaders().copy(
       `Import-Package` = Seq(
-        "org.slf4j.*;resolution:=optional",
+        """org.slf4j.*;version="[1.7,3)";resolution:=optional""",
         "de.tototec.utils.functional.*;resolution:=optional",
         "*"
       ),
       `Export-Package` = Seq(
-        s"""${bundleSymbolicName()};version="0.3.0"""",
-        s"""${bundleSymbolicName()}.capsule;version="0.1.0""""
+        s"""${bundleSymbolicName()}""",
+        s"""${bundleSymbolicName()}"""
       )
     )
   }
@@ -78,40 +77,44 @@ object main
 
   override def compileIvyDeps = Agg(
     // Deps.slf4j.optional(true)
-    Dep(Deps.slf4j.dep.copy(optional = true), cross = CrossVersion.empty(false), force = false),
-    Dep(Deps.utilsFunctional.dep.copy(optional = true), cross = CrossVersion.empty(false), force = false)
+    Dep(Deps.slf4j.dep.withOptional(true), cross = CrossVersion.empty(false), force = false),
+    Dep(Deps.utilsFunctional.dep.withOptional(true), cross = CrossVersion.empty(false), force = false)
   )
 
-  def docletIvyDeps = T {
-    Agg(
-      Deps.asciiDoclet
-    )
-  }
+  override def javacOptions = Seq("-source", "8", "-target", "8", "-encoding", "UTF-8", "-deprecation")
 
-  def docletClasspath = T {
-    resolveDeps(docletIvyDeps)
-  }
+  override def javadocOptions: T[Seq[String]] = super.javadocOptions() ++ Seq("-Xdoclint:none")
+
+//  def docletIvyDeps = T {
+//    Agg(
+//      Deps.asciiDoclet
+//    )
+//  }
+
+//  def docletClasspath = T {
+//    resolveDeps(docletIvyDeps)
+//  }
 
   override def generatedSources = T {
     val dest = T.ctx().dest
     Seq("README.adoc", "LICENSE.txt").foreach(f => os.copy.into(millSourcePath / f, dest))
     Seq(PathRef(dest))
   }
 
-  override def javadocOptions = Seq(
-    "-doclet", "org.asciidoctor.Asciidoclet",
-    "-docletpath", s"${docletClasspath().map(_.path).mkString(File.pathSeparator)}",
-    "-overview", s"${millSourcePath / "README.adoc"}",
-    "--base-dir", s"${millSourcePath}",
-    "--attributes-file", s"${millSourcePath / 'src / 'main / 'doc / "placeholders.adoc"}",
-    "--attribute", s"name=${artifactName}",
-    "--attribute", s"version=${publishVersion}",
-    "--attribute", s"dominojavaversion=${publishVersion}",
-    "--attribute", s"title-link=${url}[${bundleSymbolicName} ${publishVersion}]",
-    "--attribute", "env-asciidoclet=true"
-  )
-
-  object test extends Tests {
+//  override def javadocOptions = Seq(
+//    "-doclet", "org.asciidoctor.Asciidoclet",
+//    "-docletpath", s"${docletClasspath().map(_.path).mkString(File.pathSeparator)}",
+//    "-overview", s"${millSourcePath / "README.adoc"}",
+//    "--base-dir", s"${millSourcePath}",
+//    "--attributes-file", s"${millSourcePath / 'src / 'main / 'doc / "placeholders.adoc"}",
+//    "--attribute", s"name=${artifactName}",
+//    "--attribute", s"version=${publishVersion}",
+//    "--attribute", s"dominojavaversion=${publishVersion}",
+//    "--attribute", s"title-link=${url}[${bundleSymbolicName} ${publishVersion}]",
+//    "--attribute", "env-asciidoclet=true"
+//  )
+
+  object test extends Tests with TestModule.Junit4 {
     override def ivyDeps = T {
       super.ivyDeps() ++ Agg(
         Deps.lambdaTest,
@@ -122,7 +125,6 @@ object main
         Deps.utilsFunctional
       )
     }
-    def testFrameworks = Seq("com.novocode.junit.JUnitFramework")
   }
 
 }