diff --git a/gestalt-android-testbed/build.gradle b/gestalt-android-testbed/build.gradle index 76ad6ad7..ab80578f 100644 --- a/gestalt-android-testbed/build.gradle +++ b/gestalt-android-testbed/build.gradle @@ -42,7 +42,13 @@ dependencies { implementation(project(":gestalt-asset-core")) implementation(project(":gestalt-entity-system")) implementation(libs.guava) - implementation(libs.slf4j.api) + // Pinned strictly below the catalog's slf4j-api (2.x, pulled in transitively + // via gestalt-android/gestalt-module etc.): logback-android (up to 1.3.0-3, + // the latest release supporting our minSdk 24) predates SLF4J 2.x's provider + // mechanism, so pairing it with slf4j-api 2.x silently no-ops all logging. + implementation("org.slf4j:slf4j-api") { + version { strictly("1.7.25") } + } implementation("com.github.tony19:logback-android:1.3.0-3") implementation(project(":testpack:testpack-api")) testImplementation(libs.junit) diff --git a/gestalt-android/build.gradle b/gestalt-android/build.gradle index 3dc0ffac..6b1c0f71 100644 --- a/gestalt-android/build.gradle +++ b/gestalt-android/build.gradle @@ -47,7 +47,13 @@ dependencies { exclude group: "org.javassist", module: "javassist" } implementation(project(":gestalt-util")) - implementation(libs.slf4j.api) + // Pinned strictly below the catalog's slf4j-api (2.x, pulled in transitively + // via gestalt-module etc.): logback-android (up to 1.3.0-3, the latest + // release supporting our minSdk 24) predates SLF4J 2.x's provider mechanism, + // so pairing it with slf4j-api 2.x silently no-ops all logging. + implementation("org.slf4j:slf4j-api") { + version { strictly("1.7.25") } + } implementation(libs.guava) implementation("androidx.appcompat:appcompat:1.7.0") diff --git a/gestalt-asset-core/gradle.lockfile b/gestalt-asset-core/gradle.lockfile index ecbd88e1..a0d9703f 100644 --- a/gestalt-asset-core/gradle.lockfile +++ b/gestalt-asset-core/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :gestalt-asset-core:dependencies --write-locks -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.6.0=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.6.0=testCompileClasspath,testRuntimeClasspath com.android.support:support-annotations:28.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.github.zafarkhaja:java-semver:0.10.2=annotationProcessor,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -30,5 +30,5 @@ org.javassist:javassist:3.27.0-GA=runtimeClasspath,testRuntimeClasspath org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath empty= diff --git a/gestalt-di/gradle.lockfile b/gestalt-di/gradle.lockfile index 2b36c0a3..f47ccddc 100644 --- a/gestalt-di/gradle.lockfile +++ b/gestalt-di/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :gestalt-di:dependencies --write-locks -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.6.0=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.6.0=testCompileClasspath,testRuntimeClasspath com.android.support:support-annotations:28.0.0=testAnnotationProcessor,testRuntimeClasspath com.github.zafarkhaja:java-semver:0.10.2=testAnnotationProcessor,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -31,5 +31,5 @@ org.javassist:javassist:3.27.0-GA=testRuntimeClasspath org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/gestalt-entity-system/gradle.lockfile b/gestalt-entity-system/gradle.lockfile index 779f6836..77a15e43 100644 --- a/gestalt-entity-system/gradle.lockfile +++ b/gestalt-entity-system/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :gestalt-entity-system:dependencies --write-locks -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.6.0=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.6.0=testCompileClasspath,testRuntimeClasspath com.android.support:support-annotations:28.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.github.zafarkhaja:java-semver:0.10.2=annotationProcessor,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -31,5 +31,5 @@ org.javassist:javassist:3.27.0-GA=runtimeClasspath,testRuntimeClasspath org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath empty= diff --git a/gestalt-es-perf/gradle.lockfile b/gestalt-es-perf/gradle.lockfile index 83da620a..f60d261e 100644 --- a/gestalt-es-perf/gradle.lockfile +++ b/gestalt-es-perf/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :gestalt-es-perf:dependencies --write-locks -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.6.0=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.6.0=testCompileClasspath,testRuntimeClasspath com.android.support:support-annotations:28.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.zafarkhaja:java-semver:0.10.2=runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,5 +30,5 @@ org.javassist:javassist:3.27.0-GA=runtimeClasspath,testRuntimeClasspath org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,testAnnotationProcessor diff --git a/gestalt-inject-java/gradle.lockfile b/gestalt-inject-java/gradle.lockfile index f14a010a..ad6ad781 100644 --- a/gestalt-inject-java/gradle.lockfile +++ b/gestalt-inject-java/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :gestalt-inject-java:dependencies --write-locks -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.6.0=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.6.0=testCompileClasspath,testRuntimeClasspath com.android.support:support-annotations:28.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.zafarkhaja:java-semver:0.10.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,5 +28,5 @@ org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,testAnnotationProcessor diff --git a/gestalt-inject/gradle.lockfile b/gestalt-inject/gradle.lockfile index abfdc03b..81a3bf11 100644 --- a/gestalt-inject/gradle.lockfile +++ b/gestalt-inject/gradle.lockfile @@ -15,5 +15,5 @@ org.codehaus.mojo:animal-sniffer-annotations:1.17=compileClasspath,runtimeClassp org.codehaus.mojo:animal-sniffer-annotations:1.24=animalsniffer org.codehaus.mojo:animal-sniffer:1.24=animalsniffer org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,testAnnotationProcessor diff --git a/gestalt-module/gradle.lockfile b/gestalt-module/gradle.lockfile index b29fe085..deb8d4f9 100644 --- a/gestalt-module/gradle.lockfile +++ b/gestalt-module/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :gestalt-module:dependencies --write-locks -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.6.0=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.6.0=testCompileClasspath,testRuntimeClasspath com.android.support:support-annotations:28.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.github.zafarkhaja:java-semver:0.10.2=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -29,5 +29,5 @@ org.javassist:javassist:3.27.0-GA=compileClasspath,runtimeClasspath,testCompileC org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath empty= diff --git a/gestalt-util/gradle.lockfile b/gestalt-util/gradle.lockfile index 8ec68493..f2057190 100644 --- a/gestalt-util/gradle.lockfile +++ b/gestalt-util/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :gestalt-util:dependencies --write-locks -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.6.0=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.6.0=testCompileClasspath,testRuntimeClasspath com.android.support:support-annotations:28.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -24,5 +24,5 @@ org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.ow2.asm:asm:9.7=animalsniffer -org.slf4j:slf4j-api:1.7.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,testAnnotationProcessor diff --git a/settings.gradle.kts b/settings.gradle.kts index 334557b2..9b84b717 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,10 +7,10 @@ dependencyResolutionManagement { library("gson", "com.google.code.gson:gson:2.8.5") library("guava", "com.google.guava:guava:27.0.1-android") library("jcip", "net.jcip:jcip-annotations:1.0") - library("slf4j-api", "org.slf4j:slf4j-api:1.7.25") + library("slf4j-api", "org.slf4j:slf4j-api:2.0.18") // testing library("junit", "junit:junit:4.12") - library("logback", "ch.qos.logback:logback-classic:1.2.3") + library("logback", "ch.qos.logback:logback-classic:1.6.0") library("mockito", "org.mockito:mockito-core:5.23.0") } }