Skip to content

Commit 8b74eb7

Browse files
authored
Update to Mill 1.0.0 (#191)
1 parent 95d0433 commit 8b74eb7

File tree

5 files changed

+315
-74
lines changed

5 files changed

+315
-74
lines changed

.github/workflows/actions.yml

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
java: ['8', '17']
18+
java: ['11', '17']
1919
steps:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-java@v3
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/setup-java@v3
3535
with:
3636
distribution: 'temurin'
37-
java-version: 8
37+
java-version: 11
3838
- name: Check Binary Compatibility
3939
run: ./mill -i __.mimaReportBinaryIssues
4040

@@ -43,34 +43,23 @@ jobs:
4343
needs: test
4444
runs-on: ubuntu-latest
4545
env:
46-
SONATYPE_PGP_PRIVATE_KEY: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY }}
47-
SONATYPE_PGP_PRIVATE_KEY_PASSWORD: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY_PASSWORD }}
48-
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
49-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
46+
MILL_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
47+
MILL_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
48+
MILL_PGP_SECRET_BASE64: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY }}
49+
MILL_PGP_PASSPHRASE: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY_PASSWORD }}
5050
LANG: "en_US.UTF-8"
5151
LC_MESSAGES: "en_US.UTF-8"
5252
LC_ALL: "en_US.UTF-8"
53+
5354
steps:
54-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v3
5556
- uses: actions/setup-java@v3
5657
with:
5758
distribution: 'temurin'
5859
java-version: 11
5960
- name: Publish to Maven Central
60-
run: |
61-
if [[ $(git tag --points-at HEAD) != '' ]]; then
62-
echo $SONATYPE_PGP_PRIVATE_KEY | base64 --decode > gpg_key
63-
gpg --import --no-tty --batch --yes gpg_key
64-
rm gpg_key
65-
./mill -i mill.scalalib.PublishModule/publishAll \
66-
--sonatypeCreds $SONATYPE_USER:$SONATYPE_PASSWORD \
67-
--gpgArgs --passphrase=$SONATYPE_PGP_PRIVATE_KEY_PASSWORD,--no-tty,--pinentry-mode,loopback,--batch,--yes,-a,-b \
68-
--publishArtifacts __.publishArtifacts \
69-
--readTimeout 600000 \
70-
--awaitTimeout 600000 \
71-
--release true \
72-
--signed true
73-
fi
61+
run: ./mill -i mill.scalalib.SonatypeCentralPublishModule/
62+
7463
- name: Create GitHub Release
7564
id: create_gh_release
7665
uses: actions/[email protected]

.jvmopts

Lines changed: 0 additions & 7 deletions
This file was deleted.

.mill-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

build.mill

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
//| mill-version: 1.0.0
2+
//| mvnDeps:
3+
//| - com.github.lolgab::mill-mima_mill1:0.2.0
14
package build
2-
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
3-
import $ivy.`com.github.lolgab::mill-mima::0.1.0`
45

56
import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
6-
import de.tobiasroeser.mill.vcs.version.VcsVersion
7+
import mill.util.VcsVersion
78
import com.github.lolgab.mill.mima._
8-
import mill.scalalib.api.ZincWorkerUtil.isScala3
99

1010
val dottyCommunityBuildVersion = sys.props.get("dottyVersion").toList
1111

@@ -16,7 +16,7 @@ trait MimaCheck extends Mima {
1616
def mimaPreviousVersions = Seq("0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.3.0", "0.3.1")
1717

1818
def mimaReportBinaryIssues() =
19-
if (this.isInstanceOf[ScalaNativeModule] || this.isInstanceOf[ScalaJSModule]) T.command()
19+
if (this.isInstanceOf[ScalaNativeModule] || this.isInstanceOf[ScalaJSModule]) Task.Command{}
2020
else super.mimaReportBinaryIssues()
2121
}
2222

@@ -30,7 +30,7 @@ trait SourcecodeModule extends PublishModule with MimaCheck {
3030
// Temporary until the next version of Mima gets released with
3131
// https://github.com/lightbend/mima/issues/693 included in the release.
3232
def mimaPreviousArtifacts =
33-
if(isScala3(crossScalaVersion)) Agg.empty[Dep] else super.mimaPreviousArtifacts()
33+
if(crossScalaVersion.startsWith("3.")) Seq.empty[Dep] else super.mimaPreviousArtifacts()
3434

3535
def pomSettings = PomSettings(
3636
description = artifactName(),
@@ -44,12 +44,12 @@ trait SourcecodeModule extends PublishModule with MimaCheck {
4444
)
4545
}
4646
trait SourcecodeMainModule extends CrossScalaModule with PlatformScalaModule {
47-
def compileIvyDeps =
48-
if (crossScalaVersion.startsWith("2")) Agg(
49-
ivy"org.scala-lang:scala-reflect:${crossScalaVersion}",
50-
ivy"org.scala-lang:scala-compiler:${crossScalaVersion}"
47+
def compileMvnDeps =
48+
if (crossScalaVersion.startsWith("2")) Seq(
49+
mvn"org.scala-lang:scala-reflect:${crossScalaVersion}",
50+
mvn"org.scala-lang:scala-compiler:${crossScalaVersion}"
5151
)
52-
else Agg.empty[Dep]
52+
else Seq.empty[Dep]
5353
}
5454

5555
object sourcecode extends Module {

0 commit comments

Comments
 (0)