Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transition to new group id for kotlin-logging #769

Merged
merged 3 commits into from
Oct 4, 2023
Merged

Transition to new group id for kotlin-logging #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b65d97e
Transition to new group id for `kotlin-logging`
fwendland Sep 27, 2023
23ce18d
Merge branch 'main' into fw/dep-transition-kotlin-logging
fwendland Sep 28, 2023
40cffad
Merge branch 'main' into fw/dep-transition-kotlin-logging
fwendland Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-backends/cpg/src/main/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/CPGConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package de.fraunhofer.aisec.codyze.backends.cpg

import de.fraunhofer.aisec.codyze.core.backend.BackendConfiguration
import de.fraunhofer.aisec.cpg.passes.Pass
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.nio.file.Path
import kotlin.reflect.KClass

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/coko/evaluators/OrderEvaluator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import de.fraunhofer.aisec.codyze.specificationLanguages.coko.core.ordering.*
import de.fraunhofer.aisec.cpg.graph.*
import de.fraunhofer.aisec.cpg.graph.declarations.VariableDeclaration
import de.fraunhofer.aisec.cpg.graph.statements.expressions.DeclaredReferenceExpression
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlin.reflect.full.createType
import kotlin.reflect.full.declaredMemberFunctions

Expand Down
2 changes: 1 addition & 1 deletion ...n/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/coko/ordering/CodyzeDfaOrderEvaluator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import de.fraunhofer.aisec.cpg.analysis.fsm.DFA
import de.fraunhofer.aisec.cpg.analysis.fsm.DFAOrderEvaluator
import de.fraunhofer.aisec.cpg.analysis.fsm.Edge
import de.fraunhofer.aisec.cpg.graph.Node
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlin.reflect.full.findAnnotation

val logger = KotlinLogging.logger {}
Expand Down
2 changes: 1 addition & 1 deletion ...ackends/cpg/src/test/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/CpgOptionGroupTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import de.fraunhofer.aisec.cpg.passes.CallResolver
import de.fraunhofer.aisec.cpg.passes.EdgeCachePass
import de.fraunhofer.aisec.cpg.passes.FilenameMapper
import de.fraunhofer.aisec.cpg.passes.Pass
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.junit.jupiter.api.*
import org.junit.jupiter.api.Test
import org.junit.jupiter.params.ParameterizedTest
Expand Down
2 changes: 1 addition & 1 deletion codyze-cli/src/main/kotlin/de/fraunhofer/aisec/codyze/cli/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package de.fraunhofer.aisec.codyze.cli
import com.github.ajalt.clikt.core.subcommands
import de.fraunhofer.aisec.codyze.core.backend.BackendCommand
import de.fraunhofer.aisec.codyze.core.executor.ExecutorCommand
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.koin.core.context.startKoin
import org.koin.java.KoinJavaComponent.getKoin
import java.nio.file.Path
Expand Down
2 changes: 1 addition & 1 deletion codyze-core/src/main/kotlin/de/fraunhofer/aisec/codyze/core/VersionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package de.fraunhofer.aisec.codyze.core

import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.util.*

private val logger = KotlinLogging.logger {}
Expand Down
2 changes: 1 addition & 1 deletion codyze-core/src/main/kotlin/de/fraunhofer/aisec/codyze/core/config/Configuration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package de.fraunhofer.aisec.codyze.core.config

import de.fraunhofer.aisec.codyze.core.output.OutputBuilder
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.nio.file.Path

private val logger = KotlinLogging.logger {}
Expand Down
2 changes: 1 addition & 1 deletion ...in/kotlin/de/fraunhofer/aisec/codyze/specificationLanguages/coko/dsl/CokoConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package de.fraunhofer.aisec.codyze.specificationLanguages.coko.dsl

import de.fraunhofer.aisec.codyze.core.executor.ExecutorConfiguration
import de.fraunhofer.aisec.codyze.specificationLanguages.coko.dsl.cli.validateSpec
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.nio.file.Path

private val logger = KotlinLogging.logger { }
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/kotlin/de/fraunhofer/aisec/codyze/specificationLanguages/coko/dsl/CokoScript.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package de.fraunhofer.aisec.codyze.specificationLanguages.coko.dsl

import de.fraunhofer.aisec.codyze.specificationLanguages.coko.core.CokoBackend
import de.fraunhofer.aisec.codyze.specificationLanguages.coko.core.dsl.Import
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.io.File
import kotlin.script.experimental.annotations.KotlinScript
import kotlin.script.experimental.api.*
Expand Down
2 changes: 1 addition & 1 deletion .../kotlin/de/fraunhofer/aisec/codyze/specificationLanguages/coko/dsl/cli/CokoOptionGroup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import com.github.ajalt.clikt.parameters.options.*
import com.github.ajalt.clikt.parameters.types.path
import de.fraunhofer.aisec.codyze.core.config.resolvePaths
import de.fraunhofer.aisec.codyze.core.executor.ExecutorOptions
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.nio.file.Path

private val logger = KotlinLogging.logger {}
Expand Down
2 changes: 1 addition & 1 deletion ...in/kotlin/de/fraunhofer/aisec/codyze/specificationLanguages/coko/dsl/host/CokoExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import de.fraunhofer.aisec.codyze.specificationLanguages.coko.dsl.CokoConfigurat
import de.fraunhofer.aisec.codyze.specificationLanguages.coko.dsl.CokoSarifBuilder
import de.fraunhofer.aisec.codyze.specificationLanguages.coko.dsl.CokoScript
import io.github.detekt.sarif4k.Run
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.nio.file.Path
import kotlin.script.experimental.api.*
import kotlin.script.experimental.api.SourceCode
Expand Down
2 changes: 1 addition & 1 deletion ...n/kotlin/de/fraunhofer/aisec/codyze/specificationLanguages/coko/dsl/host/SpecEvaluator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import de.fraunhofer.aisec.codyze.specificationLanguages.coko.core.CokoRule
import de.fraunhofer.aisec.codyze.specificationLanguages.coko.core.EvaluationContext
import de.fraunhofer.aisec.codyze.specificationLanguages.coko.core.Finding
import de.fraunhofer.aisec.codyze.specificationLanguages.coko.core.dsl.Rule
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlin.reflect.*
import kotlin.reflect.full.*

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cpg-language-java = { module = "de.fraunhofer.aisec:cpg-language-java", version.
#cpg-analysis = { module = "com.github.Fraunhofer-AISEC.cpg:cpg-analysis", version.ref = "cpg"}
#cpg-language-go = { module = "com.github.Fraunhofer-AISEC.cpg:cpg-language-go", version.ref = "cpg"}

kotlin-logging = { module = "io.github.microutils:kotlin-logging-jvm", version = "3.0.5"}
kotlin-logging = { module = "io.github.oshai:kotlin-logging-jvm", version = "5.1.0" }
log4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j18-impl", version = "2.18.0"}
clikt = { module = "com.github.ajalt.clikt:clikt", version = "4.2.1"}
koin = { module = "io.insert-koin:koin-core", version.ref = "koin"}
Expand Down