diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 01:29:14 -0700 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 13:20:45 -0700 |
| commit | 11122c48452d40eb32086fa247ce06d5d6f1a789 (patch) | |
| tree | 5383042fe2db7d9f24f437e71fd1bc44e70c61cc /scalalib/src | |
| parent | db8d967d461fb6323fd83c40ef81e26f2d0fa225 (diff) | |
| download | mill-11122c48452d40eb32086fa247ce06d5d6f1a789.tar.gz mill-11122c48452d40eb32086fa247ce06d5d6f1a789.tar.bz2 mill-11122c48452d40eb32086fa247ce06d5d6f1a789.zip | |
Caffeine junit & testng suites seem to pass
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/mill/scalalib/Lib.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scalalib/src/mill/scalalib/Lib.scala b/scalalib/src/mill/scalalib/Lib.scala index 3e06ea37..46164e4b 100644 --- a/scalalib/src/mill/scalalib/Lib.scala +++ b/scalalib/src/mill/scalalib/Lib.scala @@ -294,12 +294,12 @@ object Lib{ !cls.isInterface && (f.isModule == cls.getName.endsWith("$")) && cl.loadClass(f.superclassName()).isAssignableFrom(cls) && - cls.getConstructors.count(c => c.getParameterCount == 0 && Modifier.isPublic(c.getModifiers)) == 1 + (f.isModule || cls.getConstructors.count(c => c.getParameterCount == 0 && Modifier.isPublic(c.getModifiers)) == 1) case f: AnnotatedFingerprint => val annotationCls = cl.loadClass(f.annotationName()).asInstanceOf[Class[Annotation]] (f.isModule == cls.getName.endsWith("$")) && - cls.getConstructors.count(c => c.getParameterCount == 0 && Modifier.isPublic(c.getModifiers)) == 1 && + (f.isModule || cls.getConstructors.count(c => c.getParameterCount == 0 && Modifier.isPublic(c.getModifiers)) == 1) ( cls.isAnnotationPresent(annotationCls) || cls.getDeclaredMethods.exists(_.isAnnotationPresent(annotationCls)) |