Skip to content

Commit

Permalink
Revert removal final newline (#5133)
Browse files Browse the repository at this point in the history
* Revert removal final newline

* Add to final newlin editorconfigoverride
  • Loading branch information
jack-berg authored Jan 18, 2023
1 parent 1e4a7be commit 8897dd4
Show file tree
Hide file tree
Showing 59 changed files with 62 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = false
insert_final_newline = true
max_line_length = 100
tab_width = 2
ij_continuation_indent_size = 4
Expand Down
2 changes: 1 addition & 1 deletion all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ tasks.named<JacocoReport>("jacocoTestReport") {
// without any external tools
html.required.set(true)
}
}
}
2 changes: 1 addition & 1 deletion api/all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ dependencies {
tasks.test {
// Configure environment variable for ConfigUtilTest
environment("CONFIG_KEY", "environment")
}
}
2 changes: 1 addition & 1 deletion api/logs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ otelJava.moduleName.set("io.opentelemetry.api.logs")

dependencies {
api(project(":api:all"))
}
}
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ tasks {
}
}
}
}
}
3 changes: 2 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ spotless {
"indent_size" to "2",
"continuation_indent_size" to "2",
"max_line_length" to "160",
"insert_final_newline" to "true",
"ktlint_standard_no-wildcard-imports" to "disabled",
// ktlint does not break up long lines, it just fails on them
"ktlint_standard_max-line-length" to "disabled",
Expand Down Expand Up @@ -61,4 +62,4 @@ tasks {
release.set(8)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ animalsniffer {
tasks.withType<AnimalSniffer> {
// always having declared output makes this task properly participate in tasks up-to-date checks
reports.text.required.set(true)
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ afterEvaluate {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@ tasks {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ configurations {
outgoing.artifact(the<JacocoTaskExtension>().destinationFile!!)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) {
}
}
}
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,4 @@ testing {
}
}
}
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/otel.jmh-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ tasks {

outputs.cacheIf { false }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ afterEvaluate {
add("compileProtoPath", platform(project(":dependencyManagement")))
add("testCompileProtoPath", platform(project(":dependencyManagement")))
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ if (System.getenv("CI") != null) {
useInMemoryPgpKeys(System.getenv("GPG_PRIVATE_KEY"), System.getenv("GPG_PASSWORD"))
sign(publishing.publications["mavenPublication"])
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ spotless {
"indent_size" to "2",
"continuation_indent_size" to "2",
"max_line_length" to "160",
"insert_final_newline" to "true",
"ktlint_standard_no-wildcard-imports" to "disabled",
// ktlint does not break up long lines, it just fails on them
"ktlint_standard_max-line-length" to "disabled",
Expand All @@ -42,6 +43,7 @@ spotless {
"indent_size" to "2",
"continuation_indent_size" to "2",
"max_line_length" to "160",
"insert_final_newline" to "true",
"ktlint_standard_no-wildcard-imports" to "disabled",
// ktlint does not break up long lines, it just fails on them
"ktlint_standard_max-line-length" to "disabled",
Expand All @@ -68,4 +70,4 @@ spotless {
trimTrailingWhitespace()
endWithNewline()
}
}
}
2 changes: 1 addition & 1 deletion context/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ tasks {
check {
dependsOn(testing.suites)
}
}
}
2 changes: 1 addition & 1 deletion exporters/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ dependencies {
testImplementation("com.google.api.grpc:proto-google-common-protos")
testImplementation("io.grpc:grpc-testing")
testRuntimeOnly("io.grpc:grpc-netty-shaded")
}
}
2 changes: 1 addition & 1 deletion exporters/jaeger-proto/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ tasks {
compilerArgs.add("-Xlint:-serial")
}
}
}
}
2 changes: 1 addition & 1 deletion exporters/jaeger-thrift/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ dependencies {
testImplementation("com.google.guava:guava-testlib")

testImplementation(project(":sdk:testing"))
}
}
2 changes: 1 addition & 1 deletion exporters/jaeger/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ sourceSets {
main {
java.srcDir("$buildDir/generated/source/wire")
}
}
}
2 changes: 1 addition & 1 deletion exporters/logging-otlp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ dependencies {
testImplementation(project(":sdk:trace"))

testImplementation("org.skyscreamer:jsonassert")
}
}
2 changes: 1 addition & 1 deletion exporters/logging/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies {

testImplementation(project(":sdk:testing"))
testImplementation(project(":sdk:logs-testing"))
}
}
2 changes: 1 addition & 1 deletion exporters/otlp/all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ tasks {
},
)
}
}
}
2 changes: 1 addition & 1 deletion exporters/otlp/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ sourceSets {
main {
java.srcDir("$buildDir/generated/source/wire")
}
}
}
2 changes: 1 addition & 1 deletion exporters/otlp/logs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ tasks {
named("check") {
dependsOn(testing.suites)
}
}
}
2 changes: 1 addition & 1 deletion exporters/otlp/testing-internal/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ dependencies {
implementation("com.linecorp.armeria:armeria-junit5")
implementation("io.github.netmikey.logunit:logunit-jul")
implementation("org.assertj:assertj-core")
}
}
2 changes: 1 addition & 1 deletion exporters/prometheus/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ tasks {
compilerArgs.add("--add-reads=io.opentelemetry.exporters.prometheus.test=org.junit.jupiter.api")
}
}
}
}
2 changes: 1 addition & 1 deletion exporters/zipkin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ dependencies {

testImplementation("com.linecorp.armeria:armeria")
testImplementation("org.testcontainers:junit-jupiter")
}
}
2 changes: 1 addition & 1 deletion extensions/incubator/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ dependencies {
api(project(":api:all"))

testImplementation(project(":sdk:testing"))
}
}
2 changes: 1 addition & 1 deletion extensions/kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ tasks {
check {
dependsOn(testing.suites)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ fun CoroutineContext.getOpenTelemetryContext(): Context {
return element.context
}
return Context.root()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ class KotlinCoroutinesTest {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,4 @@ class StrictContextWithCoroutinesTest {
assertThat(Context.current().get(ANIMAL)).isEqualTo(animal)
}
}
}
}
2 changes: 1 addition & 1 deletion extensions/trace-propagators/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ dependencies {

testImplementation("io.jaegertracing:jaeger-client")
testImplementation("com.google.guava:guava")
}
}
2 changes: 1 addition & 1 deletion integration-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ dependencies {
testImplementation("com.linecorp.armeria:armeria-junit5")
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("org.testcontainers:junit-jupiter")
}
}
2 changes: 1 addition & 1 deletion integration-tests/graal/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ graalvmNative {
}
}
toolchainDetection.set(false)
}
}
2 changes: 1 addition & 1 deletion integration-tests/otlp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ tasks {
check {
dependsOn(testing.suites)
}
}
}
2 changes: 1 addition & 1 deletion integration-tests/tracecontext/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ tasks {

jvmArgs("-Dio.opentelemetry.testArchive=${shadowJar.get().archiveFile.get().asFile.absolutePath}")
}
}
}
2 changes: 1 addition & 1 deletion opencensus-shim/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ tasks.named<Test>("test") {
// methods available.
setForkEvery(1)
maxParallelForks = 3
}
}
2 changes: 1 addition & 1 deletion opentracing-shim/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ tasks {
showStandardStreams = true
}
}
}
}
2 changes: 1 addition & 1 deletion perf-harness/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies {
implementation("org.testcontainers:junit-jupiter")

runtimeOnly("io.grpc:grpc-netty-shaded")
}
}
2 changes: 1 addition & 1 deletion sdk-extensions/autoconfigure-spi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ dependencies {
// implementation dependency to require users to add the artifact directly to their build to use
// SdkLoggerProviderBuilder.
implementation(project(":sdk:logs"))
}
}
2 changes: 1 addition & 1 deletion sdk-extensions/autoconfigure/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ tasks {
check {
dependsOn(testing.suites)
}
}
}
2 changes: 1 addition & 1 deletion sdk-extensions/incubator/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ dependencies {
testImplementation(project(":sdk-extensions:autoconfigure"))

testImplementation("com.google.guava:guava-testlib")
}
}
2 changes: 1 addition & 1 deletion sdk-extensions/jaeger-remote-sampler/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ tasks {
compilerArgs.add("-Xlint:-serial")
}
}
}
}
2 changes: 1 addition & 1 deletion sdk/all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ dependencies {
testAnnotationProcessor("com.google.auto.value:auto-value")

testImplementation(project(":sdk:testing"))
}
}
2 changes: 1 addition & 1 deletion sdk/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ tasks {
check {
dependsOn(testing.suites)
}
}
}
2 changes: 1 addition & 1 deletion sdk/logs-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ dependencies {
testImplementation(project(":sdk:logs-testing"))

testImplementation("junit:junit")
}
}
2 changes: 1 addition & 1 deletion sdk/logs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies {
testImplementation("org.awaitility:awaitility")

annotationProcessor("com.google.auto.value:auto-value")
}
}
2 changes: 1 addition & 1 deletion sdk/metrics-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies {
annotationProcessor("com.google.auto.value:auto-value")

testImplementation("junit:junit")
}
}
2 changes: 1 addition & 1 deletion sdk/metrics/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ tasks {
check {
dependsOn(testing.suites)
}
}
}
2 changes: 1 addition & 1 deletion sdk/testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ dependencies {

testImplementation("junit:junit")
testImplementation("org.junit.vintage:junit-vintage-engine")
}
}
Loading

0 comments on commit 8897dd4

Please sign in to comment.