From 2c9af7ddf8594b5fc32467fed5dfe33743485acf Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Fri, 10 Sep 2021 08:50:59 +0200 Subject: [PATCH 1/3] Set versionScheme of scala3-library artifact --- project/Build.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/project/Build.scala b/project/Build.scala index a2012827328c..6db97ed8e4f9 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1760,6 +1760,7 @@ object Build { val base = project.withCommonSettings. settings( + versionScheme := Some("semver-spec"), libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion, // Make sure we do not refer to experimental features outside an experimental scope. // In other words, disable NIGHTLY/SNAPSHOT experimental scope. From 82ec2dcdce97eb28346682d33d5c9eb28df4688e Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Fri, 10 Sep 2021 12:57:52 +0200 Subject: [PATCH 2/3] Declare versioning scheme of scala3-interfaces and tasty-core --- project/Build.scala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 6db97ed8e4f9..8211158c211f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -473,7 +473,10 @@ object Build { lazy val `scala3-interfaces` = project.in(file("interfaces")). settings(commonJavaSettings). - settings(commonMiMaSettings) + settings(commonMiMaSettings). + settings( + versionScheme := Some("semver-spec") + ) /** Find an artifact with the given `name` in `classpath` */ def findArtifact(classpath: Def.Classpath, name: String): File = classpath @@ -1786,7 +1789,10 @@ object Build { def asTastyCore(implicit mode: Mode): Project = project.withCommonSettings. dependsOn(dottyLibrary). settings(tastyCoreSettings). - settings(disableDocSetting) + settings(disableDocSetting). + settings( + versionScheme := Some("semver-spec") + ) def asTastyCoreScala2: Project = project.settings(commonScala2Settings) From 00941d7519d182c25e307327d26acb81c3e72fb5 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Mon, 11 Oct 2021 08:43:24 +0200 Subject: [PATCH 3/3] Enable MiMa on project tasty-core-bootstrapped --- .github/workflows/ci.yaml | 2 +- project/Build.scala | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1f60ab5b0236..fa8c67c5990c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -116,7 +116,7 @@ jobs: - name: MiMa run: | - ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues" + ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues" test_windows_fast: runs-on: [self-hosted, Windows] diff --git a/project/Build.scala b/project/Build.scala index 8211158c211f..d08c1198d8dc 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1791,7 +1791,12 @@ object Build { settings(tastyCoreSettings). settings(disableDocSetting). settings( - versionScheme := Some("semver-spec") + versionScheme := Some("semver-spec"), + if (mode == Bootstrapped) { + commonMiMaSettings + } else { + Nil + } ) def asTastyCoreScala2: Project = project.settings(commonScala2Settings)