CI workaround for scala/scala3#19745

7mind · Feb 21, 2024 · 61aeba7 · 61aeba7
1 parent 7dd4576
commit 61aeba7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/distage/distage-framework/.jvm/src/test/scala/izumi/distage/roles/test/RoleAppTest.scala b/distage/distage-framework/.jvm/src/test/scala/izumi/distage/roles/test/RoleAppTest.scala
@@ -6,7 +6,7 @@ import com.github.pshirshov.test.plugins.{StaticTestMainLogIO2, StaticTestRole}
 import com.github.pshirshov.test3.plugins.Fixture3
 import com.typesafe.config.ConfigFactory
 import distage.config.AppConfig
-import distage.plugins.{PluginBase, PluginDef}
+import distage.plugins.PluginBase
 import distage.{DIKey, Injector, Locator, LocatorRef}
 import izumi.distage.framework.config.PlanningOptions
 import izumi.distage.model.provisioning.IntegrationCheck
@@ -41,7 +41,7 @@ class RoleAppTest extends AnyWordSpec with WithProperties {
     "testservice.systemPropList.1" -> "222",
   )
 
-  class XXX_TestWhiteboxProbe extends PluginDef {
+  class XXX_TestWhiteboxProbe extends izumi.distage.plugins.PluginDef {
     val resources = new XXX_ResourceEffectsRecorder[IO]
     private var locator0: LocatorRef = null
     lazy val locator: Locator = locator0.get
@@ -92,7 +92,7 @@ class RoleAppTest extends AnyWordSpec with WithProperties {
               new TestPluginCatsIO,
               new AdaptedAutocloseablesCasePlugin,
               probe,
-              new PluginDef {
+              new izumi.distage.plugins.PluginDef {
                 make[TestResource[IO]].from[IntegrationResource0[IO]]
                 many[TestResource[IO]]
                   .ref[TestResource[IO]]

diff --git a/...e-testkit-scalatest/src/test/scala/izumi/distage/testkit/distagesuite/generic/tests.scala b/...e-testkit-scalatest/src/test/scala/izumi/distage/testkit/distagesuite/generic/tests.scala
@@ -1,7 +1,7 @@
 package izumi.distage.testkit.distagesuite.generic
 
 import distage.*
-import distage.plugins.{PluginConfig, PluginDef}
+import distage.plugins.PluginConfig
 import izumi.distage.modules.DefaultModule
 import izumi.distage.testkit.distagesuite.fixtures.*
 import izumi.distage.testkit.distagesuite.generic.DistageTestExampleBase.*
@@ -92,7 +92,7 @@ object DistageTestExampleBase {
 abstract class DistageTestExampleBase[F[_]: TagK: DefaultModule](implicit F: QuasiIO[F]) extends Spec1[F] with DistageMemoizeExample[F] {
 
   override protected def config: TestConfig = super.config.copy(
-    pluginConfig = super.config.pluginConfig.enablePackage("xxx") ++ new PluginDef {
+    pluginConfig = super.config.pluginConfig.enablePackage("xxx") ++ new izumi.distage.plugins.PluginDef {
       make[SetCounter]
 
       make[SetElement1]

diff --git a/...c/test/scala/izumi/distage/testkit/distagesuite/memoized/DistageMemoizationEnvsTest.scala b/...c/test/scala/izumi/distage/testkit/distagesuite/memoized/DistageMemoizationEnvsTest.scala
@@ -1,7 +1,6 @@
 package izumi.distage.testkit.distagesuite.memoized
 
 import distage.DIKey
-import distage.plugins.PluginDef
 import izumi.distage.model.definition.StandardAxis.Repo
 import izumi.distage.model.providers.Functoid
 import izumi.distage.testkit.distagesuite.memoized.MemoizationEnv.*
@@ -45,7 +44,7 @@ abstract class DistageMemoizationEnvsTest extends SpecZIO with AssertZIO {
           1 -> Set(DIKey[MemoizedInstance], DIKey[MemoizedLevel1]),
           2 -> Set(DIKey[MemoizedLevel2]),
         ),
-        pluginConfig = super.config.pluginConfig.enablePackage("izumi.distage.testkit.distagesuite") ++ new PluginDef {
+        pluginConfig = super.config.pluginConfig.enablePackage("izumi.distage.testkit.distagesuite") ++ new izumi.distage.plugins.PluginDef {
           make[MemoizedInstance].from {
             MemoizationEnv.makeInstance(MemoizationEnv.memoizedInstance)(MemoizationEnv.MemoizedInstance.apply)
           }
@@ -97,7 +96,7 @@ class SameLevel_1_WithoutLastMemoizationLevel extends DistageMemoizationEnvsTest
       memoizationRoots = Map(
         1 -> Set(DIKey.get[MemoizedInstance], DIKey.get[MemoizedLevel1])
       ),
-      pluginConfig = super.config.pluginConfig overriddenBy new PluginDef {
+      pluginConfig = super.config.pluginConfig overriddenBy new izumi.distage.plugins.PluginDef {
         make[MemoizedLevel2].from(MemoizedLevel2(UUID.randomUUID()))
       },
       activation = distage.Activation(Repo -> Repo.Prod),
@@ -132,7 +131,7 @@ class SameLevel_1_2_WithAdditionalLevel3 extends DistageMemoizationEnvsTest {
 class SameLevel_1_WithModuleOverride extends DistageMemoizationEnvsTest {
   override protected def config: TestConfig = {
     super.config.copy(
-      pluginConfig = super.config.pluginConfig overriddenBy new PluginDef {
+      pluginConfig = super.config.pluginConfig overriddenBy new izumi.distage.plugins.PluginDef {
         make[TestInstance].from(MemoizationEnv.anotherTestInstance)
       }
     )
@@ -154,7 +153,7 @@ class SameLevel_1_WithActivationsOverride extends DistageMemoizationEnvsTest {
 trait DifferentLevelsWithLevel1 extends DistageMemoizationEnvsTest {
   override protected def config: TestConfig = {
     super.config.copy(
-      pluginConfig = super.config.pluginConfig overriddenBy new PluginDef {
+      pluginConfig = super.config.pluginConfig overriddenBy new izumi.distage.plugins.PluginDef {
         make[MemoizedInstance].from(MemoizedInstance(UUID.randomUUID()))
         make[MemoizedLevel1].from(MemoizedLevel1(UUID.randomUUID()))
         make[MemoizedLevel2].from(MemoizedLevel2(UUID.randomUUID()))
@@ -173,7 +172,7 @@ class DifferentLevelsWithLevel1InstanceOverride1 extends DifferentLevelsWithLeve
 class DifferentLevelsWithLevel1InstanceOverride2 extends DifferentLevelsWithLevel1 {
   override protected def config: TestConfig = {
     super.config.copy(
-      pluginConfig = super.config.pluginConfig overriddenBy new PluginDef {
+      pluginConfig = super.config.pluginConfig overriddenBy new izumi.distage.plugins.PluginDef {
         make[MemoizedLevel2].from(MemoizedLevel2(UUID.randomUUID()))
       }
     )
@@ -187,7 +186,7 @@ class DifferentLevelsWithLevel1InstanceOverride2 extends DifferentLevelsWithLeve
 class SameLevel_1_WithLevel2InstanceOverride extends DistageMemoizationEnvsTest {
   override protected def config: TestConfig = {
     super.config.copy(
-      pluginConfig = super.config.pluginConfig overriddenBy new PluginDef {
+      pluginConfig = super.config.pluginConfig overriddenBy new izumi.distage.plugins.PluginDef {
         make[MemoizedLevel2].from(MemoizedLevel2(UUID.randomUUID()))
       }
     )

diff --git a/...st/scala/izumi/distage/testkit/distagesuite/tagged/DistageTestTaggedAxesExampleBase.scala b/...st/scala/izumi/distage/testkit/distagesuite/tagged/DistageTestTaggedAxesExampleBase.scala
@@ -1,7 +1,6 @@
 package izumi.distage.testkit.distagesuite.tagged
 
 import distage.DIKey
-import distage.plugins.PluginDef
 import izumi.distage.model.definition.StandardAxis.Repo
 import izumi.distage.testkit.distagesuite.tagged.DistageTestTaggedAxesExampleBase.{DepsCounters, DummyDep, PrdDep}
 import izumi.distage.testkit.model.TestConfig
@@ -15,7 +14,7 @@ abstract class DistageTestTaggedAxesExampleBase extends SpecZIO with AssertZIO {
       Set(Repo.Prod) -> Set(DIKey[PrdDep]),
       Set(Repo.Dummy) -> Set(DIKey[DummyDep]),
     ),
-    pluginConfig = super.config.pluginConfig.enablePackage("izumi.distage.testkit.distagesuite") ++ new PluginDef {
+    pluginConfig = super.config.pluginConfig.enablePackage("izumi.distage.testkit.distagesuite") ++ new izumi.distage.plugins.PluginDef {
       make[PrdDep]
       make[DummyDep]
       make[DepsCounters]