Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.6
1.1.0-RC4
4 changes: 2 additions & 2 deletions build.mill.scala → build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
| def signingCliJvmVersion = ${Deps.Versions.signingCliJvmVersion}
| def defaultMillVersion = "${BuildInfo.millVersion}"
| def mill012Version = "${Deps.Versions.mill012Version}"
| def mill10Version = "${Deps.Versions.mill10Version}"
| def mill1Version = "${Deps.Versions.mill1Version}"
| def defaultSbtVersion = "${Deps.Versions.sbtVersion}"
| def defaultMavenVersion = "${Deps.Versions.mavenVersion}"
| def defaultMavenScalaCompilerPluginVersion = "${Deps.Versions.mavenScalaCompilerPluginVersion}"
Expand Down Expand Up @@ -1121,7 +1121,7 @@ trait CliIntegration extends SbtModule
| def jmhGeneratorBytecodeModule = "${Deps.jmhGeneratorBytecode.dep.module.name.value}"
| def defaultMillVersion = "${BuildInfo.millVersion}"
| def mill012Version = "${Deps.Versions.mill012Version}"
| def mill10Version = "${Deps.Versions.mill10Version}"
| def mill1Version = "${Deps.Versions.mill1Version}"
|}
|""".stripMargin
if (!os.isFile(dest) || os.read(dest) != code)
Expand Down
2 changes: 1 addition & 1 deletion mill.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setlocal enabledelayedexpansion

if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=0.12.17" )
if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=1.1.0-RC4" )

if [!MILL_GITHUB_RELEASE_CDN!]==[] ( set "MILL_GITHUB_RELEASE_CDN=" )

Expand Down
2 changes: 1 addition & 1 deletion millw
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

if [ -z "${DEFAULT_MILL_VERSION}" ] ; then DEFAULT_MILL_VERSION="0.12.17"; fi
if [ -z "${DEFAULT_MILL_VERSION}" ] ; then DEFAULT_MILL_VERSION="1.1.0-RC4"; fi

if [ -z "${GITHUB_RELEASE_CDN}" ] ; then GITHUB_RELEASE_CDN=""; fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ final case class MillProject(
os.write(path0, content, createFolders = true)
}

val outputBuildFile = if isMill1OrNewer then dir / "build.mill.scala" else dir / "build.sc"
val outputBuildFile = if isMill1OrNewer then dir / "build.mill" else dir / "build.sc"
os.write(outputBuildFile, buildFileContent.getBytes(charSet))
}
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package scala.cli.integration

class ExportMill1Tests212 extends ExportMillTestDefinitions with Test212 with TestMill1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.integration

class ExportMill10Tests213 extends ExportMillTestDefinitions with Test213 with TestMill10 {
class ExportMill1Tests213 extends ExportMillTestDefinitions with Test213 with TestMill1 {
if runExportTests then {
test(s"scalac options$commonTestDescriptionSuffix") {
simpleTest(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package scala.cli.integration

class ExportMill1Tests3Lts extends ExportMillTestDefinitions with Test3Lts with TestMill1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package scala.cli.integration

class ExportMill1Tests3NextRc extends ExportMillTestDefinitions with Test3NextRc with TestMill1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package scala.cli.integration

class ExportMill1TestsDefault extends ExportMillTestDefinitions with TestDefault with TestMill1
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,6 @@ sealed trait TestMillVersion:
trait TestMill012 extends TestMillVersion:
self: ExportMillTestDefinitions =>
override def millVersion: String = Constants.mill012Version
trait TestMill10 extends TestMillVersion:
trait TestMill1 extends TestMillVersion:
self: ExportMillTestDefinitions =>
override def millVersion: String = Constants.mill10Version
override def millVersion: String = Constants.mill1Version
17 changes: 8 additions & 9 deletions project/deps/package.mill.scala → project/deps/package.mill
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,14 @@ object Deps {
def bloop = "2.0.17"
def sbtVersion = "1.11.7"
def mill012Version = "0.12.17"
def mill10Version =
if (BuildInfo.millVersion.startsWith("1.0.")) BuildInfo.millVersion else "1.0.6"
def mavenVersion = "3.8.1"
def mavenScalaCompilerPluginVersion = "4.9.1"
def mavenExecPluginVersion = "3.3.0"
def mavenAppArtifactId = "maven-app"
def mavenAppGroupId = "com.example"
def mavenAppVersion = "0.1-SNAPSHOT"
def scalafix = "0.14.4"
def mill1Version = BuildInfo.millVersion
def mavenVersion = "3.8.1"
def mavenScalaCompilerPluginVersion = "4.9.1"
def mavenExecPluginVersion = "3.3.0"
def mavenAppArtifactId = "maven-app"
def mavenAppGroupId = "com.example"
def mavenAppVersion = "0.1-SNAPSHOT"
def scalafix = "0.14.4"
}

// DO NOT hardcode a Scala version in this dependency string
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package build.project.publish

import build.project.settings
import com.lumidion.sonatype.central.client.core.{PublishingType, SonatypeCredentials}
import mill.javalib.publish.{PublishingType, SonatypeCredentials}
import settings.{PublishLocalNoFluff, workspaceDirName}
import mill.*
import mill.javalib.publish.Artifact
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion website/docs/reference/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ Version of SBT to be used for the export (1.11.7 by default)

### `--mill-version`

Version of Mill to be used for the export (1.0.6 by default)
Version of Mill to be used for the export (1.1.0-RC4 by default)

### `--mvn-version`

Expand Down
Loading