Skip to content

Commit f800d95

Browse files
committed
Due to Scala 3 bug scala/scala3#19745 remove distage.plugins.{PluginDef,BootstrapPluginDef} aliases on Scala 3
1 parent 729e5dd commit f800d95

File tree

4 files changed

+69
-0
lines changed

4 files changed

+69
-0
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package distage.plugins
2+
3+
import izumi.distage.plugins
4+
import izumi.distage.plugins.{StaticPluginLoader, load}
5+
6+
trait DistagePlugins {
7+
8+
type PluginBase = plugins.PluginBase
9+
val PluginBase: plugins.PluginBase.type = plugins.PluginBase
10+
11+
// Because of Scala 3 bug https://github.com/scala/scala3/issues/19745
12+
// we can't use a type alias or export to alias PluginDef name anymore,
13+
// use the longer package izumi.distage.plugins.PluginDef instead.
14+
// type PluginDef[T] = plugins.PluginDef[T]
15+
16+
type BootstrapPlugin = plugins.BootstrapPlugin
17+
val BootstrapPlugin: plugins.BootstrapPlugin.type = plugins.BootstrapPlugin
18+
19+
// Because of Scala 3 bug https://github.com/scala/scala3/issues/19745
20+
// we can't use a type alias or export to alias BootstrapPluginDef name anymore,
21+
// use the longer package izumi.distage.plugins.BootstrapPluginDef instead.
22+
// type BootstrapPluginDef[T] = plugins.BootstrapPluginDef[T]
23+
24+
type PluginLoader = load.PluginLoader
25+
val PluginLoader: load.PluginLoader.type = load.PluginLoader
26+
27+
val StaticPlugingLoader: StaticPluginLoader.type = plugins.StaticPluginLoader
28+
29+
type PluginLoaderDefaultImpl = load.PluginLoaderDefaultImpl
30+
val PluginLoaderDefaultImpl: load.PluginLoaderDefaultImpl.type = load.PluginLoaderDefaultImpl
31+
32+
type PluginConfig = plugins.PluginConfig
33+
val PluginConfig: plugins.PluginConfig.type = plugins.PluginConfig
34+
35+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package distage
2+
3+
import izumi.distage.plugins.load
4+
5+
package object plugins extends DistagePlugins {
6+
7+
override type PluginBase = izumi.distage.plugins.PluginBase
8+
override val PluginBase: izumi.distage.plugins.PluginBase.type = izumi.distage.plugins.PluginBase
9+
10+
// Because of Scala 3 bug https://github.com/scala/scala3/issues/19745
11+
// we can't use a type alias or export to alias PluginDef name anymore,
12+
// use the longer package izumi.distage.plugins.PluginDef instead.
13+
// override type PluginDef[T] = izumi.distage.plugins.PluginDef[T]
14+
15+
override type BootstrapPlugin = izumi.distage.plugins.BootstrapPlugin
16+
override val BootstrapPlugin: izumi.distage.plugins.BootstrapPlugin.type = izumi.distage.plugins.BootstrapPlugin
17+
18+
// Because of Scala 3 bug https://github.com/scala/scala3/issues/19745
19+
// we can't use a type alias or export to alias BootstrapPluginDef name anymore,
20+
// use the longer package izumi.distage.plugins.BootstrapPluginDef instead.
21+
// override type BootstrapPluginDef[T] = izumi.distage.plugins.BootstrapPluginDef[T]
22+
23+
override type PluginLoader = load.PluginLoader
24+
override val PluginLoader: load.PluginLoader.type = load.PluginLoader
25+
26+
override val StaticPlugingLoader: izumi.distage.plugins.StaticPluginLoader.type = izumi.distage.plugins.StaticPluginLoader
27+
28+
override type PluginLoaderDefaultImpl = load.PluginLoaderDefaultImpl
29+
override val PluginLoaderDefaultImpl: load.PluginLoaderDefaultImpl.type = load.PluginLoaderDefaultImpl
30+
31+
override type PluginConfig = izumi.distage.plugins.PluginConfig
32+
override val PluginConfig: izumi.distage.plugins.PluginConfig.type = izumi.distage.plugins.PluginConfig
33+
34+
}

0 commit comments

Comments
 (0)