Skip to content

Commit 01f3e01

Browse files
committed
Revert "Disable recompilation trigger functionality on Scala 3 completely due to bug scala/scala3#15976"
This reverts commit 2ab8bf4.
1 parent b0b1294 commit 01f3e01

File tree

9 files changed

+6
-50
lines changed

9 files changed

+6
-50
lines changed

distage/distage-extension-plugins/.jvm/src/main/scala/izumi/distage/plugins/load/PluginLoaderDefaultImpl.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package izumi.distage.plugins.load
22

33
import io.github.classgraph.ClassGraph
4-
import izumi.distage.plugins.{PluginBase, PluginConfig}
4+
import izumi.distage.plugins.{PluginBase, PluginConfig, PluginDef}
55
import izumi.fundamentals.platform.cache.SyncCache
66
import izumi.fundamentals.reflection.TypeUtil
77

@@ -25,7 +25,7 @@ class PluginLoaderDefaultImpl extends PluginLoader {
2525
val disabledPackages = config.packagesDisabled
2626

2727
val pluginBase = classOf[PluginBase]
28-
val pluginDef = classOf[PluginDefType]
28+
val pluginDef = classOf[PluginDef[?]]
2929
val whitelistedClasses = Seq(pluginDef.getName)
3030

3131
def loadPkgs(pkgs: Seq[String]): Seq[PluginBase] = {

distage/distage-extension-plugins/src/main/scala-2/izumi/distage/plugins/load/package.scala

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

distage/distage-extension-plugins/src/main/scala-3/izumi/distage/plugins/BootstrapPluginDef.scala

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

distage/distage-extension-plugins/src/main/scala-3/izumi/distage/plugins/PluginDef.scala

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

distage/distage-extension-plugins/src/main/scala-3/izumi/distage/plugins/load/package.scala

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

distage/distage-extension-plugins/src/main/scala-3/distage/plugins/DistagePlugins.scala renamed to distage/distage-extension-plugins/src/main/scala/distage/plugins/DistagePlugins.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ trait DistagePlugins {
88
type PluginBase = plugins.PluginBase
99
val PluginBase: plugins.PluginBase.type = plugins.PluginBase
1010

11-
type PluginDef = plugins.PluginDef
11+
type PluginDef[T] = plugins.PluginDef[T]
1212

1313
type BootstrapPlugin = plugins.BootstrapPlugin
1414
val BootstrapPlugin: plugins.BootstrapPlugin.type = plugins.BootstrapPlugin
1515

16-
type BootstrapPluginDef = plugins.BootstrapPluginDef
16+
type BootstrapPluginDef[T] = plugins.BootstrapPluginDef[T]
1717

1818
type PluginLoader = load.PluginLoader
1919
val PluginLoader: load.PluginLoader.type = load.PluginLoader

distage/distage-extension-plugins/src/main/scala-3/distage/plugins/package.scala renamed to distage/distage-extension-plugins/src/main/scala/distage/plugins/package.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ package object plugins extends DistagePlugins {
77
override type PluginBase = izumi.distage.plugins.PluginBase
88
override val PluginBase: izumi.distage.plugins.PluginBase.type = izumi.distage.plugins.PluginBase
99

10-
override type PluginDef = izumi.distage.plugins.PluginDef
10+
override type PluginDef[T] = izumi.distage.plugins.PluginDef[T]
1111

1212
override type BootstrapPlugin = izumi.distage.plugins.BootstrapPlugin
1313
override val BootstrapPlugin: izumi.distage.plugins.BootstrapPlugin.type = izumi.distage.plugins.BootstrapPlugin
1414

15-
override type BootstrapPluginDef = izumi.distage.plugins.BootstrapPluginDef
15+
override type BootstrapPluginDef[T] = izumi.distage.plugins.BootstrapPluginDef[T]
1616

1717
override type PluginLoader = load.PluginLoader
1818
override val PluginLoader: load.PluginLoader.type = load.PluginLoader

0 commit comments

Comments
 (0)