@@ -287,8 +287,8 @@ object Build {
287
287
})
288
288
.withBuildCache(
289
289
buildCache
290
- .withLocal(buildCache.local.withEnabled(false ).withStoreEnabled(false ))
291
- .withRemote(buildCache.remote.withEnabled(false ).withStoreEnabled(false ))
290
+ .withLocal(buildCache.local.withEnabled(true ).withStoreEnabled(true ))
291
+ .withRemote(buildCache.remote.withEnabled(true ).withStoreEnabled(isInsideCI ))
292
292
.withRequireClean(! isInsideCI)
293
293
)
294
294
.withTestRetry(
@@ -1478,6 +1478,9 @@ object Build {
1478
1478
scalaCompilerBridgeBinaryJar := {
1479
1479
Some ((`scala3-sbt-bridge-nonbootstrapped` / Compile / packageBin).value)
1480
1480
},
1481
+ // Force recomplilation when bootstrapped compiler changes
1482
+ Compile / extraDevelocityCacheInputFiles ++=
1483
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
1481
1484
)
1482
1485
1483
1486
/* Configuration of the org.scala-lang:scala3-staging:*.**.**-bootstrapped project */
@@ -1536,6 +1539,9 @@ object Build {
1536
1539
scalaCompilerBridgeBinaryJar := {
1537
1540
Some ((`scala3-sbt-bridge-nonbootstrapped` / Compile / packageBin).value)
1538
1541
},
1542
+ // Force recomplilation when bootstrapped compiler changes
1543
+ Compile / extraDevelocityCacheInputFiles ++=
1544
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
1539
1545
)
1540
1546
1541
1547
/* Configuration of the org.scala-lang:scala3-tasty-inspector:*.**.**-bootstrapped project */
@@ -1594,6 +1600,9 @@ object Build {
1594
1600
scalaCompilerBridgeBinaryJar := {
1595
1601
Some ((`scala3-sbt-bridge-nonbootstrapped` / Compile / packageBin).value)
1596
1602
},
1603
+ // Force recomplilation when bootstrapped compiler changes
1604
+ Compile / extraDevelocityCacheInputFiles ++=
1605
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
1597
1606
)
1598
1607
1599
1608
// ==============================================================================================
@@ -1771,6 +1780,9 @@ object Build {
1771
1780
mimaForwardIssueFilters := MiMaFilters .Scala3Library .ForwardsBreakingChanges ,
1772
1781
mimaBackwardIssueFilters := MiMaFilters .Scala3Library .BackwardsBreakingChanges ,
1773
1782
customMimaReportBinaryIssues(" MiMaFilters.Scala3Library" ),
1783
+ // Force recomplilation when bootstrapped compiler changes
1784
+ Compile / extraDevelocityCacheInputFiles ++=
1785
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
1774
1786
)
1775
1787
1776
1788
/* Configuration of the org.scala-lang:scala3-library_3:*.**.**-bootstrapped project */
@@ -1812,6 +1824,9 @@ object Build {
1812
1824
publish / skip := false ,
1813
1825
// Project specific target folder. sbt doesn't like having two projects using the same target folder
1814
1826
target := target.value / " scala3-library-bootstrapped" ,
1827
+ // Force recomplilation when bootstrapped compiler changes
1828
+ Compile / extraDevelocityCacheInputFiles ++=
1829
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
1815
1830
)
1816
1831
1817
1832
/* Configuration of the org.scala-js:scalajs-scalalib_2.13:*.**.**-bootstrapped project */
@@ -1925,6 +1940,9 @@ object Build {
1925
1940
}
1926
1941
}).transform(node).head
1927
1942
},
1943
+ // Force recomplilation when bootstrapped compiler changes
1944
+ Compile / extraDevelocityCacheInputFiles ++=
1945
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
1928
1946
)
1929
1947
1930
1948
/* Configuration of the org.scala-lang:scala3-library_sjs1_3:*.**.**-bootstrapped project */
@@ -1966,6 +1984,9 @@ object Build {
1966
1984
publish / skip := false ,
1967
1985
// Project specific target folder. sbt doesn't like having two projects using the same target folder
1968
1986
target := target.value / " scala3-library" ,
1987
+ // Force recomplilation when bootstrapped compiler changes
1988
+ Compile / extraDevelocityCacheInputFiles ++=
1989
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
1969
1990
)
1970
1991
1971
1992
// ==============================================================================================
@@ -2104,6 +2125,9 @@ object Build {
2104
2125
mimaForwardIssueFilters := MiMaFilters .TastyCore .ForwardsBreakingChanges ,
2105
2126
mimaBackwardIssueFilters := MiMaFilters .TastyCore .BackwardsBreakingChanges ,
2106
2127
customMimaReportBinaryIssues(" MiMaFilters.TastyCore" ),
2128
+ // Force recomplilation when bootstrapped compiler changes
2129
+ Compile / extraDevelocityCacheInputFiles ++=
2130
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
2107
2131
)
2108
2132
2109
2133
// ==============================================================================================
@@ -2453,6 +2477,9 @@ object Build {
2453
2477
s " -Ddotty.tools.dotc.semanticdb.test= ${(ThisBuild / baseDirectory).value/ " tests" / " semanticdb" }" ,
2454
2478
)
2455
2479
},
2480
+ // Force recomplilation when bootstrapped compiler changes
2481
+ Compile / extraDevelocityCacheInputFiles ++=
2482
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
2456
2483
)
2457
2484
2458
2485
// ==============================================================================================
@@ -2534,6 +2561,9 @@ object Build {
2534
2561
scalaCompilerBridgeBinaryJar := {
2535
2562
Some ((`scala3-sbt-bridge-nonbootstrapped` / Compile / packageBin).value)
2536
2563
},
2564
+ // Force recomplilation when bootstrapped compiler changes
2565
+ Compile / extraDevelocityCacheInputFiles ++=
2566
+ (`scala3-compiler-nonbootstrapped` / Compile / fullClasspathAsJars).value.map(_.data.toPath)
2537
2567
)
2538
2568
2539
2569
def dottyLibrary (implicit mode : Mode ): Project = mode match {
0 commit comments