Skip to content

Commit e4a3e5d

Browse files
committed
Mark API as experimental
1 parent b756104 commit e4a3e5d

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

libs/groovylib/api/src/mill/groovylib/worker/api/GroovyCompilerConfiguration.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package mill.groovylib.worker.api
22

3+
@mill.api.experimental
34
case class GroovyCompilerConfiguration(
45
enablePreview: Boolean = false,
56
disabledGlobalAstTransformations: Set[String] = Set.empty,

libs/groovylib/api/src/mill/groovylib/worker/api/GroovyWorker.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import mill.javalib.api.CompilationResult
1111
* 2. compile Java sources (done externally)
1212
* 3. compile Groovy sources
1313
*/
14+
@mill.api.experimental
1415
trait GroovyWorker {
1516

1617
/**

libs/groovylib/package.mill

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mill.contrib.buildinfo.BuildInfo
55
import mill.scalalib.*
66
import millbuild.*
77

8-
object `package` extends MillPublishScalaModule with BuildInfo {
8+
object `package` extends MillStableScalaModule with BuildInfo {
99

1010
def moduleDeps = Seq(build.libs.util, build.libs.javalib, build.libs.javalib.testrunner, api)
1111
def localTestExtraModules: Seq[MillJavaModule] =
@@ -21,21 +21,15 @@ object `package` extends MillPublishScalaModule with BuildInfo {
2121
BuildInfo.Value("groovyVersion", Deps.groovyVersion, "Version of Groovy")
2222
)
2323

24-
trait MillGroovyModule extends MillPublishScalaModule {
25-
override def javacOptions = super.javacOptions() ++ {
26-
Seq("-release", "8", "-encoding", "UTF-8", "-deprecation")
27-
}
28-
}
29-
30-
object api extends MillGroovyModule {
24+
object api extends MillStableScalaModule {
3125
def moduleDeps = Seq(build.libs.javalib.testrunner)
3226

3327
override def compileMvnDeps: T[Seq[Dep]] = Seq(
3428
Deps.osLib
3529
)
3630
}
3731

38-
object worker extends MillGroovyModule {
32+
object worker extends MillPublishScalaModule {
3933
override def compileModuleDeps = Seq(api)
4034

4135
def mandatoryMvnDeps = Seq.empty[Dep]

libs/groovylib/src/mill/groovylib/GroovyMavenModule.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import mill.javalib.MavenModule
77
* A [[GroovyModule]] with a Maven compatible directory layout:
88
* `src/main/groovy`, `src/main/resources`, etc.
99
*/
10+
@mill.api.experimental
1011
trait GroovyMavenModule extends GroovyModule with MavenModule {
1112
private def sources0 = Task.Sources("src/main/groovy")
1213
override def sources = super.sources() ++ sources0()

libs/groovylib/src/mill/groovylib/GroovyModule.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import mill.util.Version
1818
*
1919
* Resolves
2020
*/
21+
@mill.api.experimental
2122
trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
2223

2324
/**

libs/groovylib/src/mill/groovylib/GroovyWorkerManager.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import mill.api.{Discover, ExternalModule, TaskCtx}
55
import mill.groovylib.worker.api.GroovyWorker
66
import mill.util.ClassLoaderCachedFactory
77

8+
@mill.api.experimental
89
class GroovyWorkerManager()(implicit ctx: TaskCtx)
910
extends ClassLoaderCachedFactory[GroovyWorker](ctx.jobs) {
1011

libs/groovylib/src/mill/groovylib/JavaMavenModuleWithGroovyTests.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import mill.javalib.{JavaModule, MavenModule}
66
/**
77
* Convenience trait for projects using Java for production and Groovy for tests in a Maven setup
88
*/
9+
@mill.api.experimental
910
trait JavaMavenModuleWithGroovyTests extends JavaModule with MavenModule {
1011

1112
trait GroovyMavenTests extends JavaTests with MavenTests with GroovyModule {

website/package.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object `package` extends mill.Module {
2525
def scalaVersion = Deps.scalaVersion
2626
def moduleDeps = build.moduleInternal.modules.collect {
2727
case m: MillStableScalaModule => m
28-
case m @ (build.libs.kotlinlib | build.libs.groovylib) => m
28+
case m @ (build.libs.kotlinlib) => m
2929
}
3030
def unidocSourceUrl = Task {
3131
val sha = "main" // VcsVersion.vcsState().currentRevision

0 commit comments

Comments
 (0)