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.

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

Fixed losing previous values in MDC #187

Merged
merged 3 commits into from
Aug 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .editorconfig
Expand Up @@ -4,9 +4,11 @@ root = true
[*]
end_of_line = lf
insert_final_newline = true
max_line_length = 150
; Tab indentation (no size specified)
indent_style = space
charset = utf-8
indent_size = 4


[*.yml]
indent_size = 2
11 changes: 5 additions & 6 deletions .travis.yml
@@ -1,17 +1,16 @@

language: java
jdk:
- oraclejdk8
- oraclejdk8

dist: trusty

stages:
- name: build
- name: release
if: branch IN (release) AND type = push
- name: build
- name: release
if: branch IN (release) AND type = push

jobs:
include:
include:
- stage: build
script: ./gradlew clean build
- stage: release
Expand Down
28 changes: 28 additions & 0 deletions build.gradle.kts
@@ -1,9 +1,13 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL

plugins {
kotlin("multiplatform") version "1.5.21"
id("org.jetbrains.dokka") version "1.5.0"
`maven-publish`
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
signing
id("io.gitlab.arturbosch.detekt") version "1.18.0"
}

apply("versions.gradle.kts")
Expand Down Expand Up @@ -102,6 +106,19 @@ tasks {
dependsOn(dokkaHtml)
archiveClassifier.set("javadoc")
}

withType<Test> {
testLogging {
showStandardStreams = true
showExceptions = true
exceptionFormat = FULL
}
}
afterEvaluate {
check {
dependsOn(withType<Detekt>())
}
}
}

publishing {
Expand Down Expand Up @@ -140,3 +157,14 @@ signing {
useInMemoryPgpKeys(signingKey, signingPassword)
sign(publishing.publications)
}

detekt {
buildUponDefaultConfig = true
config = files(rootDir.resolve("detekt.yml"))
parallel = true

reports {
html.enabled = false
txt.enabled = false
}
}
12 changes: 12 additions & 0 deletions detekt.yml
@@ -0,0 +1,12 @@
# https://github.com/detekt/detekt/blob/main/detekt-core/src/main/resources/default-detekt-config.yml

build:
maxIssues: 13

formatting:
MaximumLineLength:
maxLineLength: 150

style:
MaxLineLength:
maxLineLength: 150
2 changes: 1 addition & 1 deletion gradle.properties
@@ -1,5 +1,5 @@
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.mpp.stability.nowarn=true
kotlin.native.ignoreDisabledTargets=true

# workaround for https://github.com/gradle/gradle/issues/11412
systemProp.org.gradle.internal.publish.checksums.insecure=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists