Skip to content

Commit 45afbcf

Browse files
committed
fix: Change to StrictLogging to work with native-image
1 parent d6a0491 commit 45afbcf

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

scripts/publish-native.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ function build_cmd() {
8080
local FLAGS='-O1'
8181
FLAGS+=' --enable-url-protocols=http,https,file,jar --enable-all-security-services'
8282
FLAGS+=' -H:+JNI -H:IncludeResourceBundles=com.sun.org.apache.xerces.internal.impl.msg.XMLMessages'
83-
# FLAGS+=' --delay-class-initialization-to-runtime=com.codacy.CodacyCoverageReporter'
84-
# FLAGS+=' --rerun-class-initialization-at-runtime=com.codacy.CodacyCoverageReporter'
83+
FLAGS+=' -H:+ReportExceptionStackTraces'
84+
# FLAGS+=' -H:+ReportUnsupportedElementsAtRuntime'
8585

8686
if [ "${OS_TARGET}" != "darwin" ]
8787
then
@@ -94,8 +94,8 @@ function build_cmd() {
9494
echo "Publishing ${APP_NAME} binary version ${VERSION} for ${OS_TARGET}"
9595
BINARY_NAME="${APP_NAME}-${OS_TARGET}-${VERSION}"
9696
BUILD_CMD="cd /tmp"
97-
# BUILD_CMD+=" && curl -Lq -o \$JAVA_HOME/jre/lib/ext/bcprov-jdk15on-161.jar https://www.bouncycastle.org/download/bcprov-jdk15on-161.jar"
9897
BUILD_CMD+=" && sed -i 's/^security\.provider/# security\.provider/g' \${JAVA_HOME}/jre/lib/security/java.security"
98+
# BUILD_CMD+=" && curl -Lq -o \$JAVA_HOME/jre/lib/ext/bcprov-jdk15on-161.jar https://www.bouncycastle.org/download/bcprov-jdk15on-161.jar"
9999
# BUILD_CMD+=" && echo -e '\nsecurity.provider.1=sun.security.provider.Sun\nsecurity.provider.2=sun.security.rsa.SunRsaSign\nsecurity.provider.3=org.bouncycastle.jce.provider.BouncyCastleProvider\nsecurity.provider.4=com.sun.net.ssl.internal.ssl.Provider\nsecurity.provider.5=com.sun.crypto.provider.SunJCE\nsecurity.provider.6=sun.security.jgss.SunProvider\nsecurity.provider.7=com.sun.security.sasl.Provider\nsecurity.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI\nsecurity.provider.9=sun.security.smartcardio.SunPCSC\n' >> \${JAVA_HOME}/jre/lib/security/java.security"
100100
BUILD_CMD+=" && echo -e '\nsecurity.provider.1=sun.security.provider.Sun\nsecurity.provider.2=sun.security.rsa.SunRsaSign\nsecurity.provider.3=com.sun.net.ssl.internal.ssl.Provider\nsecurity.provider.4=com.sun.crypto.provider.SunJCE\nsecurity.provider.5=sun.security.jgss.SunProvider\nsecurity.provider.6=com.sun.security.sasl.Provider\nsecurity.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI\nsecurity.provider.8=sun.security.smartcardio.SunPCSC\n' >> \${JAVA_HOME}/jre/lib/security/java.security"
101101
BUILD_CMD+=" && $(build_cmd ${BINARY_NAME} "${APP_MAIN_CLASS}" "$(app_classpath)")"

src/main/scala/com/codacy/CodacyCoverageReporter.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import com.codacy.configuration.parser.{CommandConfiguration, ConfigurationParsi
44
import com.codacy.di.Components
55
import com.codacy.helpers.LoggerHelper
66
import com.codacy.model.configuration.{FinalConfig, ReportConfig}
7-
import com.typesafe.scalalogging.LazyLogging
7+
import com.typesafe.scalalogging.StrictLogging
88

9-
object CodacyCoverageReporter extends ConfigurationParsingApp with LazyLogging {
9+
object CodacyCoverageReporter extends ConfigurationParsingApp with StrictLogging {
1010

1111
def run(commandConfig: CommandConfiguration): Unit = {
1212
val components = new Components(commandConfig)

src/main/scala/com/codacy/helpers/LoggerHelper.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ object LoggerHelper {
1010
logger.underlying
1111
.asInstanceOf[ch.qos.logback.classic.Logger]
1212
.setLevel(Level.DEBUG)
13+
} else {
14+
logger.underlying
15+
.asInstanceOf[ch.qos.logback.classic.Logger]
16+
.setLevel(Level.INFO)
1317
}
1418
}
1519

src/main/scala/com/codacy/rules/ConfigurationRules.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import cats.implicits._
66
import com.codacy.configuration.parser.{BaseCommandConfig, CommandConfiguration, Final, Report}
77
import com.codacy.helpers.LoggerHelper
88
import com.codacy.model.configuration.{BaseConfig, Configuration, FinalConfig, ReportConfig}
9-
import com.typesafe.scalalogging.LazyLogging
9+
import com.typesafe.scalalogging.StrictLogging
1010

1111
import scala.language.implicitConversions
1212
import scala.util.Try
1313

14-
class ConfigurationRules(cmdConfig: CommandConfiguration) extends LazyLogging {
14+
class ConfigurationRules(cmdConfig: CommandConfiguration) extends StrictLogging {
1515
private val publicApiBaseUrl = "https://api.codacy.com"
1616

1717
LoggerHelper.setLoggerLevel(logger, cmdConfig.baseConfig.debug)

src/main/scala/com/codacy/rules/ReportRules.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import com.codacy.helpers.LoggerHelper
1212
import com.codacy.model.configuration.{BaseConfig, Configuration, FinalConfig, ReportConfig}
1313
import com.codacy.parsers.CoverageParser
1414
import com.codacy.transformation.PathPrefixer
15-
import com.typesafe.scalalogging.LazyLogging
15+
import com.typesafe.scalalogging.StrictLogging
1616

1717
import scala.util.{Failure, Success}
1818

19-
class ReportRules(config: Configuration, coverageServices: => CoverageServices) extends LazyLogging {
19+
class ReportRules(config: Configuration, coverageServices: => CoverageServices) extends StrictLogging {
2020

2121
LoggerHelper.setLoggerLevel(logger, config.baseConfig.debug)
2222

0 commit comments

Comments
 (0)