From 11122c48452d40eb32086fa247ce06d5d6f1a789 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 9 Apr 2018 01:29:14 -0700 Subject: Caffeine junit & testng suites seem to pass --- scalalib/src/mill/scalalib/Lib.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scalalib') 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)) -- cgit v1.2.3