diff --git a/settings.gradle.kts b/settings.gradle.kts index 54d5f1a9b2..0f127845a2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -125,6 +125,7 @@ include(":subprojects:logger:logger") include(":subprojects:logger:sentry-logger") include(":subprojects:logger:elastic-logger") include(":subprojects:logger:android-logger") +include(":subprojects:logger:slf4j-gradle-logger") include(":subprojects:delivery:artifactory-app-backup") include(":subprojects:delivery:cd") diff --git a/subprojects/assemble/build-checks/build.gradle.kts b/subprojects/assemble/build-checks/build.gradle.kts index 0ef5ba0758..617ffae44f 100644 --- a/subprojects/assemble/build-checks/build.gradle.kts +++ b/subprojects/assemble/build-checks/build.gradle.kts @@ -6,7 +6,6 @@ plugins { dependencies { implementation(projects.subprojects.gradle.buildFailer) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.android) implementation(projects.subprojects.gradle.impactShared) implementation(projects.subprojects.assemble.buildMetricsTracker) diff --git a/subprojects/assemble/build-checks/locking/gradle.lockfile b/subprojects/assemble/build-checks/locking/gradle.lockfile index 0fbfbe0a03..628f60be10 100644 --- a/subprojects/assemble/build-checks/locking/gradle.lockfile +++ b/subprojects/assemble/build-checks/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=compileClasspath,gradleTestCompileClasspath, com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.gundy:semver4j:0.16.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -64,13 +63,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -101,7 +97,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -179,7 +174,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/BuildChecksTestProjectRunner.kt b/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/BuildChecksTestProjectRunner.kt index dd5657372f..3376ca9ef7 100644 --- a/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/BuildChecksTestProjectRunner.kt +++ b/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/BuildChecksTestProjectRunner.kt @@ -43,7 +43,6 @@ internal class BuildChecksTestProjectRunner( } TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-checks") }, modules = listOf( diff --git a/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/ConfigurationCacheCompatibilityTest.kt b/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/ConfigurationCacheCompatibilityTest.kt index 1c787f49cb..173d755ac1 100644 --- a/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/ConfigurationCacheCompatibilityTest.kt @@ -15,7 +15,6 @@ internal class ConfigurationCacheCompatibilityTest { TestProjectGenerator( name = "rootapp", plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-checks") }, buildGradleExtra = """ diff --git a/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/unique_app_res/UniqueAppResourcesTest.kt b/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/unique_app_res/UniqueAppResourcesTest.kt index 497d8e1aee..a74861a64b 100644 --- a/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/unique_app_res/UniqueAppResourcesTest.kt +++ b/subprojects/assemble/build-checks/src/gradleTest/kotlin/com/avito/android/build_checks/unique_app_res/UniqueAppResourcesTest.kt @@ -26,7 +26,6 @@ internal class UniqueAppResourcesTest { fun `success - unique resources`() { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( @@ -77,7 +76,6 @@ internal class UniqueAppResourcesTest { } TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( @@ -129,7 +127,6 @@ internal class UniqueAppResourcesTest { } TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( @@ -182,7 +179,6 @@ internal class UniqueAppResourcesTest { } TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( @@ -222,7 +218,6 @@ internal class UniqueAppResourcesTest { fun `fail - invalid resource type in a config`() { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( diff --git a/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/BuildParamCheckPlugin.kt b/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/BuildParamCheckPlugin.kt index 60b2988179..310937b849 100644 --- a/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/BuildParamCheckPlugin.kt +++ b/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/BuildParamCheckPlugin.kt @@ -15,8 +15,6 @@ import com.avito.android.build_checks.internal.unique_app_res.UniqueAppResources import com.avito.android.build_checks.internal.unique_r.UniqueRClassesTaskCreator import com.avito.android.withAndroidApp import com.avito.kotlin.dsl.isRoot -import com.avito.logger.GradleLoggerPlugin -import com.avito.logger.create import org.gradle.api.JavaVersion import org.gradle.api.Plugin import org.gradle.api.Project @@ -57,9 +55,7 @@ public open class BuildParamCheckPlugin : Plugin { val envInfo = BuildEnvironmentInfo(project.providers) project.afterEvaluate { - val loggerFactory = GradleLoggerPlugin.getLoggerFactory(project).get() - val logger = loggerFactory.create() - BuildEnvLogger(project, logger, envInfo).log() + BuildEnvLogger(project, envInfo).log() val checks = extension.enabledChecks() checks.filterIsInstance() diff --git a/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/CheckMode.kt b/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/CheckMode.kt deleted file mode 100644 index 8abab29818..0000000000 --- a/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/CheckMode.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.avito.android.build_checks - -import com.avito.android.build_checks.internal.CheckResult -import com.avito.logger.Logger -import com.avito.utils.BuildFailer - -// TODO: support mode in all checks -public enum class CheckMode { - - NONE { - override fun check( - buildFailer: BuildFailer, - logger: Logger, - block: () -> CheckResult - ) { - // do nothing - } - }, - WARNING { - override fun check( - buildFailer: BuildFailer, - logger: Logger, - block: () -> CheckResult - ) { - when (val result = block()) { - is CheckResult.Failed -> logger.warn(result.message) - } - } - }, - FAIL { - override fun check( - buildFailer: BuildFailer, - logger: Logger, - block: () -> CheckResult - ) { - when (val result = block()) { - is CheckResult.Failed -> buildFailer.failBuild(result.message) - } - } - }; - - internal abstract fun check( - buildFailer: BuildFailer, - logger: Logger, - block: () -> CheckResult - ) -} diff --git a/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/internal/BuildEnvLogger.kt b/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/internal/BuildEnvLogger.kt index a81276b83c..91855569ff 100644 --- a/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/internal/BuildEnvLogger.kt +++ b/subprojects/assemble/build-checks/src/main/kotlin/com/avito/android/build_checks/internal/BuildEnvLogger.kt @@ -3,7 +3,6 @@ package com.avito.android.build_checks.internal import com.avito.android.AndroidSdk import com.avito.kotlin.dsl.getBooleanProperty import com.avito.kotlin.dsl.getOptionalStringProperty -import com.avito.logger.Logger import com.avito.utils.gradle.buildEnvironment import org.gradle.api.Project import org.gradle.api.invocation.Gradle @@ -11,7 +10,6 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion internal class BuildEnvLogger( private val project: Project, - private val logger: Logger, private val envInfo: BuildEnvironmentInfo, ) { @@ -22,7 +20,7 @@ internal class BuildEnvLogger( val kaptMapDiagnosticLocations = project.getBooleanProperty("kaptMapDiagnosticLocations") val javaIncrementalCompilation = project.getBooleanProperty("javaIncrementalCompilation") - logger.info( + project.logger.info( """Config information for project: ${project.displayName}: BuildEnvironment: ${project.buildEnvironment} ${startParametersDescription(project.gradle)} diff --git a/subprojects/assemble/build-metrics/build.gradle.kts b/subprojects/assemble/build-metrics/build.gradle.kts index 755668cbbd..98a93b4eec 100644 --- a/subprojects/assemble/build-metrics/build.gradle.kts +++ b/subprojects/assemble/build-metrics/build.gradle.kts @@ -7,7 +7,6 @@ plugins { dependencies { implementation(projects.subprojects.common.math) implementation(projects.subprojects.gradle.buildEnvironment) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.assemble.gradleProfile) implementation(projects.subprojects.assemble.criticalPath.api) implementation(projects.subprojects.assemble.buildMetricsTracker) @@ -22,7 +21,6 @@ dependencies { testImplementation(libs.mockitoKotlin) testImplementation(libs.mockitoJUnitJupiter) testImplementation(testFixtures(projects.subprojects.common.graphite)) - testImplementation(testFixtures(projects.subprojects.logger.logger)) testImplementation(testFixtures(projects.subprojects.common.statsd)) testImplementation(testFixtures(projects.subprojects.gradle.buildEnvironment)) @@ -30,7 +28,6 @@ dependencies { gradleTestImplementation(projects.subprojects.common.testOkhttp) gradleTestImplementation(projects.subprojects.gradle.testProject) gradleTestImplementation(projects.subprojects.gradle.git) - gradleTestImplementation(testFixtures(projects.subprojects.logger.logger)) } gradlePlugin { diff --git a/subprojects/assemble/build-metrics/locking/gradle.lockfile b/subprojects/assemble/build-metrics/locking/gradle.lockfile index a4b8af45d7..68f03393ff 100644 --- a/subprojects/assemble/build-metrics/locking/gradle.lockfile +++ b/subprojects/assemble/build-metrics/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.gundy:semver4j:0.16.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=gradleTestRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -68,15 +67,13 @@ com.googlecode.json-simple:json-simple:1.1=gradleTestCompileOnly,gradleTestRunti com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.jakewharton.retrofit:retrofit1-okhttp3-client:1.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:3.0.1=compileClasspath,gradleTestCompileOnlyDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.0.1=compileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:1.6.0=compileClasspath,gradleTestCompileOnlyDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.6.0=compileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.retrofit:retrofit:1.9.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -107,7 +104,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -196,8 +192,7 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.12=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.12=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt index fe800c4559..449b543b29 100644 --- a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt +++ b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt @@ -24,17 +24,11 @@ internal class BuildMetricsPluginTest { TestProjectGenerator( name = rootAppName, plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-metrics") }, modules = listOf( AndroidAppModule(name = "app") ), - buildGradleExtra = """ - |gradleLogger { - | printlnHandler(false, com.avito.logger.LogLevel.DEBUG) - |} - """.trimMargin() ).generateIn(tempDir) } diff --git a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsRunner.kt b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsRunner.kt index 2c3c1a7ae1..95b4fd38ac 100644 --- a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsRunner.kt +++ b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsRunner.kt @@ -14,6 +14,7 @@ internal class BuildMetricsRunner( *args.toTypedArray(), "-Pavito.build.metrics.enabled=true", "-Pavito.stats.enabled=false", + "-Pstatsd.test" ) } } diff --git a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/ConfigurationCacheCompatibilityTest.kt b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/ConfigurationCacheCompatibilityTest.kt index 1adbdae413..ac25227242 100644 --- a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/ConfigurationCacheCompatibilityTest.kt @@ -16,7 +16,6 @@ internal class ConfigurationCacheCompatibilityTest { TestProjectGenerator( name = "rootapp", plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-metrics") }, modules = listOf( diff --git a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/StatsdMetrics.kt b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/StatsdMetrics.kt index 62927a406b..7af99056dc 100644 --- a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/StatsdMetrics.kt +++ b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/StatsdMetrics.kt @@ -9,7 +9,7 @@ import com.avito.android.stats.TimeMetric import com.avito.test.gradle.TestResult import com.google.common.truth.Truth.assertWithMessage -private const val loggerPrefix = "[StatsDSender@:] " +private const val loggerPrefix = "[StatsDSender] " internal inline fun TestResult.assertHasMetric(path: String): T { val type = T::class.java diff --git a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTest.kt b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTest.kt index b0bf5b2a0d..76c72f1655 100644 --- a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTest.kt +++ b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTest.kt @@ -14,14 +14,9 @@ internal class BuildCacheMetricsTest : BuildCacheTestFixture() { File(projectDir, "build.gradle.kts").writeText( """ plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-metrics") } - gradleLogger { - printlnHandler(false, com.avito.logger.LogLevel.DEBUG) - } - @CacheableTask abstract class CustomTask @Inject constructor(objects: ObjectFactory) : DefaultTask() { diff --git a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/HttpBuildCacheMetricsTest.kt b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/HttpBuildCacheMetricsTest.kt index 20cb138af5..86035cf4dd 100644 --- a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/HttpBuildCacheMetricsTest.kt +++ b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/cache/HttpBuildCacheMetricsTest.kt @@ -60,12 +60,8 @@ internal class HttpBuildCacheMetricsTest : HttpBuildCacheTestFixture() { File(projectDir, "build.gradle.kts").writeText( """ plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-metrics") } - gradleLogger { - printlnHandler(false, com.avito.logger.LogLevel.DEBUG) - } @CacheableTask abstract class CustomTask @Inject constructor(objects: ObjectFactory) : DefaultTask() { diff --git a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/tasks/TasksMetricsTest.kt b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/tasks/TasksMetricsTest.kt index 776536d720..bfe7b9b449 100644 --- a/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/tasks/TasksMetricsTest.kt +++ b/subprojects/assemble/build-metrics/src/gradleTest/kotlin/com/avito/android/plugin/build_metrics/tasks/TasksMetricsTest.kt @@ -20,14 +20,8 @@ internal class TasksMetricsTest { this.projectDir = tempDir TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-metrics") }, - buildGradleExtra = """ - |gradleLogger { - | printlnHandler(false, com.avito.logger.LogLevel.DEBUG) - |} - """.trimMargin(), modules = listOf( KotlinModule(name = "lib") ) diff --git a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt index aa100bd370..481f00f6a7 100644 --- a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt +++ b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt @@ -8,14 +8,12 @@ import com.avito.android.plugin.build_metrics.internal.AppBuildTimeListener import com.avito.android.plugin.build_metrics.internal.BuildOperationsResultProvider import com.avito.android.plugin.build_metrics.internal.CompositeBuildMetricsListener import com.avito.android.plugin.build_metrics.internal.ConfigurationTimeListener -import com.avito.android.plugin.build_metrics.internal.LazyBuildEventsListener import com.avito.android.plugin.build_metrics.internal.TotalBuildTimeListener import com.avito.android.plugin.build_metrics.internal.tasks.CriticalPathMetricsTracker import com.avito.android.sentry.environmentInfo import com.avito.android.stats.statsd import com.avito.kotlin.dsl.getOptionalStringProperty import com.avito.kotlin.dsl.isRoot -import com.avito.logger.GradleLoggerPlugin import com.avito.teamcity.teamcityCredentials import org.gradle.api.Plugin import org.gradle.api.Project @@ -35,43 +33,30 @@ public open class BuildMetricsPlugin : Plugin { project.tasks.register("collectTeamcityMetrics") { buildId.set(project.getOptionalStringProperty("avito.build.metrics.teamcityBuildId")) - this.loggerFactory.set( - GradleLoggerPlugin.getLoggerFactory(this) - ) this.teamcityCredentials.set(project.teamcityCredentials) this.graphiteConfig.set(project.graphiteConfig) } - /** - * Laziness because of LoggerService - */ - val lazyMetricTracker = lazy { - BuildMetricTracker( - project.environmentInfo().get(), - project.statsd.get() - ) - } + val buildMetricTracker = BuildMetricTracker( + project.environmentInfo().get(), + project.statsd.get() + ) - val buildOperationsListener = BuildOperationsResultProvider.register(project, lazyMetricTracker) + val buildOperationsListener = BuildOperationsResultProvider.register(project, buildMetricTracker) - val eventsListeners = listOf( - /** - * Laziness because of LoggerService - */ - LazyBuildEventsListener(lazy { - val metricTracker = lazyMetricTracker.value - val criticalPathTracker = CriticalPathMetricsTracker(metricTracker) - CriticalPathRegistry.addListener(project, criticalPathTracker) + val criticalPathTracker = CriticalPathMetricsTracker(buildMetricTracker) + CriticalPathRegistry.addListener(project, criticalPathTracker) - val buildListeners = listOf( - ConfigurationTimeListener(metricTracker), - TotalBuildTimeListener(metricTracker), - AppBuildTimeListener.from(project, metricTracker) - ) - CompositeBuildMetricsListener( - listeners = buildListeners, - ) - }), + val buildListeners = listOf( + ConfigurationTimeListener(buildMetricTracker), + TotalBuildTimeListener(buildMetricTracker), + AppBuildTimeListener.from(project, buildMetricTracker) + ) + + val eventsListeners = listOf( + CompositeBuildMetricsListener( + listeners = buildListeners, + ), buildOperationsListener ) GradleCollector.initialize( diff --git a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsTask.kt b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsTask.kt index 37871f28aa..1e7ce36577 100644 --- a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsTask.kt +++ b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsTask.kt @@ -4,13 +4,11 @@ import com.avito.android.graphite.GraphiteConfig import com.avito.android.graphite.GraphiteSender import com.avito.android.plugin.build_metrics.internal.teamcity.CollectTeamcityMetricsAction import com.avito.gradle.worker.inMemoryWork -import com.avito.logger.LoggerFactory import com.avito.teamcity.TeamcityApi import com.avito.teamcity.TeamcityCredentials import org.gradle.api.DefaultTask import org.gradle.api.provider.Property import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.workers.WorkerExecutor import javax.inject.Inject @@ -28,9 +26,6 @@ public abstract class CollectTeamcityMetricsTask @Inject constructor( @get:Input public abstract val teamcityCredentials: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun action() { val buildId: String? = buildId.orNull @@ -52,8 +47,7 @@ public abstract class CollectTeamcityMetricsTask @Inject constructor( private fun graphiteSender(): GraphiteSender { return GraphiteSender.create( - config = graphiteConfig.get(), - loggerFactory = loggerFactory.get() + config = graphiteConfig.get() ) } } diff --git a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/BuildOperationsResultProvider.kt b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/BuildOperationsResultProvider.kt index 1ccca5a289..73c2f9fe22 100644 --- a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/BuildOperationsResultProvider.kt +++ b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/BuildOperationsResultProvider.kt @@ -4,7 +4,6 @@ import com.avito.android.build_metrics.BuildMetricTracker import com.avito.android.gradle.metric.BuildEventsListener import com.avito.android.plugin.build_metrics.internal.cache.BuildCacheMetricsTracker import com.avito.android.plugin.build_metrics.internal.tasks.SlowTasksMetricsTracker -import com.avito.logger.GradleLoggerPlugin import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.internal.project.ProjectInternal @@ -189,31 +188,24 @@ internal class BuildOperationsResultProvider( fun register( project: Project, - metricsTracker: Lazy + metricsTracker: BuildMetricTracker ): BuildEventsListener { + val listeners = mutableListOf() + if (canTrackRemoteCache(project)) { + listeners.add( + BuildCacheMetricsTracker( + metricsTracker = metricsTracker, + logger = project.logger + ) + ) + } + listeners.add( + SlowTasksMetricsTracker( + metricsTracker = metricsTracker, + ) + ) val buildOperationListener = BuildOperationsResultProvider( - /** - * Laziness because of LoggerService - */ - resultListener = LazyBuildOperationsResultListener( - lazy { - val loggerFactory = GradleLoggerPlugin.getLoggerFactory(project) - val listeners = mutableListOf() - if (canTrackRemoteCache(project)) { - listeners.add( - BuildCacheMetricsTracker( - metricsTracker = metricsTracker.value, - loggerFactory = loggerFactory.get() - ) - ) - } - listeners.add( - SlowTasksMetricsTracker( - metricsTracker = metricsTracker.value, - ) - ) - CompositeBuildOperationsResultListener(listeners) - }), + resultListener = CompositeBuildOperationsResultListener(listeners), ) project.gradle.buildOperationListenerManager().addListener(buildOperationListener) diff --git a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/LazyBuildEventsListener.kt b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/LazyBuildEventsListener.kt deleted file mode 100644 index dcebd6d9ad..0000000000 --- a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/LazyBuildEventsListener.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.avito.android.plugin.build_metrics.internal - -import com.avito.android.gradle.metric.AbstractBuildEventsListener -import com.avito.android.gradle.metric.BuildEventsListener -import com.avito.android.gradle.profile.BuildProfile -import com.avito.android.gradle.profile.TaskExecution -import org.gradle.BuildResult -import org.gradle.api.Task - -internal class LazyBuildEventsListener( - private val listener: Lazy -) : AbstractBuildEventsListener() { - override fun buildFinished(buildResult: BuildResult, profile: BuildProfile) { - listener.value.buildFinished(buildResult, profile) - } - - override fun beforeExecute(task: Task) { - listener.value.beforeExecute(task) - } - - override fun afterExecute(task: Task, state: TaskExecution) { - listener.value.afterExecute(task, state) - } -} diff --git a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/LazyBuildOperationsResultListener.kt b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/LazyBuildOperationsResultListener.kt deleted file mode 100644 index 0b015240f4..0000000000 --- a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/LazyBuildOperationsResultListener.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.avito.android.plugin.build_metrics.internal - -internal class LazyBuildOperationsResultListener( - private val listener: Lazy -) : BuildOperationsResultListener { - override fun onBuildFinished(result: BuildOperationsResult) { - listener.value.onBuildFinished(result) - } -} diff --git a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/cache/BuildCacheMetricsTracker.kt b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/cache/BuildCacheMetricsTracker.kt index b04fdbc083..bd2b7a042b 100644 --- a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/cache/BuildCacheMetricsTracker.kt +++ b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/cache/BuildCacheMetricsTracker.kt @@ -10,15 +10,13 @@ import com.avito.android.plugin.build_metrics.internal.TaskCacheResult import com.avito.android.plugin.build_metrics.internal.TaskExecutionResult import com.avito.android.stats.CountMetric import com.avito.android.stats.SeriesName -import com.avito.logger.LoggerFactory +import org.slf4j.Logger internal class BuildCacheMetricsTracker( private val metricsTracker: BuildMetricTracker, - loggerFactory: LoggerFactory + private val logger: Logger, ) : BuildOperationsResultListener { - private val logger = loggerFactory.create(BuildCacheMetricsTracker::class.java.simpleName) - override fun onBuildFinished(result: BuildOperationsResult) { trackCacheErrors(result.cacheOperations) trackRemoteCacheStats(result.tasksExecutions) @@ -31,6 +29,7 @@ internal class BuildCacheMetricsTracker( STORE -> "store" } if (error.httpStatus == null) { + // TODO handle httpStatus null logger.warn("Unknown cache $operationType error", error.cause) } val metricName = if (error.httpStatus != null) { diff --git a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/teamcity/CollectTeamcityMetricsAction.kt b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/teamcity/CollectTeamcityMetricsAction.kt index d51d2cfc6f..5b2d05c1dd 100644 --- a/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/teamcity/CollectTeamcityMetricsAction.kt +++ b/subprojects/assemble/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/internal/teamcity/CollectTeamcityMetricsAction.kt @@ -43,12 +43,16 @@ internal class CollectTeamcityMetricsAction( "_" ) - graphite.send( - GraphiteMetric( - path.toString(), - duration.seconds.toString(), - build.startDateTime!!.toEpochSecond() + try { + graphite.send( + GraphiteMetric( + path.toString(), + duration.seconds.toString(), + build.startDateTime!!.toEpochSecond() + ) ) - ) + } catch (e: Exception) { + // TODO send alert + } } } diff --git a/subprojects/assemble/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTrackerTest.kt b/subprojects/assemble/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTrackerTest.kt index 69735a24b2..7aae50ef5c 100644 --- a/subprojects/assemble/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTrackerTest.kt +++ b/subprojects/assemble/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/cache/BuildCacheMetricsTrackerTest.kt @@ -14,12 +14,12 @@ import com.avito.android.stats.CountMetric import com.avito.android.stats.SeriesName import com.avito.android.stats.StatsMetric import com.avito.android.stats.StubStatsdSender -import com.avito.logger.PrintlnLoggerFactory import com.avito.utils.gradle.Environment import com.google.common.truth.Truth.assertThat import org.gradle.api.Task import org.gradle.util.Path import org.junit.jupiter.api.Test +import org.slf4j.LoggerFactory internal class BuildCacheMetricsTrackerTest { @@ -123,10 +123,11 @@ internal class BuildCacheMetricsTrackerTest { private fun processResults(result: BuildOperationsResult): List { val statsd = StubStatsdSender() - val loggerFactory = PrintlnLoggerFactory val metricsTracker = BuildMetricTracker(envInfo, statsd) - val listener = BuildCacheMetricsTracker(metricsTracker, loggerFactory) + val listener = BuildCacheMetricsTracker( + metricsTracker, LoggerFactory.getLogger(BuildCacheMetricsTracker::class.java) + ) listener.onBuildFinished(result) return statsd.getSentMetrics() diff --git a/subprojects/assemble/build-properties/build.gradle.kts b/subprojects/assemble/build-properties/build.gradle.kts index 91c385ea2a..7a3fa3b6bd 100644 --- a/subprojects/assemble/build-properties/build.gradle.kts +++ b/subprojects/assemble/build-properties/build.gradle.kts @@ -7,7 +7,6 @@ plugins { dependencies { implementation(projects.subprojects.gradle.android) implementation(projects.subprojects.gradle.preBuild) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.gradleExtensions) gradleTestImplementation(projects.subprojects.gradle.testProject) diff --git a/subprojects/assemble/build-properties/locking/gradle.lockfile b/subprojects/assemble/build-properties/locking/gradle.lockfile index 6c67d4a244..80ba31ebf6 100644 --- a/subprojects/assemble/build-properties/locking/gradle.lockfile +++ b/subprojects/assemble/build-properties/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.2=gradleTestCompileOnly,runtimeClasspath @@ -63,13 +62,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -97,7 +93,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -160,7 +155,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/assemble/build-trace/build.gradle.kts b/subprojects/assemble/build-trace/build.gradle.kts index 0c2c5e87fb..afc63dde33 100644 --- a/subprojects/assemble/build-trace/build.gradle.kts +++ b/subprojects/assemble/build-trace/build.gradle.kts @@ -5,7 +5,6 @@ plugins { } dependencies { - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.gradleExtensions) implementation(projects.subprojects.assemble.criticalPath.api) implementation(projects.subprojects.common.traceEvent) @@ -16,7 +15,6 @@ dependencies { implementation(gradleApi()) gradleTestImplementation(projects.subprojects.gradle.testProject) - gradleTestImplementation(testFixtures(projects.subprojects.logger.logger)) } gradlePlugin { diff --git a/subprojects/assemble/build-trace/locking/gradle.lockfile b/subprojects/assemble/build-trace/locking/gradle.lockfile index 6f5bd74820..3384e322f8 100644 --- a/subprojects/assemble/build-trace/locking/gradle.lockfile +++ b/subprojects/assemble/build-trace/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=gradleTestRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestRuntimeClasspath com.android.tools:sdklib:30.0.2=gradleTestRuntimeClasspath com.android:signflinger:7.0.2=gradleTestRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -63,13 +62,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestRuntimeClasspath @@ -97,7 +93,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=gradleTestRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestRuntimeClasspath @@ -162,7 +157,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-tree:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm:7.0=gradleTestRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestRuntimeClasspath diff --git a/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/BuildTraceTest.kt b/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/BuildTraceTest.kt index 0317bd61a1..c752aa2c75 100644 --- a/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/BuildTraceTest.kt +++ b/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/BuildTraceTest.kt @@ -72,7 +72,6 @@ internal class BuildTraceTest { File(projectDir, "build.gradle.kts").writeText( """ plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-trace") } buildTrace { diff --git a/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/ConfigurationCacheCompatibilityTest.kt b/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/ConfigurationCacheCompatibilityTest.kt index 67aec90c88..79abab4432 100644 --- a/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/assemble/build-trace/src/gradleTest/kotlin/com/avito/android/build_trace/ConfigurationCacheCompatibilityTest.kt @@ -16,7 +16,6 @@ internal class ConfigurationCacheCompatibilityTest { TestProjectGenerator( name = "rootapp", plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-trace") }, buildGradleExtra = """ diff --git a/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt b/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt index 6f7dfed17a..72f9a1f38a 100644 --- a/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt +++ b/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt @@ -4,7 +4,6 @@ import com.avito.android.build_trace.internal.BuildTraceListener import com.avito.android.critical_path.CriticalPathRegistry import com.avito.android.gradle.metric.GradleCollector import com.avito.kotlin.dsl.isRoot -import com.avito.logger.GradleLoggerPlugin import org.gradle.api.Plugin import org.gradle.api.Project @@ -29,11 +28,9 @@ public abstract class BuildTracePlugin : Plugin { project.layout.buildDirectory.dir("reports/build-trace") ) - val loggerFactory = GradleLoggerPlugin.getLoggerFactory(project).get() - val buildTraceListener = BuildTraceListener( output = outputDir.file("build.trace").get().asFile, - loggerFactory = loggerFactory + logger = project.logger ) CriticalPathRegistry.addListener(project, buildTraceListener) diff --git a/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/internal/BuildTraceListener.kt b/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/internal/BuildTraceListener.kt index 7e974bc99b..650d52242c 100644 --- a/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/internal/BuildTraceListener.kt +++ b/subprojects/assemble/build-trace/src/main/kotlin/com/avito/android/build_trace/internal/BuildTraceListener.kt @@ -9,19 +9,17 @@ import com.avito.android.trace.TraceEvent import com.avito.android.trace.TraceReport import com.avito.android.trace.TraceReportFileAdapter import com.avito.graph.OperationsPath -import com.avito.logger.LoggerFactory -import com.avito.logger.create import org.gradle.BuildResult import org.gradle.api.Task +import org.slf4j.Logger import java.io.File import java.util.Collections internal class BuildTraceListener( private val output: File, - loggerFactory: LoggerFactory + private val logger: Logger ) : AbstractBuildEventsListener(), CriticalPathListener { - private val logger = loggerFactory.create() private val eventProvider = TraceEventProvider() private val events: MutableList = Collections.synchronizedList(mutableListOf()) diff --git a/subprojects/assemble/build-verdict/build.gradle.kts b/subprojects/assemble/build-verdict/build.gradle.kts index 0f18746e7b..3ac94c8c32 100644 --- a/subprojects/assemble/build-verdict/build.gradle.kts +++ b/subprojects/assemble/build-verdict/build.gradle.kts @@ -10,7 +10,6 @@ dependencies { implementation(gradleApi()) implementation(projects.subprojects.common.throwableUtils) implementation(projects.subprojects.gradle.gradleExtensions) - implementation(projects.subprojects.logger.gradleLogger) implementation(libs.gson) implementation(libs.kotlinHtml) diff --git a/subprojects/assemble/build-verdict/locking/gradle.lockfile b/subprojects/assemble/build-verdict/locking/gradle.lockfile index 3fc6672863..a84bd60ee1 100644 --- a/subprojects/assemble/build-verdict/locking/gradle.lockfile +++ b/subprojects/assemble/build-verdict/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=gradleTestRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestRuntimeClasspath com.android.tools:sdklib:30.0.2=gradleTestRuntimeClasspath com.android:signflinger:7.0.2=gradleTestRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -63,13 +62,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestRuntimeClasspath @@ -97,7 +93,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=gradleTestRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestRuntimeClasspath @@ -164,7 +159,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-tree:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm:7.0=gradleTestRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestRuntimeClasspath diff --git a/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/BaseBuildVerdictTest.kt b/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/BaseBuildVerdictTest.kt index 35f98fd55f..38752dd488 100644 --- a/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/BaseBuildVerdictTest.kt +++ b/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/BaseBuildVerdictTest.kt @@ -59,7 +59,6 @@ internal abstract class BaseBuildVerdictTest { ) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-verdict") }, modules = listOf(module), diff --git a/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/ConfigurationCacheCompatibilityTest.kt b/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/ConfigurationCacheCompatibilityTest.kt index db4136cc54..556e1ff372 100644 --- a/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/assemble/build-verdict/src/gradleTest/kotlin/com/avito/android/build_verdict/ConfigurationCacheCompatibilityTest.kt @@ -33,7 +33,6 @@ internal class ConfigurationCacheCompatibilityTest { fun `configuration with applied plugin`(@TempDir projectDir: File) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.build-verdict") }, modules = listOf( diff --git a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/BuildVerdictPlugin.kt b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/BuildVerdictPlugin.kt index 1eb702730b..49feb8df8f 100644 --- a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/BuildVerdictPlugin.kt +++ b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/BuildVerdictPlugin.kt @@ -2,8 +2,6 @@ package com.avito.android.build_verdict import com.avito.android.build_verdict.internal.BuildVerdictPluginServices import com.avito.kotlin.dsl.isRoot -import com.avito.logger.GradleLoggerPlugin -import com.avito.logger.create import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.internal.GradleInternal @@ -30,8 +28,7 @@ public class BuildVerdictPlugin : Plugin { val extension = project.extensions.create("buildVerdict") if (project.pluginIsEnabled) { - val logger = GradleLoggerPlugin.getLoggerFactory(project).map { it.create() } - val services = BuildVerdictPluginServices(extension, logger) + val services = BuildVerdictPluginServices(extension, project.logger) project.gradle.addListener(services.gradleTaskExecutionListener()) project.gradle.addLogEventListener(services.gradleLogEventListener()) val configurationListener = services.gradleConfigurationListener() diff --git a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/BuildVerdictPluginServices.kt b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/BuildVerdictPluginServices.kt index 15d632e13b..f009251503 100644 --- a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/BuildVerdictPluginServices.kt +++ b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/BuildVerdictPluginServices.kt @@ -10,20 +10,19 @@ import com.avito.android.build_verdict.internal.writer.HtmlBuildVerdictWriter import com.avito.android.build_verdict.internal.writer.PlainTextBuildVerdictWriter import com.avito.android.build_verdict.internal.writer.RawBuildVerdictWriter import com.avito.android.build_verdict.span.SpannedStringBuilder -import com.avito.logger.Logger import com.google.gson.GsonBuilder import org.gradle.BuildListener import org.gradle.api.execution.TaskExecutionGraph import org.gradle.api.execution.TaskExecutionListener -import org.gradle.api.provider.Provider import org.gradle.internal.logging.events.OutputEventListener import org.gradle.internal.operations.OperationIdentifier import org.gradle.util.Path +import org.slf4j.Logger import java.util.concurrent.ConcurrentHashMap internal class BuildVerdictPluginServices( private val extension: BuildVerdictPluginExtension, - logger: Provider + private val logger: Logger ) { private val listeners = ConcurrentHashMap() diff --git a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/BuildVerdictWriter.kt b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/BuildVerdictWriter.kt index b1eb603f7e..b59c914413 100644 --- a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/BuildVerdictWriter.kt +++ b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/BuildVerdictWriter.kt @@ -1,21 +1,20 @@ package com.avito.android.build_verdict.internal.writer import com.avito.android.build_verdict.internal.BuildVerdict -import com.avito.logger.Logger -import org.gradle.api.provider.Provider +import org.slf4j.Logger import java.io.File internal abstract class BuildVerdictWriter( private val outputDir: Lazy, private val fileName: String ) { - protected abstract val logger: Provider + protected abstract val logger: Logger fun write(buildVerdict: BuildVerdict) { val destination = File(outputDir.value, fileName) destination.createNewFile() writeTo(buildVerdict, destination) - logger.get().warn("Build verdict at $destination") + logger.warn("Build verdict at $destination") } protected abstract fun writeTo(buildVerdict: BuildVerdict, destination: File) diff --git a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/HtmlBuildVerdictWriter.kt b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/HtmlBuildVerdictWriter.kt index b519f3e1c5..c96e1c451b 100644 --- a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/HtmlBuildVerdictWriter.kt +++ b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/HtmlBuildVerdictWriter.kt @@ -1,13 +1,12 @@ package com.avito.android.build_verdict.internal.writer import com.avito.android.build_verdict.internal.BuildVerdict -import com.avito.logger.Logger -import org.gradle.api.provider.Provider +import org.slf4j.Logger import java.io.File internal class HtmlBuildVerdictWriter( buildVerdictDir: Lazy, - override val logger: Provider + override val logger: Logger ) : BuildVerdictWriter(buildVerdictDir, fileName) { override fun writeTo(buildVerdict: BuildVerdict, destination: File) { diff --git a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/PlainTextBuildVerdictWriter.kt b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/PlainTextBuildVerdictWriter.kt index 913e1aad62..87956121bf 100644 --- a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/PlainTextBuildVerdictWriter.kt +++ b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/PlainTextBuildVerdictWriter.kt @@ -1,13 +1,12 @@ package com.avito.android.build_verdict.internal.writer import com.avito.android.build_verdict.internal.BuildVerdict -import com.avito.logger.Logger -import org.gradle.api.provider.Provider +import org.slf4j.Logger import java.io.File internal class PlainTextBuildVerdictWriter( buildVerdictDir: Lazy, - override val logger: Provider + override val logger: Logger, ) : BuildVerdictWriter(buildVerdictDir, fileName) { override fun writeTo(buildVerdict: BuildVerdict, destination: File) { diff --git a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/RawBuildVerdictWriter.kt b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/RawBuildVerdictWriter.kt index 9508a9b7ee..c1bc4809a5 100644 --- a/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/RawBuildVerdictWriter.kt +++ b/subprojects/assemble/build-verdict/src/main/kotlin/com/avito/android/build_verdict/internal/writer/RawBuildVerdictWriter.kt @@ -1,15 +1,14 @@ package com.avito.android.build_verdict.internal.writer import com.avito.android.build_verdict.internal.BuildVerdict -import com.avito.logger.Logger import com.google.gson.Gson -import org.gradle.api.provider.Provider +import org.slf4j.Logger import java.io.File internal class RawBuildVerdictWriter( buildVerdictDir: Lazy, private val gson: Gson, - override val logger: Provider + override val logger: Logger, ) : BuildVerdictWriter(buildVerdictDir, fileName) { override fun writeTo(buildVerdict: BuildVerdict, destination: File) { diff --git a/subprojects/assemble/critical-path/api/build.gradle.kts b/subprojects/assemble/critical-path/api/build.gradle.kts index c363649ab6..d4bf4debcc 100644 --- a/subprojects/assemble/critical-path/api/build.gradle.kts +++ b/subprojects/assemble/critical-path/api/build.gradle.kts @@ -16,5 +16,4 @@ dependencies { implementation(projects.subprojects.assemble.gradleProfile) implementation(projects.subprojects.common.compositeException) implementation(projects.subprojects.common.problem) - implementation(projects.subprojects.logger.gradleLogger) } diff --git a/subprojects/assemble/critical-path/api/locking/gradle.lockfile b/subprojects/assemble/critical-path/api/locking/gradle.lockfile index c1211d867d..4ac9d0f2ab 100644 --- a/subprojects/assemble/critical-path/api/locking/gradle.lockfile +++ b/subprojects/assemble/critical-path/api/locking/gradle.lockfile @@ -1,11 +1,8 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.code.gson:gson:2.8.5=runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:guava:27.0.1-android=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -13,12 +10,6 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=test com.google.j2objc:j2objc-annotations:1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okio:okio:2.8.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=runtimeClasspath,testRuntimeClasspath junit:junit:4.12=testCompileClasspath,testImplementationDependenciesMetadata junit:junit:4.13.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata @@ -56,5 +47,4 @@ org.junit.platform:junit-platform-suite-api:1.8.0=testRuntimeClasspath,testRunti org.junit.platform:junit-platform-suite-commons:1.8.0=testRuntimeClasspath org.junit:junit-bom:5.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=runtimeClasspath,testRuntimeClasspath empty=annotationProcessor,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,signatures,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/subprojects/assemble/critical-path/critical-path/build.gradle.kts b/subprojects/assemble/critical-path/critical-path/build.gradle.kts index 2dabe434de..83b1ef453c 100644 --- a/subprojects/assemble/critical-path/critical-path/build.gradle.kts +++ b/subprojects/assemble/critical-path/critical-path/build.gradle.kts @@ -7,13 +7,11 @@ plugins { dependencies { implementation(gradleApi()) implementation(projects.subprojects.assemble.criticalPath.api) - implementation(projects.subprojects.logger.gradleLogger) implementation(libs.gson) implementation(projects.subprojects.gradle.gradleExtensions) gradleTestImplementation(projects.subprojects.common.junitUtils) gradleTestImplementation(projects.subprojects.gradle.testProject) - gradleTestImplementation(testFixtures(projects.subprojects.logger.logger)) } gradlePlugin { diff --git a/subprojects/assemble/critical-path/critical-path/locking/gradle.lockfile b/subprojects/assemble/critical-path/critical-path/locking/gradle.lockfile index b8df9a467f..1e77af9a31 100644 --- a/subprojects/assemble/critical-path/critical-path/locking/gradle.lockfile +++ b/subprojects/assemble/critical-path/critical-path/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=gradleTestRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestRuntimeClasspath com.android.tools:sdklib:30.0.2=gradleTestRuntimeClasspath com.android:signflinger:7.0.2=gradleTestRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -63,13 +62,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestRuntimeClasspath @@ -97,7 +93,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=gradleTestRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestRuntimeClasspath @@ -165,7 +160,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-tree:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm:7.0=gradleTestRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestRuntimeClasspath diff --git a/subprojects/common/elastic/src/test/kotlin/com/avito/android/elastic/HttpElasticClientTest.kt b/subprojects/common/elastic/src/test/kotlin/com/avito/android/elastic/HttpElasticClientTest.kt index 76c42df9f0..7929f1f41d 100644 --- a/subprojects/common/elastic/src/test/kotlin/com/avito/android/elastic/HttpElasticClientTest.kt +++ b/subprojects/common/elastic/src/test/kotlin/com/avito/android/elastic/HttpElasticClientTest.kt @@ -18,7 +18,6 @@ internal class HttpElasticClientTest { private val dispatcher = MockDispatcher( unmockedResponse = MockResponse().setResponseCode(200), - loggerFactory = loggerFactory ) .also { dispatcher -> mockWebServer.dispatcher = dispatcher } diff --git a/subprojects/common/graphite/build.gradle.kts b/subprojects/common/graphite/build.gradle.kts index ee25db9d5e..a6a872bf31 100644 --- a/subprojects/common/graphite/build.gradle.kts +++ b/subprojects/common/graphite/build.gradle.kts @@ -3,7 +3,3 @@ plugins { id("convention.publish-kotlin-library") id("convention.test-fixtures") } - -dependencies { - api(projects.subprojects.logger.logger) -} diff --git a/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt b/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt index 139dac293d..d619cf0eb2 100644 --- a/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt +++ b/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt @@ -1,7 +1,5 @@ package com.avito.android.graphite -import com.avito.logger.LoggerFactory - public interface GraphiteSender { /** @@ -11,8 +9,8 @@ public interface GraphiteSender { public companion object { - public fun create(config: GraphiteConfig, loggerFactory: LoggerFactory): GraphiteSender { - return GraphiteSenderImpl(config, loggerFactory) + public fun create(config: GraphiteConfig): GraphiteSender { + return GraphiteSenderImpl(config) } } } diff --git a/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSenderImpl.kt b/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSenderImpl.kt index f91e845b65..62676c2d61 100644 --- a/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSenderImpl.kt +++ b/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSenderImpl.kt @@ -1,17 +1,13 @@ package com.avito.android.graphite -import com.avito.logger.LoggerFactory -import com.avito.logger.create import java.io.DataOutputStream import java.net.Socket internal class GraphiteSenderImpl( - private val config: GraphiteConfig, - loggerFactory: LoggerFactory + private val config: GraphiteConfig ) : GraphiteSender { - private val logger = loggerFactory.create() - + @Throws(Exception::class) override fun send(metric: GraphiteMetric) { if (!config.isEnabled) return @@ -19,14 +15,11 @@ internal class GraphiteSenderImpl( send(message) } + @Throws(Exception::class) private fun send(message: String) { - try { - socket().use { socket -> - val dos = DataOutputStream(socket.getOutputStream()) - dos.writeBytes(message) - } - } catch (e: Exception) { - logger.warn(message, e) + socket().use { socket -> + val dos = DataOutputStream(socket.getOutputStream()) + dos.writeBytes(message) } } diff --git a/subprojects/common/http-client/build.gradle.kts b/subprojects/common/http-client/build.gradle.kts index 6e31e0c4ae..1bd6e3c6f4 100644 --- a/subprojects/common/http-client/build.gradle.kts +++ b/subprojects/common/http-client/build.gradle.kts @@ -5,10 +5,11 @@ plugins { } dependencies { + api(projects.subprojects.common.time) + api(projects.subprojects.common.statsd) + api(projects.subprojects.logger.logger) + implementation(projects.subprojects.common.okhttp) - implementation(projects.subprojects.common.statsd) - implementation(projects.subprojects.common.time) - implementation(projects.subprojects.logger.logger) testImplementation(projects.subprojects.common.testOkhttp) testImplementation(projects.subprojects.common.truthExtensions) @@ -17,6 +18,6 @@ dependencies { testImplementation(testFixtures(projects.subprojects.logger.logger)) testFixturesApi(testFixtures(projects.subprojects.common.statsd)) - testFixturesApi(testFixtures(projects.subprojects.logger.logger)) testFixturesApi(testFixtures(projects.subprojects.common.time)) + testFixturesImplementation(testFixtures(projects.subprojects.logger.logger)) } diff --git a/subprojects/common/http-client/locking/gradle.lockfile b/subprojects/common/http-client/locking/gradle.lockfile index fa1e0bb812..7e3806b370 100644 --- a/subprojects/common/http-client/locking/gradle.lockfile +++ b/subprojects/common/http-client/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +androidx.annotation:annotation:1.1.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.github.salomonbrys.kotson:kotson:2.5.0=testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/subprojects/common/http-client/src/testFixtures/kotlin/com/avito/http/StubHttpClientProvider.kt b/subprojects/common/http-client/src/testFixtures/kotlin/com/avito/http/StubHttpClientProvider.kt index 3ce4ea30cd..4149c10d33 100644 --- a/subprojects/common/http-client/src/testFixtures/kotlin/com/avito/http/StubHttpClientProvider.kt +++ b/subprojects/common/http-client/src/testFixtures/kotlin/com/avito/http/StubHttpClientProvider.kt @@ -2,7 +2,6 @@ package com.avito.http import com.avito.android.stats.StatsDSender import com.avito.android.stats.StubStatsdSender -import com.avito.logger.LoggerFactory import com.avito.logger.PrintlnLoggerFactory import com.avito.time.DefaultTimeProvider import com.avito.time.TimeProvider @@ -10,7 +9,6 @@ import com.avito.time.TimeProvider public fun HttpClientProvider.Companion.createStubInstance( statsdSender: StatsDSender = StubStatsdSender(), timeProvider: TimeProvider = DefaultTimeProvider(), - loggerFactory: LoggerFactory = PrintlnLoggerFactory ): HttpClientProvider { - return HttpClientProvider(statsdSender, timeProvider, loggerFactory) + return HttpClientProvider(statsdSender, timeProvider, PrintlnLoggerFactory) } diff --git a/subprojects/common/kotlin-ast-parser/locking/gradle.lockfile b/subprojects/common/kotlin-ast-parser/locking/gradle.lockfile index 7fca5b5546..78a249910f 100644 --- a/subprojects/common/kotlin-ast-parser/locking/gradle.lockfile +++ b/subprojects/common/kotlin-ast-parser/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=testRuntimeClasspath com.android.tools:sdklib:30.0.2=testRuntimeClasspath com.android:signflinger:7.0.2=testRuntimeClasspath com.android:zipflinger:7.0.2=testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=testRuntimeClasspath com.google.android:annotations:4.1.1.4=testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -62,13 +61,10 @@ com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMe com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:okhttp:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=testImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=testRuntimeClasspath com.squareup:javapoet:1.10.0=testRuntimeClasspath com.squareup:javawriter:2.5.0=testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=testRuntimeClasspath @@ -96,7 +92,6 @@ io.netty:netty-resolver:4.1.34.Final=testRuntimeClasspath io.netty:netty-transport:4.1.34.Final=testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=testRuntimeClasspath -io.sentry:sentry:1.7.23=testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=testRuntimeClasspath @@ -158,7 +153,6 @@ org.ow2.asm:asm-commons:7.0=testRuntimeClasspath org.ow2.asm:asm-tree:7.0=testRuntimeClasspath org.ow2.asm:asm-util:7.0=testRuntimeClasspath org.ow2.asm:asm:7.0=testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=testRuntimeClasspath xerces:xercesImpl:2.12.0=testRuntimeClasspath xml-apis:xml-apis:1.4.01=testRuntimeClasspath diff --git a/subprojects/common/okhttp/src/main/kotlin/com/avito/http/HttpLogger.kt b/subprojects/common/okhttp/src/main/kotlin/com/avito/http/HttpLogger.kt deleted file mode 100644 index f8c367c8c1..0000000000 --- a/subprojects/common/okhttp/src/main/kotlin/com/avito/http/HttpLogger.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.avito.http - -import com.avito.logger.Logger -import okhttp3.logging.HttpLoggingInterceptor - -public class HttpLogger( - private val logger: Logger -) : HttpLoggingInterceptor.Logger { - - override fun log(message: String) { - logger.debug(message) - } -} diff --git a/subprojects/common/test-okhttp/build.gradle.kts b/subprojects/common/test-okhttp/build.gradle.kts index a3bdee58ee..02ade2cbc0 100644 --- a/subprojects/common/test-okhttp/build.gradle.kts +++ b/subprojects/common/test-okhttp/build.gradle.kts @@ -5,7 +5,6 @@ plugins { dependencies { api(libs.okhttpMockWebServer) - api(projects.subprojects.logger.logger) api(projects.subprojects.common.okhttp) implementation(libs.bundles.hamcrest) @@ -17,6 +16,4 @@ dependencies { implementation(projects.subprojects.common.resources) implementation(projects.subprojects.common.waiter) implementation(projects.subprojects.common.result) - - testImplementation(testFixtures(projects.subprojects.logger.logger)) } diff --git a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt index 9f150cdc6f..8ae7a7963c 100644 --- a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt +++ b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt @@ -1,8 +1,6 @@ package com.avito.test.http import com.avito.android.Result -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.utils.ResourcesReader import com.github.salomonbrys.kotson.fromJson import com.google.gson.Gson @@ -14,11 +12,8 @@ import java.util.Collections public class MockDispatcher( private val unmockedResponse: MockResponse = MockResponse().setResponseCode(418).setBody("Not mocked"), - loggerFactory: LoggerFactory ) : Dispatcher() { - private val logger = loggerFactory.create() - private val mocks = Collections.synchronizedList(mutableListOf()) private val capturers = Collections.synchronizedList(mutableListOf()) @@ -40,7 +35,6 @@ public class MockDispatcher( synchronized(capturers) { capturers.find { it.requestMatcher.invoke(requestData) }?.run { capture(request) - logger.debug("request captured: $request") } } @@ -56,8 +50,6 @@ public class MockDispatcher( if (matchedMock?.removeAfterMatched == true) mocks.remove(matchedMock) - logger.debug("got request: ${request.path}, response will be: $response") - return response } } diff --git a/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt b/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt index 551d048f6a..0733e5892a 100644 --- a/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt +++ b/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt @@ -1,6 +1,5 @@ package com.avito.test.http -import com.avito.logger.PrintlnLoggerFactory import com.google.common.truth.Truth.assertThat import okhttp3.Headers import okhttp3.mockwebserver.MockResponse @@ -13,9 +12,7 @@ import java.nio.charset.Charset internal class MockDispatcherTest { - private val loggerFactory = PrintlnLoggerFactory - - private val dispatcher = MockDispatcher(loggerFactory = loggerFactory) + private val dispatcher = MockDispatcher() @Test fun `dispatcher - dispatch last matching response - if multiple registered conditions matches`() { diff --git a/subprojects/delivery/artifactory-app-backup/locking/gradle.lockfile b/subprojects/delivery/artifactory-app-backup/locking/gradle.lockfile index 0043e3337c..0825cc27d9 100644 --- a/subprojects/delivery/artifactory-app-backup/locking/gradle.lockfile +++ b/subprojects/delivery/artifactory-app-backup/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=gradleTestRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -69,8 +68,6 @@ com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestCo com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.squareup.okio:okio-metadata:2.8.0=gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -99,7 +96,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -166,7 +162,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/subprojects/delivery/artifactory-app-backup/src/gradleTest/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt b/subprojects/delivery/artifactory-app-backup/src/gradleTest/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt index 577effce47..a8bfc95875 100644 --- a/subprojects/delivery/artifactory-app-backup/src/gradleTest/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt +++ b/subprojects/delivery/artifactory-app-backup/src/gradleTest/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt @@ -1,7 +1,6 @@ package com.avito.android.plugin.artifactory import com.avito.http.HttpCodes -import com.avito.logger.PrintlnLoggerFactory import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.ciRun import com.avito.test.gradle.module.AndroidAppModule @@ -21,8 +20,6 @@ private typealias Artifact = Pair internal class ArtifactoryAppBackupPluginTest { - private val loggerFactory = PrintlnLoggerFactory - private val mockWebServer = MockWebServerFactory.create() @Test @@ -122,7 +119,6 @@ internal class ArtifactoryAppBackupPluginTest { val dispatcher = MockDispatcher( unmockedResponse = MockResponse().setResponseCode(HttpCodes.OK), - loggerFactory = loggerFactory ) .also { mockWebServer.dispatcher = it } @@ -208,7 +204,6 @@ internal class ArtifactoryAppBackupPluginTest { val dispatcher = MockDispatcher( unmockedResponse = MockResponse().setResponseCode(HttpCodes.OK), - loggerFactory = loggerFactory ) .also { mockWebServer.dispatcher = it } diff --git a/subprojects/delivery/cd/build.gradle.kts b/subprojects/delivery/cd/build.gradle.kts index 402388d88d..511a385efc 100644 --- a/subprojects/delivery/cd/build.gradle.kts +++ b/subprojects/delivery/cd/build.gradle.kts @@ -24,14 +24,12 @@ dependencies { implementation(projects.subprojects.gradle.statsdConfig) implementation(projects.subprojects.gradle.teamcity) implementation(projects.subprojects.gradle.testSummary) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.testRunner.instrumentationTests) implementation(projects.subprojects.testRunner.reportViewer) gradleTestImplementation(projects.subprojects.common.testOkhttp) gradleTestImplementation(projects.subprojects.gradle.testProject) gradleTestImplementation(testFixtures(projects.subprojects.delivery.artifactoryAppBackup)) - gradleTestImplementation(testFixtures(projects.subprojects.logger.logger)) } gradlePlugin { diff --git a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/BaseCiStepsPluginTest.kt b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/BaseCiStepsPluginTest.kt index 06cc4eb808..7c46ccbf7f 100644 --- a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/BaseCiStepsPluginTest.kt +++ b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/BaseCiStepsPluginTest.kt @@ -19,7 +19,6 @@ internal abstract class BaseCiStepsPluginTest { ) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( diff --git a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt index 6c0902be52..8d62370f2d 100644 --- a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt +++ b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt @@ -11,7 +11,6 @@ import java.io.File internal fun generateProjectWithImpactAnalysis(rootDir: File) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( diff --git a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/SignerIntegrationTest.kt b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/SignerIntegrationTest.kt index cceb6a5f4d..eef0bb407b 100644 --- a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/SignerIntegrationTest.kt +++ b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/SignerIntegrationTest.kt @@ -37,7 +37,6 @@ internal class SignerIntegrationTest { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( diff --git a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/TestSummaryStepTest.kt b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/TestSummaryStepTest.kt index 87b57f34ca..4b482dbf11 100644 --- a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/TestSummaryStepTest.kt +++ b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/TestSummaryStepTest.kt @@ -112,7 +112,6 @@ internal class TestSummaryStepTest { private fun generateProject(projectDir: File, step: String) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") id(testSummaryPluginId) }, diff --git a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadCdBuildResultIntegrationTest.kt b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadCdBuildResultIntegrationTest.kt index 9dba69b602..d3d57d371f 100644 --- a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadCdBuildResultIntegrationTest.kt +++ b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadCdBuildResultIntegrationTest.kt @@ -9,7 +9,6 @@ import com.avito.ci.runTask import com.avito.git.Git import com.avito.http.HttpCodes import com.avito.instrumentation.instrumentationPluginId -import com.avito.logger.PrintlnLoggerFactory import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.dir import com.avito.test.gradle.file @@ -31,7 +30,6 @@ import java.nio.file.Path internal class UploadCdBuildResultIntegrationTest { - private val loggerFactory = PrintlnLoggerFactory private lateinit var projectDir: File private val server = MockWebServerFactory.create() private val mockUrl = server.url("").toString().removeSuffix("/") @@ -44,7 +42,6 @@ internal class UploadCdBuildResultIntegrationTest { private val reportsApiUrl = "https://reports" private val dispatcher = MockDispatcher( unmockedResponse = MockResponse().setResponseCode(200), - loggerFactory = loggerFactory ) .also { dispatcher -> server.dispatcher = dispatcher } @@ -111,7 +108,6 @@ internal class UploadCdBuildResultIntegrationTest { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf(androidAppModule) diff --git a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadToQappsTest.kt b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadToQappsTest.kt index 8f70982960..e99c6bc4f1 100644 --- a/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadToQappsTest.kt +++ b/subprojects/delivery/cd/src/gradleTest/kotlin/com/avito/ci/steps/UploadToQappsTest.kt @@ -79,9 +79,6 @@ internal class UploadToQappsTest { @Suppress("MaxLineLength") private fun generateProject() { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( name = "app", diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/VerifyOutputsTask.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/VerifyOutputsTask.kt index 8c43654148..b98c65bd68 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/VerifyOutputsTask.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/VerifyOutputsTask.kt @@ -5,14 +5,11 @@ import com.avito.ci.internal.signer.SignVerifier import com.avito.ci.internal.signer.SignVerifierImpl import com.avito.ci.steps.ArtifactsConfiguration import com.avito.ci.steps.Output -import com.avito.logger.LoggerFactory -import com.avito.logger.create import org.gradle.api.DefaultTask import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputDirectory -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.property import java.io.File @@ -38,9 +35,6 @@ public abstract class VerifyOutputsTask @Inject constructor(objects: ObjectFacto @Input public val checkSignatures: Property = objects.property() - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun doWork() { val signVerifier: SignVerifier = SignVerifierImpl(project.androidSdk) @@ -50,8 +44,6 @@ public abstract class VerifyOutputsTask @Inject constructor(objects: ObjectFacto outputsDir = outputsDir ) - val logger = loggerFactory.get().create() - config.get().outputs.forEach { (_: String, output: Output) -> // Check file that have already been copied to outputs folder val originalArtifact = File(output.path) diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt index 6be021b963..382ad58e11 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt @@ -1,14 +1,11 @@ package com.avito.ci.steps -import com.avito.logger.LoggerFactory -import com.avito.logger.create import org.gradle.api.DefaultTask import org.gradle.api.file.DirectoryProperty import org.gradle.api.file.FileCollection import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputFiles -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.property import java.io.File @@ -24,12 +21,8 @@ public abstract class CopyArtifactsTask : DefaultTask() { @InputFiles public val entries: Property = project.objects.property() - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun doAction() { - val logger = loggerFactory.get().create() entries.get().forEach { entry -> if (entry.exists()) { diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/FlakyReportStep.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/FlakyReportStep.kt index 6b82fe22c7..e27b80bcc5 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/FlakyReportStep.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/FlakyReportStep.kt @@ -2,7 +2,6 @@ package com.avito.ci.steps import com.avito.ci.internal.ReportKey import com.avito.kotlin.dsl.typedNamedOrNull -import com.avito.logger.GradleLoggerPlugin import com.avito.reportviewer.model.ReportCoordinates import com.avito.test.summary.FlakyReportTask import com.avito.test.summary.TestSummaryExtension @@ -44,8 +43,6 @@ public class FlakyReportStep(context: String, name: String) : TestSummaryPluginB this.slackClient.set(testSummaryFactory.createSlackClient(extension)) this.reportsApi.set(testSummaryFactory.createReportsApi(extension)) this.reportViewerUrl.set(extension.reportViewerUrl) - - this.loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) } } } diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt index 7a7745c44f..31a6a9ad01 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt @@ -2,7 +2,6 @@ package com.avito.ci.steps import com.avito.ci.internal.ReportKey import com.avito.kotlin.dsl.typedNamedOrNull -import com.avito.logger.GradleLoggerPlugin import com.avito.reportviewer.model.ReportCoordinates import com.avito.test.summary.MarkReportAsSourceTask import com.avito.test.summary.TestSummaryExtension @@ -34,8 +33,6 @@ public class MarkReportAsSourceForTMSStep(context: String, name: String) : TestS this.reportCoordinates.set(reportCoordinates) this.reportsApi.set(testSummaryFactory.createReportsApi(extension)) this.timeProvider.set(testSummaryFactory.timeProvider) - - this.loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) } } } diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryPluginBuildStep.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryPluginBuildStep.kt index 5e2c1bb855..97a72a7e74 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryPluginBuildStep.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryPluginBuildStep.kt @@ -5,7 +5,6 @@ import com.avito.android.stats.statsdConfig import com.avito.impact.configuration.internalModule import com.avito.instrumentation.extractReportCoordinates import com.avito.instrumentation.instrumentationTaskDefaultEnvironment -import com.avito.logger.GradleLoggerPlugin import com.avito.reportviewer.model.ReportCoordinates import com.avito.test.summary.TestSummaryExtension import com.avito.test.summary.TestSummaryFactory @@ -52,7 +51,6 @@ public abstract class TestSummaryPluginBuildStep(context: String, name: String) extension = project.rootProject.extensions.getByType(), reportCoordinates = reportCoordinates.get(), testSummaryFactory = TestSummaryFactory( - loggerFactory = GradleLoggerPlugin.getLoggerFactory(project).get(), statsDConfig = project.statsdConfig, ) ) diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryStep.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryStep.kt index aa93b394a0..4ed844734f 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryStep.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/TestSummaryStep.kt @@ -2,7 +2,6 @@ package com.avito.ci.steps import com.avito.ci.internal.ReportKey import com.avito.kotlin.dsl.typedNamedOrNull -import com.avito.logger.GradleLoggerPlugin import com.avito.report.model.Team import com.avito.reportviewer.model.ReportCoordinates import com.avito.test.summary.TestSummaryExtension @@ -49,8 +48,6 @@ public class TestSummaryStep(context: String, name: String) : TestSummaryPluginB this.slackClient.set(testSummaryFactory.createSlackClient(extension)) this.reportsApi.set(testSummaryFactory.createReportsApi(extension)) this.reportViewerUrl.set(extension.reportViewerUrl) - - this.loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) } } } diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/UploadBuildResult.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/UploadBuildResult.kt index 1082ecdacc..5888dfe1d8 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/UploadBuildResult.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/UploadBuildResult.kt @@ -11,7 +11,6 @@ import com.avito.instrumentation.extractReportCoordinates import com.avito.instrumentation.extractReportViewerUrl import com.avito.instrumentation.instrumentationTaskDefaultEnvironment import com.avito.kotlin.dsl.namedOrNull -import com.avito.logger.GradleLoggerPlugin import com.avito.report.ReportLinksGenerator import com.avito.reportviewer.ReportViewerLinksGeneratorImpl import com.avito.reportviewer.ReportViewerQuery @@ -60,8 +59,6 @@ public class UploadBuildResult(context: String, name: String) : SuppressibleBuil this.jobSlug.set(reportCoordinates.jobSlug) this.runId.set(reportCoordinates.runId) - loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) - project.tasks.namedOrNull(deployTaskName)?.also { deployTask -> dependsOn(deployTask) } mustRunAfter(project.tasks.artifactoryAppBackupTask()) diff --git a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/VerifyArtifactsStep.kt b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/VerifyArtifactsStep.kt index c7dbfe718c..da199ff994 100644 --- a/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/VerifyArtifactsStep.kt +++ b/subprojects/delivery/cd/src/main/kotlin/com/avito/ci/steps/VerifyArtifactsStep.kt @@ -5,8 +5,6 @@ import com.avito.android.packageTaskProvider import com.avito.ci.VerifyOutputsTask import com.avito.impact.configuration.internalModule import com.avito.kotlin.dsl.typedNamed -import com.avito.logger.GradleLoggerPlugin -import com.avito.logger.create import com.avito.plugin.legacySignedApkTaskProvider import com.avito.plugin.legacySignedBundleTaskProvider import org.gradle.api.Project @@ -56,16 +54,11 @@ public open class VerifyArtifactsStep( destinationDir.set(File("${project.rootProject.rootDir}/outputs")) entries.set(project.files(artifactsConfig.outputs.values.map { it.path })) - val loggerFactory = GradleLoggerPlugin.getLoggerFactory(this) - - this.loggerFactory.set(loggerFactory) - project.gradle.onBuildFailed { if (!didWork) { // Copy artifacts that managed to be generated. // Do not verify them because it is last resort to save anything. - val logger = loggerFactory.get().create() - logger.info("Build failed. Trying to copy artifacts that managed to be generated.") + logger.lifecycle("Build failed. Trying to copy artifacts that managed to be generated.") doAction() } } @@ -77,8 +70,6 @@ public open class VerifyArtifactsStep( config.set(artifactsConfig) checkSignatures.set(artifactsConfig.failOnSignatureError) - loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) - dependsOn(copyTask) } diff --git a/subprojects/delivery/feature-toggles/build.gradle.kts b/subprojects/delivery/feature-toggles/build.gradle.kts index 5a8c148807..68873768c4 100644 --- a/subprojects/delivery/feature-toggles/build.gradle.kts +++ b/subprojects/delivery/feature-toggles/build.gradle.kts @@ -7,11 +7,8 @@ plugins { dependencies { implementation(projects.subprojects.gradle.process) implementation(projects.subprojects.gradle.gradleExtensions) - implementation(projects.subprojects.logger.gradleLogger) implementation(libs.gson) - testImplementation(testFixtures(projects.subprojects.logger.logger)) - gradleTestImplementation(projects.subprojects.gradle.testProject) } diff --git a/subprojects/delivery/feature-toggles/locking/gradle.lockfile b/subprojects/delivery/feature-toggles/locking/gradle.lockfile index 58ff58dbdb..6df1839dff 100644 --- a/subprojects/delivery/feature-toggles/locking/gradle.lockfile +++ b/subprojects/delivery/feature-toggles/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=gradleTestRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestRuntimeClasspath com.android.tools:sdklib:30.0.2=gradleTestRuntimeClasspath com.android:signflinger:7.0.2=gradleTestRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -63,13 +62,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestRuntimeClasspath @@ -97,7 +93,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=gradleTestRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestRuntimeClasspath @@ -160,7 +155,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-tree:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm:7.0=gradleTestRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestRuntimeClasspath diff --git a/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt b/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt index 21b2ddf3c6..332261f04b 100644 --- a/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt +++ b/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt @@ -1,8 +1,5 @@ package com.avito.android.plugin -import com.avito.logger.Logger -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.utils.ProcessRunner import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -11,7 +8,6 @@ import org.gradle.api.provider.MapProperty import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputFile -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import java.io.File import java.net.HttpURLConnection @@ -42,20 +38,15 @@ public abstract class FeatureTogglesReportTask : DefaultTask() { @get:Input public abstract val projectDir: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun doWork() { val jsonToggles = readJsonReport() - val loggerFactory = loggerFactory.get() val processRunner = ProcessRunner.create( workingDirectory = File(projectDir.get()) ) val blameCodeLines = readBlameCodeLines(processRunner) val suspiciousToggles: List = SuspiciousTogglesCollector( - loggerFactory = loggerFactory, developerToTeam = developersToTeam.get() ).collectSuspiciousToggles( jsonTogglesList = jsonToggles, @@ -70,11 +61,10 @@ public abstract class FeatureTogglesReportTask : DefaultTask() { sendReport( slackHook = slackHook.get(), reportText = reportText, - logger = loggerFactory.create() ) } - private fun sendReport(slackHook: String, reportText: String, logger: Logger) { + private fun sendReport(slackHook: String, reportText: String) { val connection = URL(slackHook).openConnection() as HttpURLConnection try { with(connection) { diff --git a/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/SuspiciousTogglesCollector.kt b/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/SuspiciousTogglesCollector.kt index 335c61c478..a549665c45 100644 --- a/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/SuspiciousTogglesCollector.kt +++ b/subprojects/delivery/feature-toggles/src/main/kotlin/com/avito/android/plugin/SuspiciousTogglesCollector.kt @@ -1,19 +1,14 @@ package com.avito.android.plugin -import com.avito.logger.LoggerFactory -import com.avito.logger.create import java.time.LocalDate internal typealias Team = String internal typealias DeveloperEmail = String internal class SuspiciousTogglesCollector( - loggerFactory: LoggerFactory, private val developerToTeam: Map ) { - private val logger = loggerFactory.create() - private val excludedToggles = listOf( "stetho", "certificate_pinning", @@ -38,7 +33,7 @@ internal class SuspiciousTogglesCollector( .find { it.codeLine.contains("defaultValue") } if (lastChangeCodeItem == null) { - logger.critical("Error: ${jsonToggle.key}", NoSuchElementException(jsonToggle.key)) + // TODO handle lastChangeCodeItem == null null } else { Toggle( diff --git a/subprojects/delivery/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt b/subprojects/delivery/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt index 0871cb98bc..5d72bf0193 100644 --- a/subprojects/delivery/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt +++ b/subprojects/delivery/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt @@ -1,23 +1,20 @@ package com.avito.android.plugin -import com.avito.logger.PrintlnLoggerFactory import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.time.LocalDate -class SuspiciousTogglesCollectorTest { +internal class SuspiciousTogglesCollectorTest { private lateinit var collector: SuspiciousTogglesCollector - private val loggerFactory = PrintlnLoggerFactory - private val monthAgo = LocalDate.parse("2018-05-20") private val quarterAgo = LocalDate.parse("2018-03-20") @BeforeEach fun setUp() { - collector = SuspiciousTogglesCollector(loggerFactory, developerToTeam = mapOf()) + collector = SuspiciousTogglesCollector(developerToTeam = mapOf()) } @Test diff --git a/subprojects/delivery/legacy-signer/build.gradle.kts b/subprojects/delivery/legacy-signer/build.gradle.kts index f7d3c77887..4454a71cfe 100644 --- a/subprojects/delivery/legacy-signer/build.gradle.kts +++ b/subprojects/delivery/legacy-signer/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { implementation(projects.subprojects.gradle.statsdConfig) implementation(projects.subprojects.gradle.buildFailer) implementation(projects.subprojects.gradle.gradleExtensions) - implementation(projects.subprojects.logger.gradleLogger) + implementation(projects.subprojects.logger.slf4jGradleLogger) implementation(libs.okhttp) implementation(libs.okhttpLogging) diff --git a/subprojects/delivery/legacy-signer/locking/gradle.lockfile b/subprojects/delivery/legacy-signer/locking/gradle.lockfile index c61ec8ad70..b8fc4b42bf 100644 --- a/subprojects/delivery/legacy-signer/locking/gradle.lockfile +++ b/subprojects/delivery/legacy-signer/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=gradleTestRuntimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -69,8 +68,6 @@ com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestIm com.squareup.okhttp3:okhttp:4.9.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,testImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -99,7 +96,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -166,7 +162,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/ConfigurationCacheCompatibilityTest.kt b/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/ConfigurationCacheCompatibilityTest.kt index 4c8dbd5f2b..fcefc15dd1 100644 --- a/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/ConfigurationCacheCompatibilityTest.kt @@ -19,9 +19,6 @@ internal class ConfigurationCacheCompatibilityTest { @Test fun `configuration with applied plugin - ok`(@TempDir projectDir: File) { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( "app", diff --git a/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/LegacySignServicePluginTest.kt b/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/LegacySignServicePluginTest.kt index 4cb1a09db3..fa879e0689 100644 --- a/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/LegacySignServicePluginTest.kt +++ b/subprojects/delivery/legacy-signer/src/gradleTest/kotlin/com/avito/plugin/LegacySignServicePluginTest.kt @@ -204,14 +204,6 @@ internal class LegacySignServicePluginTest { signServiceExtension: String = configureExtension(), ) { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, - buildGradleExtra = """ - |gradleLogger { - | printlnHandler(false, com.avito.logger.LogLevel.DEBUG) - |} - """.trimMargin(), modules = listOf( AndroidAppModule( "app", diff --git a/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/LegacySignArtifactTask.kt b/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/LegacySignArtifactTask.kt index beb837a54c..7e0b9ec057 100644 --- a/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/LegacySignArtifactTask.kt +++ b/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/LegacySignArtifactTask.kt @@ -1,12 +1,11 @@ package com.avito.plugin +import Slf4jGradleLoggerFactory import com.avito.android.Problem import com.avito.android.stats.statsd import com.avito.gradle.worker.inMemoryWork import com.avito.http.HttpClientProvider import com.avito.http.RetryInterceptor -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.plugin.internal.SignViaServiceAction import com.avito.time.DefaultTimeProvider import com.avito.time.TimeProvider @@ -16,7 +15,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import org.gradle.api.DefaultTask import org.gradle.api.provider.Property import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.workers.WorkerExecutor import java.io.File @@ -35,9 +33,6 @@ public abstract class LegacySignArtifactTask constructor( @get:Input public abstract val readWriteTimeoutSec: Property - @get:Internal - public abstract val loggerFactory: Property - protected abstract fun unsignedFile(): File protected abstract fun signedFile(): File @@ -52,7 +47,6 @@ public abstract class LegacySignArtifactTask constructor( @TaskAction public fun run() { - val loggerFactory = loggerFactory.get() val unsignedFile = unsignedFile() val signedFile = signedFile() val timeProvider: TimeProvider = DefaultTimeProvider() @@ -63,7 +57,7 @@ public abstract class LegacySignArtifactTask constructor( val httpClient = HttpClientProvider( statsDSender = project.statsd.get(), timeProvider = timeProvider, - loggerFactory = loggerFactory + loggerFactory = Slf4jGradleLoggerFactory ).provide() .writeTimeout(timeout, TimeUnit.SECONDS) .readTimeout(timeout, TimeUnit.SECONDS) @@ -75,8 +69,6 @@ public abstract class LegacySignArtifactTask constructor( ) .build() - val logger = loggerFactory.create() - workerExecutor.inMemoryWork { SignViaServiceAction( serviceUrl = serviceUrl, diff --git a/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt b/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt index d812e5578e..3e72bd87f8 100644 --- a/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt +++ b/subprojects/delivery/legacy-signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt @@ -7,7 +7,6 @@ import com.android.build.api.variant.Variant import com.avito.android.Problem import com.avito.android.asRuntimeException import com.avito.android.withAndroidApp -import com.avito.logger.GradleLoggerPlugin import com.avito.plugin.internal.LegacyTokensResolver import com.avito.plugin.internal.UrlResolver import com.avito.plugin.internal.hasContent @@ -124,10 +123,6 @@ public class SignServicePlugin : Plugin { }) readWriteTimeoutSec.set(extension.readWriteTimeoutSec.convention(DEFAULT_TIMEOUT_SEC)) - loggerFactory.set( - GradleLoggerPlugin.getLoggerFactory(this) - ) - onlyIf { signingResolver.isCustomSigningEnabled } } } diff --git a/subprojects/delivery/qapps/build.gradle.kts b/subprojects/delivery/qapps/build.gradle.kts index e82fc3fb31..774e396efa 100644 --- a/subprojects/delivery/qapps/build.gradle.kts +++ b/subprojects/delivery/qapps/build.gradle.kts @@ -9,15 +9,14 @@ dependencies { because("Creates qappsUploadSigned tasks which is directly depends on corresponding signer task") } - implementation(projects.subprojects.logger.logger) implementation(projects.subprojects.common.okhttp) implementation(projects.subprojects.common.httpClient) implementation(projects.subprojects.common.result) implementation(projects.subprojects.gradle.android) implementation(projects.subprojects.gradle.buildFailer) implementation(projects.subprojects.gradle.gradleExtensions) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.statsdConfig) + implementation(projects.subprojects.logger.slf4jGradleLogger) implementation(libs.retrofit) implementation(libs.retrofitConverterGson) implementation(libs.okhttpLogging) diff --git a/subprojects/delivery/qapps/locking/gradle.lockfile b/subprojects/delivery/qapps/locking/gradle.lockfile index 6616209fd6..668490c851 100644 --- a/subprojects/delivery/qapps/locking/gradle.lockfile +++ b/subprojects/delivery/qapps/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=gradleTestRuntimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -100,7 +99,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -166,7 +164,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginIntegrationTest.kt b/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginIntegrationTest.kt index 09ba1b7119..2981de34a9 100644 --- a/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginIntegrationTest.kt +++ b/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginIntegrationTest.kt @@ -80,9 +80,6 @@ internal class QAppsPluginIntegrationTest { private fun prepareProject(projectDir: File) { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( "app", diff --git a/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginTest.kt b/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginTest.kt index 295a961407..4b0c61584f 100644 --- a/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginTest.kt +++ b/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsPluginTest.kt @@ -58,9 +58,6 @@ internal class QAppsPluginTest { ).apply { createNewFile() } TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( "app", diff --git a/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsSignedTest.kt b/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsSignedTest.kt index 44431cacc1..8ca6836566 100644 --- a/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsSignedTest.kt +++ b/subprojects/delivery/qapps/src/gradleTest/kotlin/com/avito/plugin/QAppsSignedTest.kt @@ -13,9 +13,6 @@ internal class QAppsSignedTest { @Test fun `qappsUploadSigned - depends on signer task`(@TempDir projectDir: File) { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( name = "app", diff --git a/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsPlugin.kt b/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsPlugin.kt index dd81301fc8..572397ddee 100644 --- a/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsPlugin.kt +++ b/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsPlugin.kt @@ -3,7 +3,6 @@ package com.avito.plugin import com.avito.android.signer.SignServicePlugin import com.avito.android.signer.signedApkDir import com.avito.android.withAndroidApp -import com.avito.logger.GradleLoggerPlugin import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.create @@ -71,7 +70,5 @@ public class QAppsPlugin : Plugin { host.set(extension.serviceUrl) comment.set(extension.comment) branch.set(extension.branchName) - - loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) } } diff --git a/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadTask.kt b/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadTask.kt index 14b5281cb9..0159354058 100644 --- a/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadTask.kt +++ b/subprojects/delivery/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadTask.kt @@ -1,10 +1,9 @@ package com.avito.plugin +import Slf4jGradleLoggerFactory import com.avito.android.getApkOrThrow import com.avito.android.stats.statsd import com.avito.http.HttpClientProvider -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.time.DefaultTimeProvider import com.avito.time.TimeProvider import com.avito.utils.buildFailer @@ -14,7 +13,6 @@ import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputDirectory -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.property import javax.inject.Inject @@ -49,9 +47,6 @@ public abstract class QAppsUploadTask @Inject constructor(objects: ObjectFactory @Input public val releaseChain: Property = objects.property().convention(false) - @get:Internal - public abstract val loggerFactory: Property - @get:InputDirectory public abstract val apkDirectory: DirectoryProperty @@ -59,13 +54,12 @@ public abstract class QAppsUploadTask @Inject constructor(objects: ObjectFactory public fun upload() { val apk = apkDirectory.get().getApkOrThrow() - val loggerFactory = loggerFactory.get() val timeProvider: TimeProvider = DefaultTimeProvider() val httpClientProvider = HttpClientProvider( statsDSender = project.statsd.get(), timeProvider = timeProvider, - loggerFactory = loggerFactory + loggerFactory = Slf4jGradleLoggerFactory ) val uploadResult = QAppsUploadAction( @@ -78,11 +72,9 @@ public abstract class QAppsUploadTask @Inject constructor(objects: ObjectFactory packageName = packageName.get(), releaseChain = releaseChain.get(), httpClientProvider = httpClientProvider, - loggerFactory = loggerFactory + loggerFactory = Slf4jGradleLoggerFactory ).upload() - val logger = loggerFactory.create() - uploadResult.fold( { logger.info("Upload to qapps was successful: ${apk.path}") }, { project.buildFailer.failBuild("Can't upload to qapps: ${apk.path};", it) } diff --git a/subprojects/delivery/qapps/src/test/kotlin/com/avito/plugin/QAppsUploadActionTest.kt b/subprojects/delivery/qapps/src/test/kotlin/com/avito/plugin/QAppsUploadActionTest.kt index a0e8f2e2ba..01a79fe3d4 100644 --- a/subprojects/delivery/qapps/src/test/kotlin/com/avito/plugin/QAppsUploadActionTest.kt +++ b/subprojects/delivery/qapps/src/test/kotlin/com/avito/plugin/QAppsUploadActionTest.kt @@ -19,14 +19,12 @@ import org.junit.jupiter.api.io.TempDir import java.io.File import java.nio.file.Path -class QAppsUploadActionTest { +internal class QAppsUploadActionTest { private lateinit var testProjectDir: File private val server = MockWebServerFactory.create() - private val loggerFactory = PrintlnLoggerFactory - private val apk: File get() { val apk = File(testProjectDir, "test.apk") @@ -46,7 +44,7 @@ class QAppsUploadActionTest { packageName = "com.avito.android", releaseChain = false, httpClientProvider = HttpClientProvider.createStubInstance(), - loggerFactory = loggerFactory + loggerFactory = PrintlnLoggerFactory ) private val failedResponse = MockResponse() diff --git a/subprojects/delivery/sign-service/build.gradle.kts b/subprojects/delivery/sign-service/build.gradle.kts index 9df3213a35..06603a7664 100644 --- a/subprojects/delivery/sign-service/build.gradle.kts +++ b/subprojects/delivery/sign-service/build.gradle.kts @@ -15,13 +15,12 @@ dependencies { implementation(projects.subprojects.gradle.statsdConfig) implementation(projects.subprojects.gradle.buildFailer) implementation(projects.subprojects.gradle.gradleExtensions) - implementation(projects.subprojects.logger.gradleLogger) + implementation(projects.subprojects.logger.slf4jGradleLogger) implementation(libs.okhttp) testImplementation(projects.subprojects.common.truthExtensions) testImplementation(projects.subprojects.common.testOkhttp) - testImplementation(testFixtures(projects.subprojects.logger.logger)) testImplementation(testFixtures(projects.subprojects.common.httpClient)) gradleTestImplementation(projects.subprojects.gradle.testProject) diff --git a/subprojects/delivery/sign-service/locking/gradle.lockfile b/subprojects/delivery/sign-service/locking/gradle.lockfile index 1495e4e4fe..49b28c18e9 100644 --- a/subprojects/delivery/sign-service/locking/gradle.lockfile +++ b/subprojects/delivery/sign-service/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=gradleTestRuntimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -69,8 +68,6 @@ com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestIm com.squareup.okhttp3:okhttp:4.9.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,testImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -99,7 +96,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -165,7 +161,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ConfigurationCacheCompatibilityTest.kt b/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ConfigurationCacheCompatibilityTest.kt index 69222af3a0..6bfbcc342d 100644 --- a/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ConfigurationCacheCompatibilityTest.kt @@ -16,9 +16,6 @@ internal class ConfigurationCacheCompatibilityTest { @Test fun `configuration with applied plugin - ok`(@TempDir projectDir: File) { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( "app", diff --git a/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ProjectGenerator.kt b/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ProjectGenerator.kt index 2ae9183ad7..9eb98c9f30 100644 --- a/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ProjectGenerator.kt +++ b/subprojects/delivery/sign-service/src/gradleTest/kotlin/com/avito/android/signer/ProjectGenerator.kt @@ -15,14 +15,6 @@ internal fun generateTestProject( ) { TestProjectGenerator( useKts = true, - plugins = plugins { - id("com.avito.android.gradle-logger") - }, - buildGradleExtra = """ - |gradleLogger { - | printlnHandler(false, com.avito.logger.LogLevel.DEBUG) - |} - """.trimMargin(), modules = listOf( AndroidAppModule( useKts = true, diff --git a/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/AbstractSignTask.kt b/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/AbstractSignTask.kt index fef9a2b6e6..b0989def0b 100644 --- a/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/AbstractSignTask.kt +++ b/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/AbstractSignTask.kt @@ -1,13 +1,12 @@ package com.avito.android.signer +import Slf4jGradleLoggerFactory import com.avito.android.Problem import com.avito.android.signer.internal.SignViaServiceAction import com.avito.android.stats.statsd import com.avito.gradle.worker.inMemoryWork import com.avito.http.HttpClientProvider import com.avito.http.RetryInterceptor -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.time.DefaultTimeProvider import com.avito.time.TimeProvider import com.avito.utils.buildFailer @@ -18,7 +17,6 @@ import org.gradle.api.file.Directory import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction import org.gradle.workers.WorkerExecutor @@ -39,9 +37,6 @@ public abstract class AbstractSignTask( @get:Input public abstract val readWriteTimeoutSec: Property - @get:Internal - public abstract val loggerFactory: Property - @get:OutputDirectory public val signedArtifactDirectory: Property = objects.directoryProperty() @@ -51,7 +46,6 @@ public abstract class AbstractSignTask( @TaskAction public fun doWork() { - val loggerFactory = loggerFactory.get() val unsignedFile = unsignedFile() val timeProvider: TimeProvider = DefaultTimeProvider() val serviceUrl: HttpUrl = serviceUrl.map { it.toHttpUrl() }.get() @@ -61,7 +55,7 @@ public abstract class AbstractSignTask( val httpClient = HttpClientProvider( statsDSender = project.statsd.get(), timeProvider = timeProvider, - loggerFactory = loggerFactory + loggerFactory = Slf4jGradleLoggerFactory ).provide() .writeTimeout(timeout, TimeUnit.SECONDS) .readTimeout(timeout, TimeUnit.SECONDS) @@ -73,8 +67,6 @@ public abstract class AbstractSignTask( ) .build() - val logger = loggerFactory.create() - val signedDirectory = signedArtifactDirectory.get().asFile.also { it.mkdirs() } diff --git a/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/internal/TaskConfigurator.kt b/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/internal/TaskConfigurator.kt index cc4d043585..f8ca191b55 100644 --- a/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/internal/TaskConfigurator.kt +++ b/subprojects/delivery/sign-service/src/main/kotlin/com/avito/android/signer/internal/TaskConfigurator.kt @@ -2,7 +2,6 @@ package com.avito.android.signer.internal import com.avito.android.signer.AbstractSignTask import com.avito.android.signer.SignExtension -import com.avito.logger.GradleLoggerPlugin internal class TaskConfigurator( private val extension: SignExtension, @@ -25,9 +24,5 @@ internal class TaskConfigurator( task.readWriteTimeoutSec.set( extension.readWriteTimeoutSec.convention(defaultTimeoutSec) ) - - task.loggerFactory.set( - GradleLoggerPlugin.getLoggerFactory(task) - ) } } diff --git a/subprojects/delivery/upload-cd-build-result/build.gradle.kts b/subprojects/delivery/upload-cd-build-result/build.gradle.kts index 7b8b3240a7..a74e151821 100644 --- a/subprojects/delivery/upload-cd-build-result/build.gradle.kts +++ b/subprojects/delivery/upload-cd-build-result/build.gradle.kts @@ -11,7 +11,6 @@ dependencies { implementation(projects.subprojects.common.okhttp) implementation(projects.subprojects.gradle.android) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.git) implementation(projects.subprojects.gradle.buildEnvironment) implementation(projects.subprojects.gradle.gradleExtensions) @@ -19,5 +18,4 @@ dependencies { testImplementation(projects.subprojects.common.testOkhttp) testImplementation(projects.subprojects.gradle.testProject) testImplementation(testFixtures(projects.subprojects.gradle.git)) - testImplementation(testFixtures(projects.subprojects.logger.logger)) } diff --git a/subprojects/delivery/upload-cd-build-result/locking/gradle.lockfile b/subprojects/delivery/upload-cd-build-result/locking/gradle.lockfile index c7fb59243f..53cee97c12 100644 --- a/subprojects/delivery/upload-cd-build-result/locking/gradle.lockfile +++ b/subprojects/delivery/upload-cd-build-result/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=runtimeClasspath,testRuntimeClasspath androidx.databinding:databinding-common:7.0.2=runtimeClasspath,testRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=runtimeClasspath,testRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=runtimeClasspath,testRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=runtimeClasspath,testRuntimeClasspath com.android.tools:sdklib:30.0.2=runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=runtimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=runtimeClasspath,testRuntimeClasspath @@ -70,8 +69,6 @@ com.squareup.okhttp3:mockwebserver:4.9.0=testCompileClasspath,testImplementation com.squareup.okhttp3:okhttp:4.9.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=implementationDependenciesMetadata,testImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=runtimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=runtimeClasspath,testRuntimeClasspath @@ -99,7 +96,6 @@ io.netty:netty-resolver:4.1.34.Final=runtimeClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.34.Final=runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath,testRuntimeClasspath @@ -165,7 +161,6 @@ org.ow2.asm:asm-commons:7.0=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-tree:7.0=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt b/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt index 159f95db4d..12699a4292 100644 --- a/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt +++ b/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt @@ -13,7 +13,6 @@ internal object Providers { internal fun client( user: String, password: String, - logger: HttpLoggingInterceptor.Logger = HttpLoggingInterceptor.Logger.DEFAULT ): OkHttpClient { return clientBuilder .addInterceptor { chain -> @@ -25,7 +24,7 @@ internal object Providers { ) } .addInterceptor( - HttpLoggingInterceptor(logger).apply { + HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY } ) diff --git a/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt b/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt index 48d1c7defb..b870ca77fc 100644 --- a/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt +++ b/subprojects/delivery/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt @@ -2,15 +2,10 @@ package com.avito.cd import com.avito.android.androidAppExtension import com.avito.git.gitState -import com.avito.http.HttpLogger -import com.avito.logger.Logger -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.utils.gradle.envArgs import org.gradle.api.DefaultTask import org.gradle.api.provider.Property import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction public abstract class UploadCdBuildResultTask : DefaultTask() { @@ -36,14 +31,10 @@ public abstract class UploadCdBuildResultTask : DefaultTask() { @get:Input public abstract val runId: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun sendCdBuildResult() { val gitState = project.gitState() - val logger = loggerFactory.get().create() - createUploadAction(logger).send( + createUploadAction().send( testResults = CdBuildResult.TestResultsLink( reportUrl.get(), CdBuildResult.TestResultsLink.ReportCoordinates( @@ -60,13 +51,12 @@ public abstract class UploadCdBuildResultTask : DefaultTask() { ) } - private fun createUploadAction(logger: Logger): UploadCdBuildResultTaskAction { + private fun createUploadAction(): UploadCdBuildResultTaskAction { return UploadCdBuildResultTaskAction( gson = uploadCdGson, client = Providers.client( user = user.get(), password = password.get(), - logger = HttpLogger(logger) ), suppressErrors = suppressErrors.get() ) diff --git a/subprojects/delivery/upload-cd-build-result/src/test/kotlin/com/avito/cd/UploadCdBuildResultTaskActionTest.kt b/subprojects/delivery/upload-cd-build-result/src/test/kotlin/com/avito/cd/UploadCdBuildResultTaskActionTest.kt index c5b3c47202..e609d0ba27 100644 --- a/subprojects/delivery/upload-cd-build-result/src/test/kotlin/com/avito/cd/UploadCdBuildResultTaskActionTest.kt +++ b/subprojects/delivery/upload-cd-build-result/src/test/kotlin/com/avito/cd/UploadCdBuildResultTaskActionTest.kt @@ -2,7 +2,6 @@ package com.avito.cd import com.avito.git.Branch import com.avito.git.GitStateStub -import com.avito.logger.PrintlnLoggerFactory import com.avito.test.http.Mock import com.avito.test.http.MockDispatcher import com.avito.test.http.MockWebServerFactory @@ -17,8 +16,7 @@ import org.junit.jupiter.api.Test internal class UploadCdBuildResultTaskActionTest { private val mockWebServer = MockWebServerFactory.create() - private val loggerFactory = PrintlnLoggerFactory - private val dispatcher = MockDispatcher(loggerFactory = loggerFactory) + private val dispatcher = MockDispatcher() private val gson = uploadCdGson private val user = "user" private val password = "password" diff --git a/subprojects/delivery/upload-to-googleplay/build.gradle.kts b/subprojects/delivery/upload-to-googleplay/build.gradle.kts index a535921fe0..6fecc8f02c 100644 --- a/subprojects/delivery/upload-to-googleplay/build.gradle.kts +++ b/subprojects/delivery/upload-to-googleplay/build.gradle.kts @@ -6,7 +6,6 @@ plugins { dependencies { implementation(projects.subprojects.common.math) implementation(projects.subprojects.gradle.gradleExtensions) - implementation(projects.subprojects.logger.gradleLogger) implementation(gradleApi()) implementation(libs.googlePublish) } diff --git a/subprojects/delivery/upload-to-googleplay/locking/gradle.lockfile b/subprojects/delivery/upload-to-googleplay/locking/gradle.lockfile index 5957080f8b..722a0354a7 100644 --- a/subprojects/delivery/upload-to-googleplay/locking/gradle.lockfile +++ b/subprojects/delivery/upload-to-googleplay/locking/gradle.lockfile @@ -1,14 +1,11 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.6=compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata -com.fasterxml.jackson.core:jackson-core:2.9.9=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.9.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.api-client:google-api-client:1.25.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.apis:google-api-services-androidpublisher:v3-rev86-1.25.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.code.gson:gson:2.8.5=runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:guava:20.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath @@ -20,14 +17,8 @@ com.google.j2objc:j2objc-annotations:1.1=compileClasspath,implementationDependen com.google.oauth-client:google-oauth-client:1.25.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okio:okio:2.8.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -io.sentry:sentry:1.7.23=runtimeClasspath,testRuntimeClasspath junit:junit:4.12=testCompileClasspath,testImplementationDependenciesMetadata junit:junit:4.13.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.apache.httpcomponents:httpclient:4.5.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -65,5 +56,4 @@ org.junit.platform:junit-platform-suite-api:1.8.0=testRuntimeClasspath,testRunti org.junit.platform:junit-platform-suite-commons:1.8.0=testRuntimeClasspath org.junit:junit-bom:5.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=runtimeClasspath,testRuntimeClasspath empty=annotationProcessor,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,signatures,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/DeployToGooglePlayTask.kt b/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/DeployToGooglePlayTask.kt index 14865a3544..3974c7f239 100644 --- a/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/DeployToGooglePlayTask.kt +++ b/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/DeployToGooglePlayTask.kt @@ -1,12 +1,7 @@ package com.avito.upload_to_googleplay -import com.avito.logger.GradleLoggerPlugin -import com.avito.logger.LoggerFactory -import com.avito.logger.create import org.gradle.api.DefaultTask import org.gradle.api.Task -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskContainer import org.gradle.api.tasks.TaskProvider @@ -22,10 +17,6 @@ public fun TaskContainer.registerDeployToGooglePlayTask( configure { it.description = "Upload binary to google play" it.group = "Google play" - - it.loggerFactory.set( - GradleLoggerPlugin.getLoggerFactory(task = it) - ) } configure(configuration) } @@ -37,17 +28,11 @@ internal abstract class DeployToGooglePlayTask @Inject constructor( private val jsonKey = project.playConsoleJsonKey - @get:Internal - abstract val loggerFactory: Property - @TaskAction fun upload() { - val logger = loggerFactory.get().create() val googlePlayKey = jsonKey.orNull - ?: throw IllegalStateException("google play key must present in ${project.name}").apply { - logger.critical("google play key was empty", this) - } + ?: throw IllegalStateException("google play key must present in ${project.name}") val deployer = GooglePlayDeployerImpl(googlePlayKey, logger) deployer.deploy(deploys) } diff --git a/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployerImpl.kt b/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployerImpl.kt index 6ae13daf8f..8164de1d03 100644 --- a/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployerImpl.kt +++ b/subprojects/delivery/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployerImpl.kt @@ -1,6 +1,5 @@ package com.avito.upload_to_googleplay -import com.avito.logger.Logger import com.google.api.client.googleapis.auth.oauth2.GoogleCredential import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport import com.google.api.client.http.FileContent @@ -9,6 +8,7 @@ import com.google.api.services.androidpublisher.AndroidPublisher import com.google.api.services.androidpublisher.AndroidPublisherScopes import com.google.api.services.androidpublisher.model.Track import com.google.api.services.androidpublisher.model.TrackRelease +import org.slf4j.Logger import java.io.File import java.util.concurrent.TimeUnit diff --git a/subprojects/gradle/android/build.gradle.kts b/subprojects/gradle/android/build.gradle.kts index 77bf88f1e0..b266ebb908 100644 --- a/subprojects/gradle/android/build.gradle.kts +++ b/subprojects/gradle/android/build.gradle.kts @@ -13,7 +13,6 @@ dependencies { implementation(gradleApi()) implementation(projects.subprojects.common.files) implementation(projects.subprojects.gradle.process) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.gradleExtensions) testImplementation(projects.subprojects.common.truthExtensions) diff --git a/subprojects/gradle/android/locking/gradle.lockfile b/subprojects/gradle/android/locking/gradle.lockfile index 3758981615..d14432e012 100644 --- a/subprojects/gradle/android/locking/gradle.lockfile +++ b/subprojects/gradle/android/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=runtimeClasspath,testRuntimeClasspath com.android.tools:sdklib:30.0.2=runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.2=runtimeClasspath @@ -63,11 +62,6 @@ com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMe com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=runtimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okio:okio:2.8.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=runtimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=runtimeClasspath,testRuntimeClasspath @@ -95,7 +89,6 @@ io.netty:netty-resolver:4.1.34.Final=runtimeClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.34.Final=runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath,testRuntimeClasspath @@ -157,7 +150,6 @@ org.ow2.asm:asm-commons:7.0=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-tree:7.0=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/gradle/bitbucket/build.gradle.kts b/subprojects/gradle/bitbucket/build.gradle.kts index 1600c7c6e1..bb78155bad 100644 --- a/subprojects/gradle/bitbucket/build.gradle.kts +++ b/subprojects/gradle/bitbucket/build.gradle.kts @@ -13,7 +13,6 @@ dependencies { implementation(projects.subprojects.gradle.git) implementation(projects.subprojects.gradle.git) implementation(projects.subprojects.gradle.gradleExtensions) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.impactShared) implementation(libs.retrofit) implementation(libs.retrofitConverterGson) @@ -24,6 +23,5 @@ dependencies { gradleTestImplementation(projects.subprojects.gradle.testProject) gradleTestImplementation(projects.subprojects.common.testOkhttp) gradleTestImplementation(projects.subprojects.common.truthExtensions) - gradleTestImplementation(testFixtures(projects.subprojects.logger.logger)) gradleTestImplementation(testFixtures(projects.subprojects.common.httpClient)) } diff --git a/subprojects/gradle/bitbucket/src/gradleTest/kotlin/com/avito/bitbucket/BitbucketImplTest.kt b/subprojects/gradle/bitbucket/src/gradleTest/kotlin/com/avito/bitbucket/BitbucketImplTest.kt index 9193ede1c1..3cfeba3552 100644 --- a/subprojects/gradle/bitbucket/src/gradleTest/kotlin/com/avito/bitbucket/BitbucketImplTest.kt +++ b/subprojects/gradle/bitbucket/src/gradleTest/kotlin/com/avito/bitbucket/BitbucketImplTest.kt @@ -2,7 +2,6 @@ package com.avito.bitbucket import com.avito.http.HttpClientProvider import com.avito.http.createStubInstance -import com.avito.logger.PrintlnLoggerFactory import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.commit import com.avito.test.gradle.file @@ -22,13 +21,10 @@ import java.io.File internal class BitbucketImplTest { - private val loggerFactory = PrintlnLoggerFactory - private val mockWebServer = MockWebServerFactory.create() private val dispatcher = MockDispatcher( unmockedResponse = MockResponse().setResponseCode(200), - loggerFactory = loggerFactory ) .also { dispatcher -> mockWebServer.dispatcher = dispatcher } diff --git a/subprojects/gradle/code-ownership/src/gradleTest/kotlin/com/avito/android/StrictOwnershipTest.kt b/subprojects/gradle/code-ownership/src/gradleTest/kotlin/com/avito/android/StrictOwnershipTest.kt index ea0d9ddb1f..0e1e11adf5 100644 --- a/subprojects/gradle/code-ownership/src/gradleTest/kotlin/com/avito/android/StrictOwnershipTest.kt +++ b/subprojects/gradle/code-ownership/src/gradleTest/kotlin/com/avito/android/StrictOwnershipTest.kt @@ -28,7 +28,6 @@ internal class StrictOwnershipTest { ManualTempFolder.runIn { projectDir -> TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") id("com.avito.android.code-ownership") }, diff --git a/subprojects/gradle/design-screenshots/build.gradle.kts b/subprojects/gradle/design-screenshots/build.gradle.kts index e9ddd26cfa..c0fad32645 100644 --- a/subprojects/gradle/design-screenshots/build.gradle.kts +++ b/subprojects/gradle/design-screenshots/build.gradle.kts @@ -7,8 +7,8 @@ plugins { dependencies { implementation(projects.subprojects.gradle.gradleExtensions) implementation(projects.subprojects.gradle.android) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.testRunner.service) + implementation(projects.subprojects.logger.slf4jGradleLogger) implementation(projects.subprojects.common.result) diff --git a/subprojects/gradle/design-screenshots/locking/gradle.lockfile b/subprojects/gradle/design-screenshots/locking/gradle.lockfile index 52f2ad9843..891d5a2a10 100644 --- a/subprojects/gradle/design-screenshots/locking/gradle.lockfile +++ b/subprojects/gradle/design-screenshots/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.2=gradleTestCompileOnly,runtimeClasspath @@ -68,8 +67,6 @@ com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestIm com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -99,7 +96,6 @@ io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeCla io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.reactivex:rxjava:1.3.8=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -163,7 +159,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ClearScreenshotsTask.kt b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ClearScreenshotsTask.kt index 8c7859de37..9f7bd8b3a0 100644 --- a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ClearScreenshotsTask.kt +++ b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ClearScreenshotsTask.kt @@ -1,7 +1,6 @@ package com.avito.plugin -import com.avito.logger.LoggerFactory -import com.avito.logger.create +import Slf4jGradleLoggerFactory import com.avito.runner.service.worker.device.adb.Adb import com.avito.runner.service.worker.device.adb.AdbDeviceFactory import com.avito.runner.service.worker.device.adb.AdbDevicesManager @@ -10,7 +9,6 @@ import com.avito.utils.ProcessRunner import org.gradle.api.DefaultTask import org.gradle.api.provider.Property import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import java.nio.file.Paths @@ -19,24 +17,17 @@ public abstract class ClearScreenshotsTask : DefaultTask() { @get:Input public abstract val applicationIdProperty: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun clearScreenshots() { - val loggerFactory = loggerFactory.get() - val logger = loggerFactory.create() - val applicationId = applicationIdProperty.get() val adb = Adb() val adbDevicesManager = AdbDevicesManager( - loggerFactory = loggerFactory, adb = adb ) val currentDevice = DeviceProviderLocal( adbDevicesManager = adbDevicesManager, adbDeviceFactory = AdbDeviceFactory( - loggerFactory = loggerFactory, + loggerFactory = Slf4jGradleLoggerFactory, adb = adb, timeProvider = DefaultTimeProvider(), metricsConfig = null, diff --git a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt index 673a9185d8..4999a49bde 100644 --- a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt +++ b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt @@ -1,8 +1,6 @@ package com.avito.plugin -import com.avito.logger.Logger -import com.avito.logger.LoggerFactory -import com.avito.logger.create +import Slf4jGradleLoggerFactory import com.avito.runner.service.worker.device.adb.Adb import com.avito.runner.service.worker.device.adb.AdbDeviceFactory import com.avito.runner.service.worker.device.adb.AdbDevicesManager @@ -11,7 +9,6 @@ import com.avito.utils.ProcessRunner import org.gradle.api.DefaultTask import org.gradle.api.provider.Property import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import java.io.File import java.nio.file.Paths @@ -21,21 +18,15 @@ public abstract class PullScreenshotsTask : DefaultTask() { @get:Input public abstract val applicationIdProperty: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun pullScreenshots() { - val loggerFactory = loggerFactory.get() - val logger = loggerFactory.create() - val applicationId = applicationIdProperty.get() val adb = Adb() - val adbDevicesManager = AdbDevicesManager(loggerFactory = loggerFactory, adb = adb) + val adbDevicesManager = AdbDevicesManager(adb = adb) val currentDevice = DeviceProviderLocal( adbDevicesManager = adbDevicesManager, adbDeviceFactory = AdbDeviceFactory( - loggerFactory = loggerFactory, + loggerFactory = Slf4jGradleLoggerFactory, adb = adb, timeProvider = DefaultTimeProvider(), metricsConfig = null, @@ -60,7 +51,7 @@ public abstract class PullScreenshotsTask : DefaultTask() { } } logger.debug("Screenshots are pulled to $referencePath") - clearOutputFiles(logger) + clearOutputFiles() }, onFailure = { logger.warn("Cannot list screenshot directory", it) @@ -68,7 +59,7 @@ public abstract class PullScreenshotsTask : DefaultTask() { ) } - private fun clearOutputFiles(logger: Logger) { + private fun clearOutputFiles() { File(project.rootDir.path).listFiles()?.forEach { file -> if (!file.isDirectory && file.name.endsWith(".output")) { file.delete() diff --git a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ScreenshotsPlugin.kt b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ScreenshotsPlugin.kt index b57aaf50cb..ac149eda86 100644 --- a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ScreenshotsPlugin.kt +++ b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/ScreenshotsPlugin.kt @@ -2,7 +2,6 @@ package com.avito.plugin import com.avito.android.withAndroidApp import com.avito.capitalize -import com.avito.logger.GradleLoggerPlugin import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.register @@ -21,10 +20,6 @@ public class ScreenshotsPlugin : Plugin { description = "Create and pull screenshots from device" applicationIdProperty.set(applicationVariant.testVariant.applicationId) - - loggerFactory.set( - GradleLoggerPlugin.getLoggerFactory(this) - ) } project.tasks.register( @@ -34,8 +29,6 @@ public class ScreenshotsPlugin : Plugin { description = "Clear screenshots on device" applicationIdProperty.set(applicationVariant.applicationId) - - loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) } } } diff --git a/subprojects/gradle/git/locking/gradle.lockfile b/subprojects/gradle/git/locking/gradle.lockfile index 31e21c58ba..cb8086e11a 100644 --- a/subprojects/gradle/git/locking/gradle.lockfile +++ b/subprojects/gradle/git/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=testRuntimeClasspath com.android.tools:sdklib:30.0.2=testRuntimeClasspath com.android:signflinger:7.0.2=testRuntimeClasspath com.android:zipflinger:7.0.2=testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=testRuntimeClasspath com.google.android:annotations:4.1.1.4=testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -62,13 +61,10 @@ com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMe com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:okhttp:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=testImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=testRuntimeClasspath com.squareup:javapoet:1.10.0=testRuntimeClasspath com.squareup:javawriter:2.5.0=testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=testRuntimeClasspath @@ -96,7 +92,6 @@ io.netty:netty-resolver:4.1.34.Final=testRuntimeClasspath io.netty:netty-transport:4.1.34.Final=testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=testRuntimeClasspath -io.sentry:sentry:1.7.23=testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=testRuntimeClasspath @@ -163,7 +158,6 @@ org.ow2.asm:asm-commons:7.0=testRuntimeClasspath org.ow2.asm:asm-tree:7.0=testRuntimeClasspath org.ow2.asm:asm-util:7.0=testRuntimeClasspath org.ow2.asm:asm:7.0=testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=testRuntimeClasspath xerces:xercesImpl:2.12.0=testRuntimeClasspath xml-apis:xml-apis:1.4.01=testRuntimeClasspath diff --git a/subprojects/gradle/gradle-extensions/locking/gradle.lockfile b/subprojects/gradle/gradle-extensions/locking/gradle.lockfile index 48e0f4e695..26e8772bf9 100644 --- a/subprojects/gradle/gradle-extensions/locking/gradle.lockfile +++ b/subprojects/gradle/gradle-extensions/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=testRuntimeClasspath com.android.tools:sdklib:30.0.2=testRuntimeClasspath com.android:signflinger:7.0.2=testRuntimeClasspath com.android:zipflinger:7.0.2=testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=testRuntimeClasspath com.google.android:annotations:4.1.1.4=testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -62,13 +61,10 @@ com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMe com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:okhttp:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=testImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=testRuntimeClasspath com.squareup:javapoet:1.10.0=testRuntimeClasspath com.squareup:javawriter:2.5.0=testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=testRuntimeClasspath @@ -96,7 +92,6 @@ io.netty:netty-resolver:4.1.34.Final=testRuntimeClasspath io.netty:netty-transport:4.1.34.Final=testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=testRuntimeClasspath -io.sentry:sentry:1.7.23=testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=testRuntimeClasspath @@ -158,7 +153,6 @@ org.ow2.asm:asm-commons:7.0=testRuntimeClasspath org.ow2.asm:asm-tree:7.0=testRuntimeClasspath org.ow2.asm:asm-util:7.0=testRuntimeClasspath org.ow2.asm:asm:7.0=testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=testRuntimeClasspath xerces:xercesImpl:2.12.0=testRuntimeClasspath xml-apis:xml-apis:1.4.01=testRuntimeClasspath diff --git a/subprojects/gradle/graphite-config/build.gradle.kts b/subprojects/gradle/graphite-config/build.gradle.kts index 1e941ab13f..45c768f962 100644 --- a/subprojects/gradle/graphite-config/build.gradle.kts +++ b/subprojects/gradle/graphite-config/build.gradle.kts @@ -7,6 +7,5 @@ dependencies { api(projects.subprojects.common.graphite) implementation(gradleApi()) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.gradleExtensions) } diff --git a/subprojects/gradle/graphite-config/locking/gradle.lockfile b/subprojects/gradle/graphite-config/locking/gradle.lockfile index 8738441cb3..169f684aae 100644 --- a/subprojects/gradle/graphite-config/locking/gradle.lockfile +++ b/subprojects/gradle/graphite-config/locking/gradle.lockfile @@ -1,11 +1,8 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.code.gson:gson:2.8.5=runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:guava:27.0.1-android=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -13,12 +10,6 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=test com.google.j2objc:j2objc-annotations:1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okio:okio:2.8.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=runtimeClasspath,testRuntimeClasspath junit:junit:4.12=testCompileClasspath,testImplementationDependenciesMetadata junit:junit:4.13.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata @@ -54,5 +45,4 @@ org.junit.platform:junit-platform-suite-api:1.8.0=testRuntimeClasspath,testRunti org.junit.platform:junit-platform-suite-commons:1.8.0=testRuntimeClasspath org.junit:junit-bom:5.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=runtimeClasspath,testRuntimeClasspath empty=annotationProcessor,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,signatures,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/subprojects/gradle/impact-shared/build.gradle.kts b/subprojects/gradle/impact-shared/build.gradle.kts index 6953401a52..8b53292e7d 100644 --- a/subprojects/gradle/impact-shared/build.gradle.kts +++ b/subprojects/gradle/impact-shared/build.gradle.kts @@ -13,7 +13,6 @@ dependencies { implementation(projects.subprojects.gradle.git) implementation(projects.subprojects.gradle.gradleExtensions) implementation(projects.subprojects.gradle.process) - implementation(projects.subprojects.logger.gradleLogger) implementation(libs.antPattern) implementation(libs.kotlinGradle) diff --git a/subprojects/gradle/impact-shared/locking/gradle.lockfile b/subprojects/gradle/impact-shared/locking/gradle.lockfile index 5246eee3d5..bb37b42fd0 100644 --- a/subprojects/gradle/impact-shared/locking/gradle.lockfile +++ b/subprojects/gradle/impact-shared/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +androidx.annotation:annotation:1.1.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath androidx.databinding:databinding-common:7.0.2=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=runtimeClasspath,testCompileOnly,testFixture com.android.tools:sdklib:30.0.2=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -com.fasterxml.jackson.core:jackson-core:2.9.9=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.gundy:semver4j:0.16.4=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -65,13 +64,10 @@ com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testCompileO com.googlecode.json-simple:json-simple:1.1=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -com.squareup.okhttp3:okhttp:4.9.0=runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +com.squareup.okhttp3:okhttp:4.9.0=testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.squareup.okio:okio-metadata:2.8.0=testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -com.squareup.okio:okio:2.8.0=runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -com.squareup.retrofit2:converter-gson:2.9.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.squareup:javapoet:1.10.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.sun.activation:javax.activation:1.2.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -101,7 +97,6 @@ io.netty:netty-resolver:4.1.34.Final=runtimeClasspath,testCompileOnly,testFixtur io.netty:netty-transport:4.1.34.Final=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -181,7 +176,6 @@ org.ow2.asm:asm-commons:7.0=runtimeClasspath,testCompileOnly,testFixturesRuntime org.ow2.asm:asm-tree:7.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/ImpactFallbackDetectorImplementation.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/ImpactFallbackDetectorImplementation.kt index b8a0fadc52..91e0e7ecaf 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/ImpactFallbackDetectorImplementation.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/ImpactFallbackDetectorImplementation.kt @@ -8,9 +8,6 @@ import com.avito.impact.platformModules import com.avito.impact.plugin.ImpactAnalysisExtension import com.avito.impact.supportedByImpactAnalysisProjects import com.avito.kotlin.dsl.isRoot -import com.avito.logger.GradleLoggerPlugin -import com.avito.logger.LoggerFactory -import com.avito.logger.create import org.gradle.api.Project import org.gradle.api.provider.Provider import org.gradle.kotlin.dsl.findByType @@ -20,12 +17,9 @@ internal class ImpactFallbackDetectorImplementation( private val configuration: ImpactAnalysisExtension, private val project: Project, private val gitState: Provider, - private val loggerFactory: Provider ) : ImpactFallbackDetector { - private val logger by lazy { - loggerFactory.get().create() - } + private val logger = project.logger override val isFallback: ImpactFallbackDetector.Result by lazy { @@ -117,7 +111,6 @@ internal class ImpactFallbackDetectorImplementation( configuration, project = project, gitState = project.gitState(), - loggerFactory = GradleLoggerPlugin.getLoggerFactory(project) ) } } diff --git a/subprojects/gradle/impact/build.gradle.kts b/subprojects/gradle/impact/build.gradle.kts index 28fb50487c..17e19d0b81 100644 --- a/subprojects/gradle/impact/build.gradle.kts +++ b/subprojects/gradle/impact/build.gradle.kts @@ -9,7 +9,6 @@ dependencies { implementation(gradleApi()) implementation(projects.subprojects.gradle.android) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.common.files) implementation(projects.subprojects.common.math) implementation(projects.subprojects.gradle.git) diff --git a/subprojects/gradle/impact/locking/gradle.lockfile b/subprojects/gradle/impact/locking/gradle.lockfile index a9050adb6b..aae4824819 100644 --- a/subprojects/gradle/impact/locking/gradle.lockfile +++ b/subprojects/gradle/impact/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.gundy:semver4j:0.16.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -64,13 +63,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -101,7 +97,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -178,7 +173,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ConfigurationCacheCompatibilityTest.kt b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ConfigurationCacheCompatibilityTest.kt index 224c5e4ab6..943af0d677 100644 --- a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ConfigurationCacheCompatibilityTest.kt @@ -14,7 +14,6 @@ internal class ConfigurationCacheCompatibilityTest { fun `configuration with applied plugin`(@TempDir projectDir: File) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") } ).generateIn(projectDir) diff --git a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactAnalysisTest.kt b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactAnalysisTest.kt index 1e6c318f8d..bddf91b5d9 100644 --- a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactAnalysisTest.kt +++ b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactAnalysisTest.kt @@ -545,7 +545,6 @@ internal class ImpactAnalysisTest { private fun generateProject(modules: List) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = modules diff --git a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactPluginTest.kt b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactPluginTest.kt index 347078ed2a..392234944d 100644 --- a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactPluginTest.kt +++ b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/ImpactPluginTest.kt @@ -13,7 +13,6 @@ internal class ImpactPluginTest { fun simpleIntegration(@TempDir projectDir: File) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") } ).generateIn(projectDir) diff --git a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/SourceSetsImpactTest.kt b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/SourceSetsImpactTest.kt index b093294cda..0f73625dde 100644 --- a/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/SourceSetsImpactTest.kt +++ b/subprojects/gradle/impact/src/gradleTest/kotlin/com/avito/impact/plugin/SourceSetsImpactTest.kt @@ -45,7 +45,6 @@ internal class SourceSetsImpactTest { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.impact") }, modules = listOf( diff --git a/subprojects/gradle/module-dependencies-graph/build.gradle.kts b/subprojects/gradle/module-dependencies-graph/build.gradle.kts index 617c7d584d..33d96e5fff 100644 --- a/subprojects/gradle/module-dependencies-graph/build.gradle.kts +++ b/subprojects/gradle/module-dependencies-graph/build.gradle.kts @@ -8,12 +8,10 @@ dependencies { compileOnly(gradleApi()) implementation(projects.subprojects.gradle.moduleDependenciesShared) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.common.math) implementation(projects.subprojects.gradle.gradleExtensions) gradleTestImplementation(projects.subprojects.common.truthExtensions) - gradleTestImplementation(testFixtures(projects.subprojects.logger.logger)) gradleTestImplementation(projects.subprojects.gradle.testProject) } diff --git a/subprojects/gradle/module-dependencies-graph/locking/gradle.lockfile b/subprojects/gradle/module-dependencies-graph/locking/gradle.lockfile index 2c92e89f53..c0533f6360 100644 --- a/subprojects/gradle/module-dependencies-graph/locking/gradle.lockfile +++ b/subprojects/gradle/module-dependencies-graph/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=gradleTestRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestRuntimeClasspath @@ -37,12 +37,10 @@ com.android.tools:sdk-common:30.0.2=gradleTestRuntimeClasspath com.android.tools:sdklib:30.0.2=gradleTestRuntimeClasspath com.android:signflinger:7.0.2=gradleTestRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.code.gson:gson:2.8.5=gradleTestCompileOnly,runtimeClasspath,testRuntimeClasspath com.google.code.gson:gson:2.8.6=gradleTestRuntimeClasspath com.google.crypto.tink:tink:1.3.0-rc2=gradleTestRuntimeClasspath com.google.dagger:dagger:2.28.3=gradleTestRuntimeClasspath @@ -63,13 +61,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestRuntimeClasspath @@ -97,7 +92,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=gradleTestRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestRuntimeClasspath @@ -160,7 +154,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-tree:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm:7.0=gradleTestRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestRuntimeClasspath diff --git a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/AndroidAppsGraphBuilderTest.kt b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/AndroidAppsGraphBuilderTest.kt index 205c2261b8..ec3e09be6e 100644 --- a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/AndroidAppsGraphBuilderTest.kt +++ b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/AndroidAppsGraphBuilderTest.kt @@ -1,6 +1,5 @@ package com.avito.module.dependencies -import com.avito.logger.PrintlnLoggerFactory import com.avito.module.configurations.ConfigurationType import com.avito.module.internal.dependencies.AndroidAppsGraphBuilder import com.avito.module.internal.dependencies.DependenciesGraphBuilder @@ -158,6 +157,6 @@ internal class AndroidAppsGraphBuilderTest { } private fun graphBuilder() = AndroidAppsGraphBuilder( - DependenciesGraphBuilder(root, PrintlnLoggerFactory) + DependenciesGraphBuilder(root) ) } diff --git a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/DependenciesGraphTestProject.kt b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/DependenciesGraphTestProject.kt index b5d2a33002..d42bb986c1 100644 --- a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/DependenciesGraphTestProject.kt +++ b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/DependenciesGraphTestProject.kt @@ -13,7 +13,6 @@ internal object DependenciesGraphTestProject { fun generate(dir: File) { TestProjectGenerator( plugins = plugins { - id("com.avito.android.gradle-logger") id("com.avito.android.module-dependencies-graph") }, modules = listOf( diff --git a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/FindAndroidAppTaskActionTest.kt b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/FindAndroidAppTaskActionTest.kt index c4932d09f2..d5c2df879e 100644 --- a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/FindAndroidAppTaskActionTest.kt +++ b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/dependencies/FindAndroidAppTaskActionTest.kt @@ -1,6 +1,5 @@ package com.avito.module.dependencies -import com.avito.logger.PrintlnLoggerFactory import com.avito.module.configurations.ConfigurationType import com.avito.module.internal.dependencies.AndroidAppsGraphBuilder import com.avito.module.internal.dependencies.DependenciesGraphBuilder @@ -18,7 +17,7 @@ import org.junit.jupiter.api.Test public class FindAndroidAppTaskActionTest { private val root = rootProject() - private val graphBuilder = AndroidAppsGraphBuilder(DependenciesGraphBuilder(root, PrintlnLoggerFactory)) + private val graphBuilder = AndroidAppsGraphBuilder(DependenciesGraphBuilder(root)) private val action = FindAndroidAppTaskAction(graphBuilder) @Test diff --git a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/metrics/CollectAppsMetricsActionTest.kt b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/metrics/CollectAppsMetricsActionTest.kt index ed2ca8403c..93d8ce3558 100644 --- a/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/metrics/CollectAppsMetricsActionTest.kt +++ b/subprojects/gradle/module-dependencies-graph/src/gradleTest/kotlin/com/avito/module/metrics/CollectAppsMetricsActionTest.kt @@ -1,6 +1,5 @@ package com.avito.module.metrics -import com.avito.logger.PrintlnLoggerFactory import com.avito.module.internal.dependencies.AndroidAppsGraphBuilder import com.avito.module.internal.dependencies.DependenciesGraphBuilder import com.avito.module.metrics.metrics.AppsHealthData @@ -90,7 +89,7 @@ internal class CollectAppsMetricsActionTest { } private fun collectMetrics(root: Project): AppsHealthData { - val graphBuilder = DependenciesGraphBuilder(root, PrintlnLoggerFactory) + val graphBuilder = DependenciesGraphBuilder(root) val androidGraphBuilder = AndroidAppsGraphBuilder(graphBuilder) return CollectAppsMetricsAction(androidGraphBuilder).collect() diff --git a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/FindAndroidAppTask.kt b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/FindAndroidAppTask.kt index f014dcd701..09f88af4c1 100644 --- a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/FindAndroidAppTask.kt +++ b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/FindAndroidAppTask.kt @@ -1,6 +1,5 @@ package com.avito.module.dependencies -import com.avito.logger.LoggerFactory import com.avito.module.configurations.ConfigurationType import com.avito.module.configurations.ConfigurationType.AndroidTests import com.avito.module.configurations.ConfigurationType.Main @@ -13,7 +12,6 @@ import org.gradle.api.DefaultTask import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.options.Option import org.gradle.util.Path @@ -43,14 +41,11 @@ public abstract class FindAndroidAppTask @Inject constructor( @get:Input public abstract val modules: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun action() { val modules = parseModules() val inputConfiguration = configuration.get() - val graphBuilder = DependenciesGraphBuilder(project.rootProject, loggerFactory.get()) + val graphBuilder = DependenciesGraphBuilder(project.rootProject) val androidAppsGraphBuilder = AndroidAppsGraphBuilder(graphBuilder) val action = FindAndroidAppTaskAction(androidAppsGraphBuilder) val advisor = FindAndroidAppTaskAdvisor() diff --git a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/ModuleDependenciesGraphPlugin.kt b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/ModuleDependenciesGraphPlugin.kt index ea061a4734..ebfc1b8523 100644 --- a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/ModuleDependenciesGraphPlugin.kt +++ b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/dependencies/ModuleDependenciesGraphPlugin.kt @@ -1,6 +1,5 @@ package com.avito.module.dependencies -import com.avito.logger.GradleLoggerPlugin import com.avito.module.metrics.CollectAppsMetricsTask import org.gradle.api.Plugin import org.gradle.api.Project @@ -12,15 +11,8 @@ public class ModuleDependenciesGraphPlugin : Plugin { require(target.rootProject == target) { "must be applied to the root project" } - target.tasks.register("findAndroidApp") { - loggerFactory.set( - GradleLoggerPlugin.getLoggerFactory(this) - ) - } + target.tasks.register("findAndroidApp") target.tasks.register("collectAppsMetrics") { - loggerFactory.set( - GradleLoggerPlugin.getLoggerFactory(this) - ) outputs.upToDateWhen { false // heavy to calculate correct inputs diff --git a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/internal/dependencies/DependenciesGraphBuilder.kt b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/internal/dependencies/DependenciesGraphBuilder.kt index ab236902ea..5e8ba0ccef 100644 --- a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/internal/dependencies/DependenciesGraphBuilder.kt +++ b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/internal/dependencies/DependenciesGraphBuilder.kt @@ -1,7 +1,5 @@ package com.avito.module.internal.dependencies -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.module.configurations.ConfigurationType import com.avito.module.internal.configurations.ConfigurationCoordinate import com.avito.module.internal.dependencies.ProjectConfigurationNode.ConfigurationNode @@ -10,7 +8,6 @@ import org.gradle.api.artifacts.ProjectDependency internal class DependenciesGraphBuilder( private val root: Project, - loggerFactory: LoggerFactory ) { init { @@ -19,7 +16,7 @@ internal class DependenciesGraphBuilder( } } - private val logger = loggerFactory.create() + private val logger = root.logger private val visited = mutableMapOf() diff --git a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/metrics/CollectAppsMetricsTask.kt b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/metrics/CollectAppsMetricsTask.kt index e0178d653f..a56200fd1d 100644 --- a/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/metrics/CollectAppsMetricsTask.kt +++ b/subprojects/gradle/module-dependencies-graph/src/main/kotlin/com/avito/module/metrics/CollectAppsMetricsTask.kt @@ -1,6 +1,5 @@ package com.avito.module.metrics -import com.avito.logger.LoggerFactory import com.avito.module.internal.dependencies.AndroidAppsGraphBuilder import com.avito.module.internal.dependencies.DependenciesGraphBuilder import com.avito.module.metrics.metrics.AbsoluteMetrics @@ -11,7 +10,6 @@ import org.gradle.api.DefaultTask import org.gradle.api.file.RegularFile import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction import org.gradle.util.Path @@ -43,12 +41,9 @@ public abstract class CollectAppsMetricsTask @Inject constructor( set(File(outputDir, "apps-common-modules-details.log")) } - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun action() { - val graphBuilder = DependenciesGraphBuilder(project.rootProject, loggerFactory.get()) + val graphBuilder = DependenciesGraphBuilder(project.rootProject) val androidAppsGraphBuilder = AndroidAppsGraphBuilder(graphBuilder) val data = CollectAppsMetricsAction(androidAppsGraphBuilder).collect() diff --git a/subprojects/gradle/module-types/build.gradle.kts b/subprojects/gradle/module-types/build.gradle.kts index 3e5214a255..d2c87e7619 100644 --- a/subprojects/gradle/module-types/build.gradle.kts +++ b/subprojects/gradle/module-types/build.gradle.kts @@ -8,7 +8,6 @@ plugins { dependencies { api(projects.subprojects.gradle.moduleDependenciesShared) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.gradleExtensions) implementation(projects.subprojects.common.problem) implementation(libs.kotlinGradle) diff --git a/subprojects/gradle/module-types/locking/gradle.lockfile b/subprojects/gradle/module-types/locking/gradle.lockfile index fe61430592..584c1183b5 100644 --- a/subprojects/gradle/module-types/locking/gradle.lockfile +++ b/subprojects/gradle/module-types/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +androidx.annotation:annotation:1.1.0=gradleTestRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestRuntimeClasspath @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestRuntimeClasspath com.android.tools:sdklib:30.0.2=gradleTestRuntimeClasspath com.android:signflinger:7.0.2=gradleTestRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.gundy:semver4j:0.16.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestRuntimeClasspath @@ -64,13 +63,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestRuntimeClasspath @@ -99,7 +95,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=gradleTestRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestRuntimeClasspath @@ -177,7 +172,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-tree:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestRuntimeClasspath org.ow2.asm:asm:7.0=gradleTestRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestRuntimeClasspath diff --git a/subprojects/gradle/module-types/src/gradleTest/kotlin/com/avito/android/module_type/ModuleTypesProjectGenerator.kt b/subprojects/gradle/module-types/src/gradleTest/kotlin/com/avito/android/module_type/ModuleTypesProjectGenerator.kt index 6052457be6..9f15d60b33 100644 --- a/subprojects/gradle/module-types/src/gradleTest/kotlin/com/avito/android/module_type/ModuleTypesProjectGenerator.kt +++ b/subprojects/gradle/module-types/src/gradleTest/kotlin/com/avito/android/module_type/ModuleTypesProjectGenerator.kt @@ -48,7 +48,6 @@ internal class ModuleTypesProjectGenerator( TestProjectGenerator( imports = listOf("import com.avito.android.module_type.*"), plugins = plugins { - id("com.avito.android.gradle-logger") id(pluginId) }, modules = listOf( diff --git a/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/ModuleTypesPlugin.kt b/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/ModuleTypesPlugin.kt index eb77918d81..1d77c507f6 100644 --- a/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/ModuleTypesPlugin.kt +++ b/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/ModuleTypesPlugin.kt @@ -4,7 +4,6 @@ import com.avito.android.module_type.internal.CheckModuleDependenciesTask import com.avito.android.module_type.internal.ExtractModuleDescriptionTask import com.avito.kotlin.dsl.isRoot import com.avito.kotlin.dsl.typedNamedOrNull -import com.avito.logger.GradleLoggerPlugin import com.avito.module.configurations.ConfigurationType import com.avito.module.dependencies.directDependenciesOnProjects import org.gradle.api.Plugin @@ -32,7 +31,6 @@ public class ModuleTypesPlugin : Plugin { task.group = "verification" task.severity.set(extension.severity) task.restrictions.set(extension.restrictions) - task.loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(task)) } } diff --git a/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/internal/CheckModuleDependenciesTask.kt b/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/internal/CheckModuleDependenciesTask.kt index 94cfbe62c9..6b638af30c 100644 --- a/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/internal/CheckModuleDependenciesTask.kt +++ b/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/module_type/internal/CheckModuleDependenciesTask.kt @@ -6,7 +6,6 @@ import com.avito.android.module_type.DependencyRestriction import com.avito.android.module_type.ModuleTypeRootExtension import com.avito.android.module_type.ModuleWithType import com.avito.android.module_type.Severity -import com.avito.logger.LoggerFactory import org.gradle.api.DefaultTask import org.gradle.api.file.Directory import org.gradle.api.file.ProjectLayout @@ -36,16 +35,11 @@ internal abstract class CheckModuleDependenciesTask @Inject constructor( @get:Input abstract val restrictions: ListProperty - @get:Internal - abstract val loggerFactory: Property - @TaskAction fun checkDependencies() { val violations = ModulesRestrictionsFinder(readModules(), restrictions.get()).violations() if (violations.isNotEmpty()) { - val logger = loggerFactory.get().create("") - val error = buildProblem(violations).asRuntimeException() @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA") diff --git a/subprojects/gradle/prosector/build.gradle.kts b/subprojects/gradle/prosector/build.gradle.kts index e7c817c0d0..07db866e9b 100644 --- a/subprojects/gradle/prosector/build.gradle.kts +++ b/subprojects/gradle/prosector/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } dependencies { - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.android) implementation(projects.subprojects.gradle.statsdConfig) implementation(projects.subprojects.gradle.gradleExtensions) implementation(projects.subprojects.common.httpClient) implementation(projects.subprojects.common.okhttp) + implementation(projects.subprojects.logger.slf4jGradleLogger) implementation(libs.retrofit) implementation(libs.retrofitConverterGson) diff --git a/subprojects/gradle/prosector/locking/gradle.lockfile b/subprojects/gradle/prosector/locking/gradle.lockfile index 109c3b5bea..72a939bf07 100644 --- a/subprojects/gradle/prosector/locking/gradle.lockfile +++ b/subprojects/gradle/prosector/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=gradleTestRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -100,7 +99,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -167,7 +165,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/gradle/prosector/src/gradleTest/kotlin/ProsectorPluginTest.kt b/subprojects/gradle/prosector/src/gradleTest/kotlin/ProsectorPluginTest.kt index 116b35e88e..b311f1ca46 100644 --- a/subprojects/gradle/prosector/src/gradleTest/kotlin/ProsectorPluginTest.kt +++ b/subprojects/gradle/prosector/src/gradleTest/kotlin/ProsectorPluginTest.kt @@ -109,9 +109,6 @@ internal class ProsectorPluginTest { versionName: String ) { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( appModuleName, diff --git a/subprojects/gradle/prosector/src/main/kotlin/ProsectorPlugin.kt b/subprojects/gradle/prosector/src/main/kotlin/ProsectorPlugin.kt index ce7e774fe4..e7dc815db0 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/ProsectorPlugin.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/ProsectorPlugin.kt @@ -1,5 +1,5 @@ + import com.avito.android.withAndroidApp -import com.avito.logger.GradleLoggerPlugin import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.create @@ -30,8 +30,6 @@ public class ProsectorPlugin : Plugin { commit = config.commitHash ) ) - loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) - dependsOn(packageTask) } } diff --git a/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt b/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt index 9d44a119b3..a1ac938ca4 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt @@ -1,7 +1,6 @@ + import com.avito.android.stats.statsd import com.avito.http.HttpClientProvider -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.time.DefaultTimeProvider import com.avito.time.TimeProvider import com.google.gson.Gson @@ -9,7 +8,6 @@ import com.google.gson.GsonBuilder import okhttp3.MultipartBody import okhttp3.RequestBody.Companion.asRequestBody import org.gradle.api.DefaultTask -import org.gradle.api.provider.Property import org.gradle.api.tasks.CacheableTask import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputFile @@ -37,19 +35,14 @@ public abstract class ProsectorReleaseAnalysisTask : DefaultTask() { @Internal public var debug: Boolean = false - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun doWork() { - val loggerFactory = loggerFactory.get() - val logger = loggerFactory.create() val timeProvider: TimeProvider = DefaultTimeProvider() val httpClientProvider = HttpClientProvider( statsDSender = project.statsd.get(), timeProvider = timeProvider, - loggerFactory = loggerFactory + loggerFactory = Slf4jGradleLoggerFactory ) try { @@ -73,7 +66,7 @@ public abstract class ProsectorReleaseAnalysisTask : DefaultTask() { }" ) } catch (e: Throwable) { - logger.critical("Prosector upload failed", e) + logger.error("Prosector upload failed", e) } } diff --git a/subprojects/gradle/slack/build.gradle.kts b/subprojects/gradle/slack/build.gradle.kts index 03a953a5e2..a90742fa27 100644 --- a/subprojects/gradle/slack/build.gradle.kts +++ b/subprojects/gradle/slack/build.gradle.kts @@ -10,7 +10,6 @@ plugins { dependencies { api(projects.subprojects.common.result) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.common.time) implementation(projects.subprojects.common.httpClient) implementation(projects.subprojects.common.okhttp) @@ -26,7 +25,6 @@ dependencies { testImplementation(testFixtures(projects.subprojects.common.statsd)) testImplementation(testFixtures(projects.subprojects.common.time)) testImplementation(testFixtures(projects.subprojects.gradle.slack)) - testImplementation(testFixtures(projects.subprojects.logger.logger)) } tasks.named("integrationTest").configure { diff --git a/subprojects/gradle/slack/locking/gradle.lockfile b/subprojects/gradle/slack/locking/gradle.lockfile index 0599be0694..6fd14d2cb5 100644 --- a/subprojects/gradle/slack/locking/gradle.lockfile +++ b/subprojects/gradle/slack/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=integTestRuntimeClasspath,testRuntimeClasspa com.android.tools:sdklib:30.0.2=integTestRuntimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=integTestRuntimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=integTestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=integTestCompileOnly,integTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.seratch:jslack-api-client:3.4.2=compileClasspath,implementationDependenciesMetadata,integTestCompileClasspath,integTestCompileOnly,integTestCompileOnlyDependenciesMetadata,integTestRuntimeClasspath,integTestRuntimeOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.github.seratch:jslack-api-model:3.4.2=compileClasspath,implementationDependenciesMetadata,integTestCompileClasspath,integTestCompileOnly,integTestCompileOnlyDependenciesMetadata,integTestRuntimeClasspath,integTestRuntimeOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.google.android:annotations:4.1.1.4=integTestRuntimeClasspath,testRuntimeClasspath @@ -69,8 +68,6 @@ com.squareup.okhttp3:mockwebserver:4.9.0=integTestCompileClasspath,integTestRunt com.squareup.okhttp3:okhttp:4.9.0=compileClasspath,implementationDependenciesMetadata,integTestCompileClasspath,integTestCompileOnly,integTestCompileOnlyDependenciesMetadata,integTestRuntimeClasspath,integTestRuntimeOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.squareup.okio:okio-metadata:2.8.0=implementationDependenciesMetadata,integTestCompileOnlyDependenciesMetadata,integTestRuntimeOnlyDependenciesMetadata,testCompileOnlyDependenciesMetadata,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata com.squareup.okio:okio:2.8.0=compileClasspath,implementationDependenciesMetadata,integTestCompileClasspath,integTestCompileOnly,integTestCompileOnlyDependenciesMetadata,integTestRuntimeClasspath,integTestRuntimeOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -com.squareup.retrofit2:converter-gson:2.9.0=integTestCompileOnly,integTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=integTestCompileOnly,integTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=integTestRuntimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=integTestRuntimeClasspath,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=integTestRuntimeClasspath,testRuntimeClasspath @@ -99,7 +96,6 @@ io.netty:netty-resolver:4.1.34.Final=integTestRuntimeClasspath,testRuntimeClassp io.netty:netty-transport:4.1.34.Final=integTestRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=integTestRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=integTestRuntimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=integTestCompileOnly,integTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=integTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=integTestRuntimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=integTestRuntimeClasspath,testRuntimeClasspath diff --git a/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt b/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt index c1954c4bc4..255d1d35f2 100644 --- a/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt +++ b/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt @@ -4,7 +4,6 @@ import com.avito.android.Result import com.avito.http.HttpClientProvider import com.avito.http.createStubInstance import com.avito.kotlin.dsl.getSystemProperty -import com.avito.logger.PrintlnLoggerFactory import com.avito.slack.model.SlackChannel import com.avito.slack.model.SlackMessage import com.avito.slack.model.SlackSendMessageRequest @@ -15,8 +14,6 @@ import java.util.UUID internal class SlackConditionalSenderIntegrationTest { - private val loggerFactory = PrintlnLoggerFactory - private val testChannelId = SlackChannel( id = getSystemProperty("avito.slack.test.channelId"), name = getSystemProperty("avito.slack.test.channel") @@ -28,7 +25,7 @@ internal class SlackConditionalSenderIntegrationTest { serviceName = "slack-integration-tests", token = testToken, workspace = getSystemProperty("avito.slack.test.workspace"), - httpClientProvider = HttpClientProvider.createStubInstance(loggerFactory = loggerFactory) + httpClientProvider = HttpClientProvider.createStubInstance() ) @Test @@ -41,11 +38,9 @@ internal class SlackConditionalSenderIntegrationTest { slackClient = slackClient, updater = SlackMessageUpdaterWithThreadMark( slackClient = slackClient, - loggerFactory = loggerFactory, threadMessage = "Updated" ), condition = condition, - loggerFactory = loggerFactory ) sender.sendMessage("$uniqueId first message") @@ -69,10 +64,8 @@ internal class SlackConditionalSenderIntegrationTest { slackClient = slackClient, updater = SlackMessageUpdaterDirectlyToThread( slackClient = slackClient, - loggerFactory = loggerFactory ), condition = condition, - loggerFactory = loggerFactory ) val firstMessageTry = sender.sendMessage("first message", author = author) diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt index 2d1002ed4e..5502c09599 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt @@ -1,7 +1,5 @@ package com.avito.slack -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.slack.model.SlackSendMessageRequest import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.ObsoleteCoroutinesApi @@ -24,11 +22,8 @@ public interface SlackBulkSender { @OptIn(ObsoleteCoroutinesApi::class) public class CoroutinesSlackBulkSender( private val sender: SlackMessageSender, - loggerFactory: LoggerFactory ) : SlackBulkSender { - private val logger = loggerFactory.create() - private val requestQueue = Channel(Channel.UNLIMITED) private val executedRequests = Channel() @@ -43,8 +38,8 @@ public class CoroutinesSlackBulkSender( GlobalScope.launch { for (request in tickedQueue) { sender.sendMessage(request) - .onFailure { throwable -> - logger.critical("Can't send slack report to ${request.channel}", throwable) + .onFailure { + // TODO handle failure } executedRequests.send(request) } diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackConditionalSender.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackConditionalSender.kt index f73d532b8d..2592b03011 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackConditionalSender.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackConditionalSender.kt @@ -1,8 +1,6 @@ package com.avito.slack import com.avito.android.Result -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.slack.model.SlackMessage import com.avito.slack.model.SlackSendMessageRequest @@ -14,29 +12,16 @@ public class SlackConditionalSender( private val slackClient: SlackClient, private val updater: SlackMessageUpdater, private val condition: SlackMessagePredicate, - loggerFactory: LoggerFactory ) : SlackMessageSender { - private val logger = loggerFactory.create() - override fun sendMessage(message: SlackSendMessageRequest): Result { - logger.info( - "Sending message using SlackConditionalSender, " + - "trying to find previous message in channel: ${message.channel}" - ) return slackClient.findMessage(message.channel, condition) .fold( { previousMessage -> - logger.info("Previous message found, updating it instead of posting new one") updater.updateMessage(previousMessage, message.text) }, - { throwable -> - logger.warn( - "Previous message not found, " + - "posting new one to channel: ${message.channel}; " + - "message: '${SlackStringFormat.ellipsize(string = message.text, limit = 50)}'", - throwable - ) + { + // TODO handle throwable slackClient.sendMessage(message) } ) diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterDirectlyToThread.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterDirectlyToThread.kt index 2f6244450d..7a3bf400fa 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterDirectlyToThread.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterDirectlyToThread.kt @@ -1,25 +1,15 @@ package com.avito.slack import com.avito.android.Result -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.slack.model.FoundMessage import com.avito.slack.model.SlackMessage import com.avito.slack.model.SlackSendMessageRequest public class SlackMessageUpdaterDirectlyToThread( private val slackClient: SlackClient, - loggerFactory: LoggerFactory ) : SlackMessageUpdater { - private val logger = loggerFactory.create() - override fun updateMessage(previousMessage: FoundMessage, newContent: String): Result { - logger.info( - "Updating message by posting to its thread; channel=${previousMessage.channel}; " + - "oldMessage=${SlackStringFormat.ellipsize(string = previousMessage.text, limit = 50)}; " - ) - return slackClient.sendMessage( SlackSendMessageRequest( channel = previousMessage.channel, @@ -28,11 +18,6 @@ public class SlackMessageUpdaterDirectlyToThread( emoji = previousMessage.emoji, threadId = previousMessage.timestamp ) - ).onSuccess { - logger.info( - "Update message posted to thread; " + - "message=${SlackStringFormat.ellipsize(string = newContent, limit = 50)}" - ) - } + ) } } diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterWithThreadMark.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterWithThreadMark.kt index aa9dd10983..957fa5901e 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterWithThreadMark.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackMessageUpdaterWithThreadMark.kt @@ -1,8 +1,6 @@ package com.avito.slack import com.avito.android.Result -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.slack.model.FoundMessage import com.avito.slack.model.SlackMessage import com.avito.slack.model.SlackSendMessageRequest @@ -13,20 +11,13 @@ import com.avito.slack.model.SlackSendMessageRequest */ public class SlackMessageUpdaterWithThreadMark( private val slackClient: SlackClient, - loggerFactory: LoggerFactory, private val threadMessage: String ) : SlackMessageUpdater { - private val logger = loggerFactory.create() - override fun updateMessage( previousMessage: FoundMessage, newContent: String ): Result { - logger.info( - "Updating message with thread mark; channel: ${previousMessage.channel}; " + - "oldMessage: '${SlackStringFormat.ellipsize(string = previousMessage.text, limit = 50)}'; " - ) return slackClient.sendMessage( SlackSendMessageRequest( channel = previousMessage.channel, @@ -36,23 +27,11 @@ public class SlackMessageUpdaterWithThreadMark( threadId = previousMessage.timestamp ) ).flatMap { - logger.info( - "Thread message posted; channel: ${previousMessage.channel}; " + - "threadId: '${previousMessage.timestamp}'; " + - SlackStringFormat.ellipsize(string = threadMessage, limit = 50) - ) - slackClient.updateMessage( channel = previousMessage.channel, text = newContent, messageTimestamp = previousMessage.timestamp ) } - .onSuccess { - logger.info( - "Original message updated; " + - "newMessage: '${SlackStringFormat.ellipsize(string = newContent, limit = 50)}'" - ) - } } } diff --git a/subprojects/gradle/statsd-config/build.gradle.kts b/subprojects/gradle/statsd-config/build.gradle.kts index 7d5d14885c..65674c053b 100644 --- a/subprojects/gradle/statsd-config/build.gradle.kts +++ b/subprojects/gradle/statsd-config/build.gradle.kts @@ -7,6 +7,6 @@ dependencies { api(projects.subprojects.common.statsd) implementation(gradleApi()) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.gradleExtensions) + implementation(projects.subprojects.logger.slf4jGradleLogger) } diff --git a/subprojects/gradle/statsd-config/locking/gradle.lockfile b/subprojects/gradle/statsd-config/locking/gradle.lockfile index 4a69162720..8ac097b0bf 100644 --- a/subprojects/gradle/statsd-config/locking/gradle.lockfile +++ b/subprojects/gradle/statsd-config/locking/gradle.lockfile @@ -1,11 +1,8 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.code.gson:gson:2.8.5=runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:guava:27.0.1-android=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -13,13 +10,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=test com.google.j2objc:j2objc-annotations:1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.okio:okio:2.8.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=runtimeClasspath,testRuntimeClasspath com.timgroup:java-statsd-client:3.1.0=runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=runtimeClasspath,testRuntimeClasspath junit:junit:4.12=testCompileClasspath,testImplementationDependenciesMetadata junit:junit:4.13.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata @@ -55,5 +46,4 @@ org.junit.platform:junit-platform-suite-api:1.8.0=testRuntimeClasspath,testRunti org.junit.platform:junit-platform-suite-commons:1.8.0=testRuntimeClasspath org.junit:junit-bom:5.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=runtimeClasspath,testRuntimeClasspath empty=annotationProcessor,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,signatures,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt b/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt index 9e5d251ea1..1040f7c335 100644 --- a/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt +++ b/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt @@ -1,11 +1,13 @@ package com.avito.android.stats +import Slf4jGradleLoggerFactory import com.avito.kotlin.dsl.ProjectProperty import com.avito.kotlin.dsl.PropertyScope.ROOT_PROJECT import com.avito.kotlin.dsl.getBooleanProperty import com.avito.kotlin.dsl.getMandatoryIntProperty import com.avito.kotlin.dsl.getMandatoryStringProperty -import com.avito.logger.GradleLoggerPlugin +import com.avito.logger.Logger +import com.avito.logger.LoggerFactory import org.gradle.api.Project import org.gradle.api.internal.provider.Providers import org.gradle.api.provider.Provider @@ -13,17 +15,43 @@ import org.gradle.api.provider.Provider // TODO extract to plugin public val Project.statsd: Provider by ProjectProperty.lazy(scope = ROOT_PROJECT) { project -> val property = project.objects.property(StatsDSender::class.java) - property - .set(GradleLoggerPlugin.getLoggerFactory(project).map { loggerFactory -> - StatsDSender.create( - config = config(project), - loggerFactory = loggerFactory - ) - }) + // TODO delete when rewrite tests related to output + val loggerFactory = if (project.hasProperty("statsd.test")) { + testLoggerFactory() + } else { + Slf4jGradleLoggerFactory + } + val statsDSender = StatsDSender.create( + config = config(project), + loggerFactory = loggerFactory + ) + property.set(statsDSender) property.finalizeValueOnRead() property } +private fun testLoggerFactory() = object : LoggerFactory { + override fun create(tag: String): Logger { + return object : Logger { + override fun debug(msg: String) { + println("[$tag] $msg") + } + + override fun info(msg: String) { + println("[$tag] $msg") + } + + override fun warn(msg: String, error: Throwable?) { + println("[$tag] $msg") + } + + override fun critical(msg: String, error: Throwable) { + println("[$tag] $msg") + } + } + } +} + public val Project.statsdConfig: Provider by ProjectProperty.lazy(scope = ROOT_PROJECT) { project -> Providers.of(config(project)) } diff --git a/subprojects/gradle/teamcity/locking/gradle.lockfile b/subprojects/gradle/teamcity/locking/gradle.lockfile index 30a2d31758..68e2aac69a 100644 --- a/subprojects/gradle/teamcity/locking/gradle.lockfile +++ b/subprojects/gradle/teamcity/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=testRuntimeClasspath com.android.tools:sdklib:30.0.2=testRuntimeClasspath com.android:signflinger:7.0.2=testRuntimeClasspath com.android:zipflinger:7.0.2=testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=testRuntimeClasspath com.google.android:annotations:4.1.1.4=testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -64,15 +63,12 @@ com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplemen com.googlecode.json-simple:json-simple:1.1=testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=testRuntimeClasspath com.jakewharton.retrofit:retrofit1-okhttp3-client:1.0.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath com.squareup.okhttp3:okhttp:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=testImplementationDependenciesMetadata com.squareup.okio:okio:1.6.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath com.squareup.okio:okio:2.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=testRuntimeClasspath com.squareup.retrofit:retrofit:1.9.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup:javapoet:1.10.0=testRuntimeClasspath com.squareup:javawriter:2.5.0=testRuntimeClasspath @@ -101,7 +97,6 @@ io.netty:netty-resolver:4.1.34.Final=testRuntimeClasspath io.netty:netty-transport:4.1.34.Final=testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=testRuntimeClasspath -io.sentry:sentry:1.7.23=testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=testRuntimeClasspath @@ -164,8 +159,7 @@ org.ow2.asm:asm-commons:7.0=testRuntimeClasspath org.ow2.asm:asm-tree:7.0=testRuntimeClasspath org.ow2.asm:asm-util:7.0=testRuntimeClasspath org.ow2.asm:asm:7.0=testRuntimeClasspath -org.slf4j:slf4j-api:1.7.12=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata -org.slf4j:slf4j-api:1.7.24=testRuntimeClasspath +org.slf4j:slf4j-api:1.7.12=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=testRuntimeClasspath xerces:xercesImpl:2.12.0=testRuntimeClasspath xml-apis:xml-apis:1.4.01=testRuntimeClasspath diff --git a/subprojects/gradle/test-project/locking/gradle.lockfile b/subprojects/gradle/test-project/locking/gradle.lockfile index accf5423be..6a626f1b56 100644 --- a/subprojects/gradle/test-project/locking/gradle.lockfile +++ b/subprojects/gradle/test-project/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -59,13 +58,10 @@ com.google.truth:truth:1.0=compileClasspath,gradleTestCompileClasspath,gradleTes com.googlecode.java-diff-utils:diffutils:1.3.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=apiDependenciesMetadata,compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:okhttp:4.9.0=apiDependenciesMetadata,compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=apiDependenciesMetadata,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,testImplementationDependenciesMetadata com.squareup.okio:okio:2.8.0=apiDependenciesMetadata,compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -94,7 +90,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -166,7 +161,6 @@ org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtim org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.reflections:reflections:0.9.11=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/gradle/test-summary/build.gradle.kts b/subprojects/gradle/test-summary/build.gradle.kts index 89a7337a87..7849b8c13a 100644 --- a/subprojects/gradle/test-summary/build.gradle.kts +++ b/subprojects/gradle/test-summary/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { implementation(projects.subprojects.gradle.gradleExtensions) implementation(projects.subprojects.gradle.slack) implementation(projects.subprojects.gradle.statsdConfig) - implementation(projects.subprojects.logger.gradleLogger) + implementation(projects.subprojects.logger.slf4jGradleLogger) implementation(projects.subprojects.testRunner.reportViewer) { because("API to fetch reports; ReportCoordinates model") } diff --git a/subprojects/gradle/test-summary/locking/gradle.lockfile b/subprojects/gradle/test-summary/locking/gradle.lockfile index 1b83078cce..1ee4dea074 100644 --- a/subprojects/gradle/test-summary/locking/gradle.lockfile +++ b/subprojects/gradle/test-summary/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestRuntimeClasspath com.android.tools:sdklib:30.0.2=gradleTestRuntimeClasspath com.android:signflinger:7.0.2=gradleTestRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.salomonbrys.kotson:kotson:2.5.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.seratch:jslack-api-client:3.4.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.seratch:jslack-api-model:3.4.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -71,8 +70,6 @@ com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestIm com.squareup.okhttp3:okhttp:4.9.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.squareup.okio:okio-metadata:2.8.0=gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,testCompileOnlyDependenciesMetadata,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata com.squareup.okio:okio:2.8.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestRuntimeClasspath @@ -101,7 +98,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=gradleTestRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestRuntimeClasspath diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyReportTask.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyReportTask.kt index e9909b732f..a5f80bb22f 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyReportTask.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyReportTask.kt @@ -1,6 +1,5 @@ package com.avito.test.summary -import com.avito.logger.LoggerFactory import com.avito.reportviewer.ReportViewerLinksGeneratorImpl import com.avito.reportviewer.ReportViewerQuery import com.avito.reportviewer.ReportsApi @@ -49,16 +48,12 @@ public abstract class FlakyReportTask : DefaultTask() { @get:Internal public abstract val reportViewerUrl: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun doWork() { val flakyTestInfo = FlakyTestInfo() flakyTestInfo.addReport(reportsApi.get().getTestsForRunId(reportCoordinates.get())) - val loggerFactory: LoggerFactory = loggerFactory.get() val timeProvider: TimeProvider = DefaultTimeProvider() createFlakyTestReporter( @@ -68,7 +63,6 @@ public abstract class FlakyReportTask : DefaultTask() { reportViewerUrl = reportViewerUrl.get(), buildUrl = buildUrl.get(), currentBranch = currentBranch.get(), - loggerFactory = loggerFactory, timeProvider = timeProvider ).reportSummary(flakyTestInfo.getInfo()) } @@ -80,7 +74,6 @@ public abstract class FlakyReportTask : DefaultTask() { reportViewerUrl: String, buildUrl: String, currentBranch: String, - loggerFactory: LoggerFactory, timeProvider: TimeProvider ): FlakyTestReporterImpl { val reportViewerLinksGenerator = ReportViewerLinksGeneratorImpl( @@ -91,14 +84,13 @@ public abstract class FlakyReportTask : DefaultTask() { return FlakyTestReporterImpl( slackClient = SlackConditionalSender( slackClient = slackClient.get(), - updater = SlackMessageUpdaterDirectlyToThread(slackClient.get(), loggerFactory), + updater = SlackMessageUpdaterDirectlyToThread(slackClient.get()), condition = ConjunctionMessagePredicate( listOf( SameAuthorPredicate(slackUsername), TodayMessageCondition(timeProvider) ) ), - loggerFactory = loggerFactory ), summaryChannel = summaryChannel, messageAuthor = slackUsername, diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceAction.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceAction.kt index d1d4513512..382ee12f54 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceAction.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceAction.kt @@ -1,7 +1,5 @@ package com.avito.test.summary -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.reportviewer.ReportsApi import com.avito.reportviewer.model.ReportCoordinates import com.avito.time.TimeProvider @@ -18,11 +16,8 @@ import com.google.gson.JsonPrimitive internal class MarkReportAsSourceAction( private val reportsApi: ReportsApi, private val timeProvider: TimeProvider, - loggerFactory: LoggerFactory ) { - private val logger = loggerFactory.create() - fun mark(reportCoordinates: ReportCoordinates) { val testSuiteVersion = timeProvider.nowInMillis() @@ -43,15 +38,8 @@ internal class MarkReportAsSourceAction( reportsApi.setFinished(reportCoordinates) report } - .onSuccess { report -> - logger.info( - "Test suite for tms version $testSuiteVersion, " + - "with id: ${report.id}, " + - "coordinates: $reportCoordinates marked as source of truth for tms" - ) - } - .onFailure { throwable -> - logger.critical("Can't mark test suite for tms; runId=${reportCoordinates.runId}", throwable) + .onFailure { + // TODO handle throwable } } } diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceTask.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceTask.kt index 29d312941a..e055ed9174 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceTask.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/MarkReportAsSourceTask.kt @@ -1,6 +1,5 @@ package com.avito.test.summary -import com.avito.logger.LoggerFactory import com.avito.reportviewer.ReportsApi import com.avito.reportviewer.model.ReportCoordinates import com.avito.time.TimeProvider @@ -21,15 +20,11 @@ public abstract class MarkReportAsSourceTask : DefaultTask() { @get:Internal public abstract val timeProvider: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun doWork() { MarkReportAsSourceAction( reportsApi = reportsApi.get(), timeProvider = timeProvider.get(), - loggerFactory = loggerFactory.get() ).mark(reportCoordinates = reportCoordinates.get()) } } diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryFactory.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryFactory.kt index 276266aea5..4469328d57 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryFactory.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryFactory.kt @@ -1,9 +1,9 @@ package com.avito.test.summary +import Slf4jGradleLoggerFactory import com.avito.android.stats.StatsDConfig import com.avito.android.stats.StatsDSender import com.avito.http.HttpClientProvider -import com.avito.logger.LoggerFactory import com.avito.reportviewer.ReportsApi import com.avito.reportviewer.ReportsApiFactory import com.avito.slack.SlackClient @@ -12,7 +12,6 @@ import com.avito.time.TimeProvider import org.gradle.api.provider.Provider public class TestSummaryFactory( - private val loggerFactory: LoggerFactory, private val statsDConfig: Provider, ) { @@ -33,16 +32,15 @@ public class TestSummaryFactory( public fun createReportsApi(extension: TestSummaryExtension): ReportsApi { return ReportsApiFactory.create( host = extension.reportsHost.get(), - loggerFactory = loggerFactory, httpClientProvider = createHttpClientProvider(statsDConfig) ) } private fun createHttpClientProvider(statsDConfig: Provider): HttpClientProvider { return HttpClientProvider( - statsDSender = StatsDSender.create(statsDConfig.get(), loggerFactory), + statsDSender = StatsDSender.create(statsDConfig.get(), Slf4jGradleLoggerFactory), timeProvider = timeProvider, - loggerFactory = loggerFactory + loggerFactory = Slf4jGradleLoggerFactory ) } } diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt index f24c61ea9c..2d841c6a08 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt @@ -3,7 +3,6 @@ package com.avito.test.summary import com.avito.android.Problem import com.avito.android.asPlainText import com.avito.kotlin.dsl.isRoot -import com.avito.logger.GradleLoggerPlugin import com.avito.time.DefaultTimeProvider import com.avito.time.TimeProvider import org.gradle.api.Plugin @@ -40,8 +39,6 @@ public class TestSummaryPlugin : Plugin { this.timeProvider.set(timeProvider) this.reportsApi.set(reportsApi) this.reportViewerUrl.set(extension.reportViewerUrl) - - this.loggerFactory.set(GradleLoggerPlugin.getLoggerFactory(this)) } } } diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummarySender.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummarySender.kt index c6609b30fa..3ebd71b66b 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummarySender.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummarySender.kt @@ -1,7 +1,5 @@ package com.avito.test.summary -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.report.model.Team import com.avito.report.model.TestStatus import com.avito.reportviewer.ReportsApi @@ -26,7 +24,6 @@ import com.avito.test.summary.model.CrossDeviceSuite import com.avito.test.summary.model.FailureOnDevice internal interface TestSummarySender { - fun send() } @@ -34,7 +31,6 @@ internal class TestSummarySenderImpl( slackClient: SlackClient, reportViewerUrl: String, private val reportsApi: ReportsApi, - loggerFactory: LoggerFactory, private val buildUrl: String, private val reportCoordinates: ReportCoordinates, private val globalSummaryChannel: SlackChannel, @@ -43,12 +39,9 @@ internal class TestSummarySenderImpl( private val slackUserName: String ) : TestSummarySender { - private val logger = loggerFactory.create() - private val slackSummaryComposer: SlackSummaryComposer = SlackSummaryComposerImpl(reportViewerUrl) private val slackMessageUpdater: SlackMessageUpdater = SlackMessageUpdaterWithThreadMark( slackClient = slackClient, - loggerFactory = loggerFactory, threadMessage = "Updated by: $buildUrl" ) private val slackConditionalSender: SlackConditionalSender = SlackConditionalSender( @@ -59,12 +52,10 @@ internal class TestSummarySenderImpl( SameAuthorPredicate(slackUserName), TextContainsStringCondition(reportCoordinates.runId) ) - ), - loggerFactory = loggerFactory + ) ) private val slackBulkSender: SlackBulkSender = CoroutinesSlackBulkSender( - sender = slackConditionalSender, - loggerFactory = loggerFactory + sender = slackConditionalSender ) private val slackEmojiProvider = SlackEmojiProvider() @@ -74,7 +65,9 @@ internal class TestSummarySenderImpl( .map { toCrossDeviceTestData(it) } .fold( { suite -> send(suite, requireNotNull(reportsApi.tryGetId(reportCoordinates))) }, - { throwable -> logger.critical("Can't get suite report", throwable) } + { + // TODO handle throwable + } ) } @@ -100,11 +93,8 @@ internal class TestSummarySenderImpl( emoji = slackEmojiProvider.emojiName(unitSuite.percentSuccessOfAutomated.roundToInt()) ) ) - }.onFailure { throwable -> - logger.critical( - "Can't compose slack message for unit ${team.name}; buildUrl=$buildUrl", - throwable - ) + }.onFailure { + // TODO handle throwable } } } @@ -125,8 +115,8 @@ internal class TestSummarySenderImpl( emoji = slackEmojiProvider.emojiName(suite.percentSuccessOfAutomated.roundToInt()) ) ) - }.onFailure { throwable -> - logger.warn("Can't compose slack message for summary: buildUrl=$buildUrl", throwable) + }.onFailure { + // TODO handle throwable } } } @@ -136,8 +126,8 @@ internal class TestSummarySenderImpl( onSuccess = { report -> report.id }, - onFailure = { throwable -> - logger.warn("Can't find report for runId=${reportCoordinates.runId}", throwable) + onFailure = { + // TODO handle throwable null } ) diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryTask.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryTask.kt index 957c2e7902..89fbbd1813 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryTask.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryTask.kt @@ -1,6 +1,5 @@ package com.avito.test.summary -import com.avito.logger.LoggerFactory import com.avito.report.model.Team import com.avito.reportviewer.ReportsApi import com.avito.reportviewer.model.ReportCoordinates @@ -46,16 +45,12 @@ public abstract class TestSummaryTask : DefaultTask() { @get:Internal public abstract val reportViewerUrl: Property - @get:Internal - public abstract val loggerFactory: Property - @TaskAction public fun doWork() { val testSummarySender: TestSummarySender = TestSummarySenderImpl( slackClient = slackClient.get(), reportViewerUrl = reportViewerUrl.get(), reportsApi = reportsApi.get(), - loggerFactory = loggerFactory.get(), buildUrl = buildUrl.get(), reportCoordinates = reportCoordinates.get(), globalSummaryChannel = summaryChannel.get(), diff --git a/subprojects/logger/android-logger/locking/gradle.lockfile b/subprojects/logger/android-logger/locking/gradle.lockfile new file mode 100644 index 0000000000..b685b793c8 --- /dev/null +++ b/subprojects/logger/android-logger/locking/gradle.lockfile @@ -0,0 +1,156 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.android.tools.analytics-library:protos:30.0.2=lintClassPath +com.android.tools.analytics-library:shared:30.0.2=lintClassPath +com.android.tools.analytics-library:tracker:30.0.2=lintClassPath +com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath +com.android.tools.build:apksig:7.0.2=lintClassPath +com.android.tools.build:apkzlib:7.0.2=lintClassPath +com.android.tools.build:builder-model:7.0.2=lintClassPath +com.android.tools.build:builder-test-api:7.0.2=lintClassPath +com.android.tools.build:builder:7.0.2=lintClassPath +com.android.tools.build:manifest-merger:30.0.2=lintClassPath +com.android.tools.ddms:ddmlib:30.0.2=lintClassPath +com.android.tools.external.com-intellij:intellij-core:30.0.2=lintClassPath +com.android.tools.external.com-intellij:kotlin-compiler:30.0.2=lintClassPath +com.android.tools.external.org-jetbrains:uast:30.0.2=lintClassPath +com.android.tools.layoutlib:layoutlib-api:30.0.2=lintClassPath +com.android.tools.lint:lint-api:30.0.2=lintClassPath +com.android.tools.lint:lint-checks:30.0.2=lintClassPath +com.android.tools.lint:lint-gradle:30.0.2=lintClassPath +com.android.tools.lint:lint-model:30.0.2=lintClassPath +com.android.tools.lint:lint:30.0.2=lintClassPath +com.android.tools:annotations:30.0.2=lintClassPath +com.android.tools:common:30.0.2=lintClassPath +com.android.tools:dvlib:30.0.2=lintClassPath +com.android.tools:repository:30.0.2=lintClassPath +com.android.tools:sdk-common:30.0.2=lintClassPath +com.android.tools:sdklib:30.0.2=lintClassPath +com.android:signflinger:7.0.2=lintClassPath +com.android:zipflinger:7.0.2=lintClassPath +com.beust:jcommander:1.78=lintClassPath +com.github.javaparser:javaparser-core:3.17.0=lintClassPath +com.google.auto.value:auto-value-annotations:1.6.3=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.google.code.findbugs:jsr305:3.0.2=lintClassPath,releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.google.code.gson:gson:2.8.6=lintClassPath +com.google.errorprone:error_prone_annotations:2.3.1=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath +com.google.guava:failureaccess:1.0.1=lintClassPath,releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.google.guava:guava:27.0.1-android=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.google.guava:guava:30.1-jre=lintClassPath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath,releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.google.j2objc:j2objc-annotations:1.1=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.google.j2objc:j2objc-annotations:1.3=lintClassPath +com.google.jimfs:jimfs:1.1=lintClassPath +com.google.protobuf:protobuf-java:3.10.0=lintClassPath +com.google.truth:truth:1.0=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.googlecode.java-diff-utils:diffutils:1.3.0=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +com.googlecode.json-simple:json-simple:1.1=lintClassPath +com.squareup:javawriter:2.5.0=lintClassPath +com.sun.activation:javax.activation:1.2.0=lintClassPath +com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath +com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath +com.thoughtworks.qdox:qdox:1.12.1=lintClassPath +commons-codec:commons-codec:1.10=lintClassPath +commons-io:commons-io:2.4=lintClassPath +commons-logging:commons-logging:1.2=lintClassPath +info.picocli:picocli:4.5.2=lintClassPath +it.unimi.dsi:fastutil:8.4.0=lintClassPath +jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath +javax.inject:javax.inject:1=lintClassPath +jline:jline:2.14.6=lintClassPath +junit:junit:4.12=releaseUnitTestImplementationDependenciesMetadata,testImplementationDependenciesMetadata +junit:junit:4.13.1=lintClassPath +junit:junit:4.13.2=releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +net.java.dev.jna:jna-platform:5.6.0=lintClassPath +net.java.dev.jna:jna:5.6.0=lintClassPath +net.sf.jopt-simple:jopt-simple:4.9=lintClassPath +net.sf.kxml:kxml2:2.3.0=lintClassPath +org.apache.ant:ant-antlr:1.10.9=lintClassPath +org.apache.ant:ant-junit:1.10.9=lintClassPath +org.apache.ant:ant-launcher:1.10.9=lintClassPath +org.apache.ant:ant:1.10.9=lintClassPath +org.apache.commons:commons-compress:1.20=lintClassPath +org.apache.httpcomponents:httpclient:4.5.6=lintClassPath +org.apache.httpcomponents:httpcore:4.4.10=lintClassPath +org.apache.httpcomponents:httpmime:4.5.6=lintClassPath +org.apiguardian:apiguardian-api:1.1.2=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath +org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath +org.checkerframework:checker-compat-qual:2.5.5=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +org.checkerframework:checker-qual:3.5.0=lintClassPath +org.codehaus.groovy:groovy-all:3.0.7=lintClassPath +org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath +org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath +org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath +org.codehaus.groovy:groovy-console:3.0.7=lintClassPath +org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath +org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath +org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath +org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath +org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath +org.codehaus.groovy:groovy-json:3.0.7=lintClassPath +org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath +org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath +org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath +org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath +org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath +org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath +org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath +org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath +org.codehaus.groovy:groovy-test:3.0.7=lintClassPath +org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath +org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath +org.codehaus.groovy:groovy:3.0.7=lintClassPath +org.codehaus.mojo:animal-sniffer-annotations:1.17=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,testImplementationDependenciesMetadata +org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath +org.glassfish.jaxb:txw2:2.3.2=lintClassPath +org.hamcrest:hamcrest-core:1.3=lintClassPath,releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt +org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.31=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-reflect:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=apiDependenciesMetadata,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=apiDependenciesMetadata,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib:1.5.31=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains:annotations:13.0=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath +org.junit.jupiter:junit-jupiter-api:5.8.0=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath +org.junit.jupiter:junit-jupiter-engine:5.8.0=releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-commons:1.7.0=lintClassPath +org.junit.platform:junit-platform-commons:1.8.0=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.7.0=lintClassPath +org.junit.platform:junit-platform-engine:1.8.0=releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath +org.junit.platform:junit-platform-launcher:1.8.0=releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-runner:1.8.0=releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-suite-api:1.8.0=releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-suite-commons:1.8.0=releaseUnitTestRuntimeClasspath +org.junit:junit-bom:5.7.0=lintClassPath +org.junit:junit-bom:5.8.0=releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.jvnet.staxex:stax-ex:1.8.1=lintClassPath +org.opentest4j:opentest4j:1.2.0=lintClassPath,releaseUnitTestCompileClasspath,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntimeClasspath,releaseUnitTestRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-util:7.0=lintClassPath +org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath +org.testng:testng:7.3.0=lintClassPath +xerces:xercesImpl:2.12.0=lintClassPath +xml-apis:xml-apis:1.4.01=lintClassPath +empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugApiDependenciesMetadata,debugCompileOnlyDependenciesMetadata,debugImplementationDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugRuntimeOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,runtimeOnlyDependenciesMetadata,signatures,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata diff --git a/subprojects/logger/slf4j-gradle-logger/build.gradle.kts b/subprojects/logger/slf4j-gradle-logger/build.gradle.kts new file mode 100644 index 0000000000..98f63cde9d --- /dev/null +++ b/subprojects/logger/slf4j-gradle-logger/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + id("convention.kotlin-jvm") + id("convention.publish-kotlin-library") +} + +dependencies { + compileOnly(gradleApi()) + api(projects.subprojects.logger.logger) +} diff --git a/subprojects/logger/slf4j-gradle-logger/locking/gradle.lockfile b/subprojects/logger/slf4j-gradle-logger/locking/gradle.lockfile new file mode 100644 index 0000000000..169f684aae --- /dev/null +++ b/subprojects/logger/slf4j-gradle-logger/locking/gradle.lockfile @@ -0,0 +1,48 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:guava:27.0.1-android=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.truth:truth:1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.googlecode.java-diff-utils:diffutils:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +junit:junit:4.12=testCompileClasspath,testImplementationDependenciesMetadata +junit:junit:4.13.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +org.checkerframework:checker-compat-qual:2.5.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.17=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.31=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.5.31=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.8.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-commons:1.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.8.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-launcher:1.8.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-runner:1.8.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-suite-api:1.8.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-suite-commons:1.8.0=testRuntimeClasspath +org.junit:junit-bom:5.8.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +empty=annotationProcessor,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,signatures,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/subprojects/logger/slf4j-gradle-logger/src/main/kotlin/com/avito/logger/Slf4jGradleLoggerFactory.kt b/subprojects/logger/slf4j-gradle-logger/src/main/kotlin/com/avito/logger/Slf4jGradleLoggerFactory.kt new file mode 100644 index 0000000000..0deb40832c --- /dev/null +++ b/subprojects/logger/slf4j-gradle-logger/src/main/kotlin/com/avito/logger/Slf4jGradleLoggerFactory.kt @@ -0,0 +1,35 @@ +import com.avito.logger.Logger +import com.avito.logger.LoggerFactory +import org.gradle.api.Task +import org.gradle.api.logging.Logging +import org.gradle.internal.logging.slf4j.DefaultContextAwareTaskLogger + +public object Slf4jGradleLoggerFactory : LoggerFactory { + override fun create(tag: String): Logger { + return Slf4jGradleLogger( + DefaultContextAwareTaskLogger(Logging.getLogger(Task::class.java)), + tag + ) + } +} + +private class Slf4jGradleLogger( + private val delegate: org.slf4j.Logger, + private val tag: String +) : Logger { + override fun debug(msg: String) { + delegate.debug("[$tag] $msg") + } + + override fun info(msg: String) { + delegate.info("[$tag] $msg") + } + + override fun warn(msg: String, error: Throwable?) { + delegate.warn("[$tag] $msg", error) + } + + override fun critical(msg: String, error: Throwable) { + delegate.error("[$tag] $msg", error) + } +} diff --git a/subprojects/test-runner/client/src/main/kotlin/com/avito/runner/scheduler/report/ReportFactoryImpl.kt b/subprojects/test-runner/client/src/main/kotlin/com/avito/runner/scheduler/report/ReportFactoryImpl.kt index beee0cf41a..f4e8af947e 100644 --- a/subprojects/test-runner/client/src/main/kotlin/com/avito/runner/scheduler/report/ReportFactoryImpl.kt +++ b/subprojects/test-runner/client/src/main/kotlin/com/avito/runner/scheduler/report/ReportFactoryImpl.kt @@ -34,7 +34,6 @@ public class ReportFactoryImpl( return AvitoReport( reportsApi = ReportsApiFactory.create( host = reportViewerConfig.apiUrl, - loggerFactory = loggerFactory, httpClientProvider = httpClientProvider ), reportViewerUrl = reportViewerConfig.viewerUrl, diff --git a/subprojects/test-runner/device-provider/impl/src/main/kotlin/com/avito/android/runner/devices/internal/DeviceProviderFactoryImpl.kt b/subprojects/test-runner/device-provider/impl/src/main/kotlin/com/avito/android/runner/devices/internal/DeviceProviderFactoryImpl.kt index f80fa39400..2f835999b1 100644 --- a/subprojects/test-runner/device-provider/impl/src/main/kotlin/com/avito/android/runner/devices/internal/DeviceProviderFactoryImpl.kt +++ b/subprojects/test-runner/device-provider/impl/src/main/kotlin/com/avito/android/runner/devices/internal/DeviceProviderFactoryImpl.kt @@ -45,7 +45,6 @@ internal class DeviceProviderFactoryImpl( androidDebugBridge = androidDebugBridgeProvider.provide(), emulatorsLogsReporter = emulatorsLogsReporterProvider.provide(tempLogcatDir), devicesManager = AdbDevicesManager( - loggerFactory = loggerFactory, adb = Adb() ), adbDeviceFactory = AdbDeviceFactory( @@ -70,7 +69,6 @@ internal class DeviceProviderFactoryImpl( processRunner = processRunner ), devicesManager = AdbDevicesManager( - loggerFactory = loggerFactory, adb = Adb() ), deviceWorkerPoolProvider = deviceWorkerPoolProvider diff --git a/subprojects/test-runner/file-storage/locking/gradle.lockfile b/subprojects/test-runner/file-storage/locking/gradle.lockfile index aba27ff1a4..f20c024907 100644 --- a/subprojects/test-runner/file-storage/locking/gradle.lockfile +++ b/subprojects/test-runner/file-storage/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=runtimeClasspath,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/subprojects/test-runner/instrumentation-changed-tests-finder/build.gradle.kts b/subprojects/test-runner/instrumentation-changed-tests-finder/build.gradle.kts index 811e4c576a..3ebd4df679 100644 --- a/subprojects/test-runner/instrumentation-changed-tests-finder/build.gradle.kts +++ b/subprojects/test-runner/instrumentation-changed-tests-finder/build.gradle.kts @@ -10,7 +10,6 @@ dependencies { because("Need to know all classes in files") } implementation(projects.subprojects.common.files) - implementation(projects.subprojects.logger.gradleLogger) implementation(projects.subprojects.gradle.gradleExtensions) implementation(projects.subprojects.gradle.impactShared) { because("ChangesDetector reuse") diff --git a/subprojects/test-runner/instrumentation-changed-tests-finder/locking/gradle.lockfile b/subprojects/test-runner/instrumentation-changed-tests-finder/locking/gradle.lockfile index a93f36659e..75f1709883 100644 --- a/subprojects/test-runner/instrumentation-changed-tests-finder/locking/gradle.lockfile +++ b/subprojects/test-runner/instrumentation-changed-tests-finder/locking/gradle.lockfile @@ -37,7 +37,6 @@ com.android.tools:sdk-common:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClass com.android.tools:sdklib:30.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:signflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android:zipflinger:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.9.9=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.gundy:semver4j:0.16.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -64,13 +63,10 @@ com.google.truth:truth:1.0=gradleTestCompileClasspath,gradleTestImplementationDe com.googlecode.java-diff-utils:diffutils:1.3.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:4.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath -com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.9.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup.okio:okio-metadata:2.8.0=gradleTestImplementationDependenciesMetadata -com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:converter-gson:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:2.8.0=gradleTestCompileClasspath,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath com.squareup:javapoet:1.10.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup:javawriter:2.5.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.sun.activation:javax.activation:1.2.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -100,7 +96,6 @@ io.netty:netty-resolver:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClas io.netty:netty-transport:4.1.34.Final=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.sentry:sentry:1.7.23=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath it.unimi.dsi:fastutil:8.4.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -177,7 +172,6 @@ org.ow2.asm:asm-commons:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,run org.ow2.asm:asm-tree:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:7.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.24=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xerces:xercesImpl:2.12.0=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/ConfigurationCacheCompatibilityTest.kt b/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/ConfigurationCacheCompatibilityTest.kt index 99ffea0895..fe3e6bc0df 100644 --- a/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/ConfigurationCacheCompatibilityTest.kt +++ b/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/ConfigurationCacheCompatibilityTest.kt @@ -14,9 +14,6 @@ internal class ConfigurationCacheCompatibilityTest { @Test fun `configuration with applied plugin - ok`(@TempDir projectDir: File) { TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( name = "app", diff --git a/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/FindChangedTestsActionTest.kt b/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/FindChangedTestsActionTest.kt index ec1c127954..c15d510cb0 100644 --- a/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/FindChangedTestsActionTest.kt +++ b/subprojects/test-runner/instrumentation-changed-tests-finder/src/gradleTest/kotlin/com/avito/android/FindChangedTestsActionTest.kt @@ -32,9 +32,6 @@ internal class FindChangedTestsActionTest { git = Git.create(projectDir) TestProjectGenerator( - plugins = plugins { - id("com.avito.android.gradle-logger") - }, modules = listOf( AndroidAppModule( name = "app", diff --git a/subprojects/test-runner/instrumentation-tests/locking/gradle.lockfile b/subprojects/test-runner/instrumentation-tests/locking/gradle.lockfile index 6c7fa38a64..66bc310bd5 100644 --- a/subprojects/test-runner/instrumentation-tests/locking/gradle.lockfile +++ b/subprojects/test-runner/instrumentation-tests/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=apiDependenciesMetadata,compileClasspath,gradleTestCompileClasspath,gradleTestCompileOnly,gradleTestCompileOnlyDependenciesMetadata,gradleTestImplementationDependenciesMetadata,gradleTestRuntimeClasspath,gradleTestRuntimeOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath androidx.databinding:databinding-common:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath androidx.databinding:databinding-compiler-common:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.android.databinding:baseLibrary:7.0.2=gradleTestCompileOnly,gradleTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/subprojects/test-runner/kubernetes/locking/gradle.lockfile b/subprojects/test-runner/kubernetes/locking/gradle.lockfile index 5e79d40e6b..c74ee61479 100644 --- a/subprojects/test-runner/kubernetes/locking/gradle.lockfile +++ b/subprojects/test-runner/kubernetes/locking/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.annotation:annotation:1.1.0=runtimeClasspath,testCompileOnly,testFixturesRuntimeClasspath,testRuntimeClasspath +androidx.annotation:annotation:1.1.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.fasterxml.jackson.core:jackson-annotations:2.10.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.fasterxml.jackson.core:jackson-core:2.10.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata com.fasterxml.jackson.core:jackson-databind:2.10.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testCompileOnly,testCompileOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata diff --git a/subprojects/test-runner/report-viewer/build.gradle.kts b/subprojects/test-runner/report-viewer/build.gradle.kts index 290b2da483..41d6d90566 100644 --- a/subprojects/test-runner/report-viewer/build.gradle.kts +++ b/subprojects/test-runner/report-viewer/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { implementation(libs.kotson) implementation(projects.subprojects.common.httpClient) - implementation(projects.subprojects.logger.logger) implementation(projects.subprojects.testRunner.testModel) testImplementation(libs.jsonPathAssert) @@ -23,10 +22,8 @@ dependencies { testImplementation(projects.subprojects.common.resources) testImplementation(projects.subprojects.common.testOkhttp) testImplementation(projects.subprojects.common.truthExtensions) - testImplementation(testFixtures(projects.subprojects.logger.logger)) testImplementation(testFixtures(projects.subprojects.testRunner.report)) testImplementation(testFixtures(projects.subprojects.testRunner.reportViewer)) testFixturesImplementation(testFixtures(projects.subprojects.common.httpClient)) - testFixturesImplementation(testFixtures(projects.subprojects.logger.logger)) } diff --git a/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/ReportsApiFactory.kt b/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/ReportsApiFactory.kt index 0bae08f066..eb2fefd9f5 100644 --- a/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/ReportsApiFactory.kt +++ b/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/ReportsApiFactory.kt @@ -3,7 +3,6 @@ package com.avito.reportviewer import com.avito.http.HttpClientProvider import com.avito.http.RetryInterceptor import com.avito.jsonrpc.JsonRpcClient -import com.avito.logger.LoggerFactory import com.avito.report.serialize.createReportGson import com.avito.reportviewer.internal.ReportsApiImpl import java.util.concurrent.TimeUnit @@ -15,12 +14,10 @@ public object ReportsApiFactory { public fun create( host: String, httpClientProvider: HttpClientProvider, - loggerFactory: LoggerFactory, retryRequests: Boolean = true, readWriteTimeoutSec: Long = DEFAULT_TIMEOUT_SEC ): ReportsApi { return ReportsApiImpl( - loggerFactory = loggerFactory, client = JsonRpcClient( host = host, httpClient = httpClientProvider.provide() diff --git a/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsApiImpl.kt b/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsApiImpl.kt index 18bb18de4e..994d532982 100644 --- a/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsApiImpl.kt +++ b/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsApiImpl.kt @@ -3,7 +3,6 @@ package com.avito.reportviewer.internal import com.avito.android.Result import com.avito.jsonrpc.JsonRpcClient import com.avito.jsonrpc.RfcRpcRequest -import com.avito.logger.LoggerFactory import com.avito.reportviewer.ReportsAddApi import com.avito.reportviewer.ReportsApi import com.avito.reportviewer.ReportsFetchApi @@ -12,11 +11,10 @@ import com.avito.reportviewer.model.ReportCoordinates import com.google.gson.JsonElement internal class ReportsApiImpl( - private val loggerFactory: LoggerFactory, private val client: JsonRpcClient, ) : ReportsApi, ReportsAddApi by ReportsAddApiImpl(client), - ReportsFetchApi by ReportsFetchApiImpl(client, loggerFactory) { + ReportsFetchApi by ReportsFetchApiImpl(client) { override fun setFinished(reportCoordinates: ReportCoordinates): Result { return getReport(reportCoordinates).fold( diff --git a/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsFetchApiImpl.kt b/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsFetchApiImpl.kt index 4eb132c324..72f846d50a 100644 --- a/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsFetchApiImpl.kt +++ b/subprojects/test-runner/report-viewer/src/main/kotlin/com/avito/reportviewer/internal/ReportsFetchApiImpl.kt @@ -6,8 +6,6 @@ import com.avito.android.test.annotations.TestCasePriority import com.avito.jsonrpc.JsonRpcClient import com.avito.jsonrpc.RfcRpcRequest import com.avito.jsonrpc.RpcResult -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.report.model.Flakiness import com.avito.report.model.Kind import com.avito.report.model.Stability @@ -24,11 +22,8 @@ import com.avito.test.model.TestName internal class ReportsFetchApiImpl( private val client: JsonRpcClient, - loggerFactory: LoggerFactory ) : ReportsFetchApi { - private val logger = loggerFactory.create() - override fun getReport(reportCoordinates: ReportCoordinates): Result { return when (val result = getReportInternal(reportCoordinates)) { is GetReportResult.Error -> Result.Failure(result.exception) @@ -126,7 +121,6 @@ internal class ReportsFetchApiImpl( val verdict = reportModel.preparedData?.lastOrNull()?.verdict if (verdict.isNullOrBlank()) { // todo fallback - logger.debug("Can't get verdict for test: $reportModel") TestStatus.Failure("Can't get verdict") } else { TestStatus.Failure(verdict) @@ -141,17 +135,12 @@ internal class ReportsFetchApiImpl( private fun determineStability(reportModel: ListResult): Stability { return when { - reportModel.attemptsCount == null || reportModel.successCount == null -> { - logger.debug("should not be here $reportModel") - Stability.Stable(0, 0) - } + reportModel.attemptsCount == null || reportModel.successCount == null -> Stability.Stable(0, 0) reportModel.attemptsCount < 1 -> { - logger.debug("test without attempts? $reportModel") // на самом деле не совсем, репортим эту ситуацию как невероятную Stability.Failing(reportModel.attemptsCount) } reportModel.successCount > reportModel.attemptsCount -> { - logger.debug("success count > attempts count?? $reportModel") // на самом деле не совсем, репортим эту ситуацию как невероятную Stability.Stable( reportModel.attemptsCount, @@ -168,10 +157,7 @@ internal class ReportsFetchApiImpl( reportModel.attemptsCount, reportModel.successCount ) - else -> { - logger.debug("should not be here $reportModel") - Stability.Unknown(reportModel.attemptsCount, reportModel.successCount) - } + else -> Stability.Unknown(reportModel.attemptsCount, reportModel.successCount) } } diff --git a/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiRetryTest.kt b/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiRetryTest.kt index 33c82dae76..a967afcd4a 100644 --- a/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiRetryTest.kt +++ b/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiRetryTest.kt @@ -2,7 +2,6 @@ package com.avito.reportviewer import com.avito.http.HttpClientProvider import com.avito.http.createStubInstance -import com.avito.logger.PrintlnLoggerFactory import com.avito.reportviewer.model.ReportCoordinates import com.avito.test.http.MockWebServerFactory import com.avito.truth.ResultSubject.Companion.assertThat @@ -15,8 +14,6 @@ internal class ReportsApiRetryTest { private val mockWebServer = MockWebServerFactory.create() - private val loggerFactory = PrintlnLoggerFactory - private val retryCount = 5 private lateinit var reportsApi: ReportsApi @@ -27,7 +24,6 @@ internal class ReportsApiRetryTest { val host = mockWebServer.url("/").toString() reportsApi = ReportsApiFactory.create( host = host, - loggerFactory = loggerFactory, httpClientProvider = HttpClientProvider.createStubInstance() ) } diff --git a/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiTest.kt b/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiTest.kt index 9c0c52284d..687cd0f189 100644 --- a/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiTest.kt +++ b/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/ReportsApiTest.kt @@ -2,7 +2,6 @@ package com.avito.reportviewer import com.avito.http.HttpClientProvider import com.avito.http.createStubInstance -import com.avito.logger.PrintlnLoggerFactory import com.avito.reportviewer.model.ReportCoordinates import com.avito.test.http.MockWebServerFactory import com.avito.test.model.TestName @@ -18,8 +17,6 @@ internal class ReportsApiTest { private val mockWebServer = MockWebServerFactory.create() - private val loggerFactory = PrintlnLoggerFactory - @Test fun `getReport - returns NotFound - when throws exception with no data`() { mockWebServer.enqueue( @@ -105,7 +102,6 @@ internal class ReportsApiTest { private fun createNoRetriesReportsApi(): ReportsApi = ReportsApiFactory.create( host = mockWebServer.url("/").toString(), - loggerFactory = loggerFactory, httpClientProvider = HttpClientProvider.createStubInstance(), retryRequests = false ) diff --git a/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/StubReportsExtension.kt b/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/StubReportsExtension.kt index 77bfa64713..f5984a1adf 100644 --- a/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/StubReportsExtension.kt +++ b/subprojects/test-runner/report-viewer/src/test/kotlin/com/avito/reportviewer/StubReportsExtension.kt @@ -2,7 +2,6 @@ package com.avito.reportviewer import com.avito.http.HttpClientProvider import com.avito.http.createStubInstance -import com.avito.logger.PrintlnLoggerFactory import com.avito.test.http.MockDispatcher import okhttp3.mockwebserver.MockWebServer import org.junit.jupiter.api.extension.AfterEachCallback @@ -16,15 +15,13 @@ internal class StubReportsExtension : BeforeEachCallback, AfterEachCallback, Par private var state: State? = null override fun beforeEach(context: ExtensionContext) { - val loggerFactory = PrintlnLoggerFactory - val mockDispatcher = MockDispatcher(loggerFactory = loggerFactory) + val mockDispatcher = MockDispatcher() val mockWebServer = MockWebServer().apply { dispatcher = mockDispatcher } state = State( mockWebServer = mockWebServer, stubReportApi = StubReportApi( realApi = ReportsApiFactory.create( host = mockWebServer.url("/").toString(), - loggerFactory = PrintlnLoggerFactory, httpClientProvider = HttpClientProvider.createStubInstance() ), mockDispatcher = mockDispatcher diff --git a/subprojects/test-runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevicesManager.kt b/subprojects/test-runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevicesManager.kt index 3772f3a54e..8cb798295d 100644 --- a/subprojects/test-runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevicesManager.kt +++ b/subprojects/test-runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevicesManager.kt @@ -1,7 +1,5 @@ package com.avito.runner.service.worker.device.adb -import com.avito.logger.LoggerFactory -import com.avito.logger.create import com.avito.runner.CommandLineExecutor import com.avito.runner.ProcessNotification import com.avito.runner.service.worker.device.DevicesManager @@ -10,14 +8,11 @@ import rx.Single import java.util.Optional public class AdbDevicesManager( - loggerFactory: LoggerFactory, private val commandLine: CommandLineExecutor = CommandLineExecutor.create(), private val adbParser: AdbDeviceParser = AdbDeviceParser(), private val adb: Adb ) : DevicesManager { - private val logger = loggerFactory.create() - override fun findDevice(coordinate: Serial): Optional { return adbDevices().map { output -> adbParser.findDeviceInOrNull(coordinate, output)?.let { params -> @@ -35,9 +30,6 @@ public class AdbDevicesManager( .map { output -> adbParser.parse(output) } - .doOnError { - logger.warn("Error on getting adb devices", it) - } .toBlocking() .value() @@ -56,10 +48,6 @@ public class AdbDevicesManager( } .retry { retryCount, exception -> val shouldRetry = retryCount < ADB_RETRY_COUNT && exception is IllegalStateException - if (shouldRetry) { - logger.debug("runningEmulators: retrying $exception.") - } - shouldRetry } .toSingle() diff --git a/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/runner/InHouseInstrumentationTestRunner.kt b/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/runner/InHouseInstrumentationTestRunner.kt index 6a08cb3516..e27ab250b1 100644 --- a/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/runner/InHouseInstrumentationTestRunner.kt +++ b/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/runner/InHouseInstrumentationTestRunner.kt @@ -194,7 +194,7 @@ abstract class InHouseInstrumentationTestRunner : val mockWebServer: MockWebServer by lazy { MockWebServer() } - val mockDispatcher by lazy { MockDispatcher(loggerFactory = loggerFactory) } + val mockDispatcher = MockDispatcher() protected abstract val metadataToBundleInjector: TestMetadataInjector diff --git a/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/transport/ReportTransportFactory.kt b/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/transport/ReportTransportFactory.kt index 9220dd4f0f..ee648a201f 100644 --- a/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/transport/ReportTransportFactory.kt +++ b/subprojects/test-runner/test-inhouse-runner/src/main/kotlin/com/avito/android/transport/ReportTransportFactory.kt @@ -49,7 +49,6 @@ class ReportTransportFactory( loggerFactory = loggerFactory, reportsApi = ReportsApiFactory.create( host = reportDestination.reportApiUrl, - loggerFactory = loggerFactory, httpClientProvider = httpClientProvider ), remoteStorageTransport = uploadFromDevice