Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

feat!: upgrade slf4j to 2.0.3 #247

Merged
merged 13 commits into from
Dec 4, 2022
Merged

feat!: upgrade slf4j to 2.0.3 #247

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
46435f4
Upgrade slf4f to 2.0.3
compscidr Oct 14, 2022
45950d6
implement clearDequeueByKey
compscidr Oct 14, 2022
40e33e7
Implemented the ServiceLoader method for slf4f 2.x.x provider detection
compscidr Oct 14, 2022
b521c7e
lint fixes
compscidr Oct 14, 2022
eada4af
fix infinite recursion
compscidr Oct 28, 2022
cbd5242
fixed some empty functions and some isEnabled functions
compscidr Oct 28, 2022
06a6ad0
revert dependency changes
compscidr Nov 17, 2022
7659ee0
fix a bunch of tests that I must have missed last time
compscidr Nov 17, 2022
14e6f3f
merge upstream/main
compscidr Nov 17, 2022
4a435f0
updated readme with 2.0.3 api to match
compscidr Nov 17, 2022
55a70b2
revert scope changes
compscidr Nov 17, 2022
1d49803
fix incorrect collections import
compscidr Nov 17, 2022
618fa33
Merge branch 'main' into slf4f-2.0.3
tony19 Dec 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Default value: -Xmx10248m -XX:MaxPermSize=256m
#org.gradle.jvmargs=-Xmx1536m

slf4jVersion=1.7.25
slf4jVersion=2.0.3

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
13 changes: 7 additions & 6 deletions logback-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply from: "${rootProject.projectDir}/gradle/docs.gradle"
apply from: "${rootProject.projectDir}/gradle/deploy.gradle"

android {
compileSdkVersion 30
compileSdkVersion 31

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
Expand All @@ -16,7 +16,7 @@ android {

defaultConfig {
minSdkVersion 9
targetSdkVersion 30
targetSdkVersion 31
versionCode VERSION_CODE.toInteger()
versionName VERSION_NAME
}
Expand Down Expand Up @@ -47,13 +47,13 @@ android {

dependencies {

testImplementation('junit:junit:4.12') {
testImplementation('junit:junit:4.13.2') {
exclude(module: 'hamcrest-core')
}

testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0'
testImplementation 'org.robolectric:robolectric:4.3.1'
testImplementation 'org.mockito:mockito-core:2.23.4'
testImplementation 'org.robolectric:robolectric:4.8.1'
testImplementation 'org.mockito:mockito-core:4.7.0'
compscidr marked this conversation as resolved.
Show resolved Hide resolved
testImplementation 'joda-time:joda-time:2.10.1'

// This dep is required when using Robolectric and targeting pre-21 SDKs.
Expand All @@ -63,13 +63,14 @@ dependencies {
testImplementation 'com.icegreen:greenmail:1.5.9'
testImplementation 'dom4j:dom4j:1.6.1'
testImplementation 'org.easytesting:fest-assert:1.4'
testImplementation "org.slf4j:integration:${slf4jVersion}"
testImplementation "org.slf4j:integration:2.0.0-alpha1" // don't seem to have any stable 2.x releases yet
tony19 marked this conversation as resolved.
Show resolved Hide resolved
testImplementation "org.slf4j:log4j-over-slf4j:${slf4jVersion}"
testImplementation "org.slf4j:slf4j-api:${slf4jVersion}:tests"
testImplementation "org.slf4j:slf4j-ext:${slf4jVersion}"
testImplementation(group: 'org.subethamail', name: 'subethasmtp', version: '3.1.7') {
exclude(module: 'slf4j-api')
}
testImplementation project(path: ':logback-android')

compileOnly "org.slf4j:slf4j-api:${slf4jVersion}"

Expand Down
Loading