Merge branch 'main' into slf4f-2.0.3

.github/workflows/lock-closed-issues.yml

@@ -11,7 +11,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-inactive-days: "14"

.gitignore

@@ -28,3 +28,5 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 
+# For Node scripts
+node_modules

CHANGELOG.md

@@ -0,0 +1,35 @@
+#  (2022-12-04)
+
+
+### Bug Fixes
+
+* ConverterTest quirks based on jdk ([e5fe9b5](https://github.com/tony19/logback-android/commit/e5fe9b5fb14df774f98e56c19e1b04813afc0b11))
+* DateConverterTest quirks based on jdk ([68c6b2d](https://github.com/tony19/logback-android/commit/68c6b2d4167b5496af306151641e7f1ccb51a59b))
+* **deps:** update dependency com.icegreen:greenmail to v1.6.11 ([fc7cd90](https://github.com/tony19/logback-android/commit/fc7cd905c45deed6088dcc576c717e4ea4b42f4b))
+* **deps:** update dependency com.sun.mail:android-activation to v1.6.7 ([404b023](https://github.com/tony19/logback-android/commit/404b023827a58e59da9869ba54e624efe840f378))
+* **deps:** update dependency com.sun.mail:android-mail to v1.6.7 ([6a44d78](https://github.com/tony19/logback-android/commit/6a44d78a893796fe47419768ac623020889a4b14))
+* **deps:** update dependency joda-time:joda-time to v2.12.1 ([a085ba6](https://github.com/tony19/logback-android/commit/a085ba65d02119dc817a311d60e3b343775fedde))
+* **deps:** update dependency joda-time:joda-time to v2.12.2 ([bb8c61e](https://github.com/tony19/logback-android/commit/bb8c61e9eae21eb770c175b653184a533ba21f6f))
+* **deps:** update dependency junit:junit to v4.13.2 ([650cc4b](https://github.com/tony19/logback-android/commit/650cc4b7ac120e69806744becf7a147725a71858))
+* **deps:** update dependency org.mockito:mockito-core to v2.28.2 ([b394edc](https://github.com/tony19/logback-android/commit/b394edc74a3214bf0533ff9c9314b8b13a5bce36))
+* **deps:** update dependency org.robolectric:android-all to v13 ([b94355f](https://github.com/tony19/logback-android/commit/b94355f704a14461c4af1d5bdc3050f04df4ac4c))
+* **deps:** update dependency org.robolectric:robolectric to v4.9 ([677b435](https://github.com/tony19/logback-android/commit/677b435273767e926c53a3d7a4d60fb0175a0451))
+* **deps:** update slf4jversion to v1.7.36 ([e80340a](https://github.com/tony19/logback-android/commit/e80340aa41cae896e18c610a5282e09e1be31a00))
+* force robolectric tests in api 30 ([2c3e454](https://github.com/tony19/logback-android/commit/2c3e454ae1d44adc23e2d34e1c0ce01c789b198c))
+* ignore testThatErrorIsDetectedAtLogInit ([6b4aa4f](https://github.com/tony19/logback-android/commit/6b4aa4fba68a7216ba4efd7ddde30f9023423ed2))
+* javadoc issue ([158a570](https://github.com/tony19/logback-android/commit/158a570f1c0ca513061993ed3c882d1d0762c796))
+* restore accidentally deleted files from 38ed3af47 ([52f279d](https://github.com/tony19/logback-android/commit/52f279def05557b7773ada25553a0ca9759b9868))
+* testThatErrorIsDetectedAtLogInit ([711fb59](https://github.com/tony19/logback-android/commit/711fb594b697026f49dd4bb1edf3494b24ec4977))
+* update android context util tests ([6ff0057](https://github.com/tony19/logback-android/commit/6ff005791c9f089cab612347d1f7d062bb2afd51))
+* use real domain with nonexistent resource in tests ([1353563](https://github.com/tony19/logback-android/commit/135356345a1ab50d906e02d2acf9aa21f19a6228))
+
+
+### Reverts
+
+* Revert "start work on release 1.0.2" ([c341686](https://github.com/tony19/logback-android/commit/c341686a1ae3094c2f93d71fccb4f1ec86c38016))
+* Revert "started work on LBCORE-234" ([e8cefd6](https://github.com/tony19/logback-android/commit/e8cefd699528358e4dc4e238bd47a1b1a99ee941))
+* Revert "ongoing work on LBCORE-234" ([85bfa21](https://github.com/tony19/logback-android/commit/85bfa216aa9ec323ee8f5bcdd5fde6e80a306b1f))
+* remove gradle release plugin again ([696c4da](https://github.com/tony19/logback-android/commit/696c4da3671ab4cbde8e38885a9d9fe9b70bef54))
+
+
+

README.md

@@ -1,4 +1,4 @@
-# logback-android [![GitHub release](https://img.shields.io/github/release/tony19/logback-android.svg?maxAge=2592000)](https://github.com/tony19/logback-android/releases/) [![CircleCI](https://circleci.com/gh/tony19/logback-android/tree/main.svg?style=svg)](https://circleci.com/gh/tony19/logback-android/tree/main) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4fc7dae87f034dd181e4228acec33221)](https://www.codacy.com/gh/tony19/logback-android/dashboard?utm_source=github.com&utm_medium=referral&utm_content=tony19/logback-android&utm_campaign=Badge_Grade)
+# logback-android [![GitHub release](https://img.shields.io/github/release/tony19/logback-android.svg?maxAge=2592000)](https://github.com/tony19/logback-android/releases/) <a href="https://android-arsenal.com/api?level=9"><img alt="API" src="https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat"/></a> [![CircleCI](https://circleci.com/gh/tony19/logback-android/tree/main.svg?style=svg)](https://circleci.com/gh/tony19/logback-android/tree/main) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4fc7dae87f034dd181e4228acec33221)](https://www.codacy.com/gh/tony19/logback-android/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=tony19/logback-android&amp;utm_campaign=Badge_Grade)
 
 Overview
 --------
@@ -11,7 +11,7 @@ Overview
  * syslog
  * email
 
-Runs on Android 2.3 (SDK 9) or higher. See [Wiki](https://github.com/tony19/logback-android/wiki) for documentation.
+See [Wiki](https://github.com/tony19/logback-android/wiki) for documentation.
 
 *For `logback-android@1.x`, see the [`1.x` branch](https://github.com/tony19/logback-android/tree/1.x).*
 
@@ -23,16 +23,16 @@ Quick Start
     ```groovy
     dependencies {
       implementation 'org.slf4j:slf4j-api:2.0.3'
-      implementation 'com.github.tony19:logback-android:2.0.0'
+      implementation 'com.github.tony19:logback-android:2.0.1'
     }
     ```
 
    If using `logback-android` in unit tests, **either** [use Robolectric](https://github.com/tony19/logback-android/issues/151#issuecomment-466276739), **or** use this config instead:
 
     ```groovy
     dependencies {
-      implementation 'org.slf4j:slf4j-api:1.7.36' // slf4j 2.x not yet supported
-      implementation 'com.github.tony19:logback-android:2.0.0'
+      implementation 'org.slf4j:slf4j-api:2.0.3'
+      implementation 'com.github.tony19:logback-android:2.0.1'
       testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     }
 
@@ -41,8 +41,6 @@ Quick Start
     }
     ```
 
-   **NOTE:** SLF4J 2.x is not [yet](https://github.com/tony19/logback-android/pull/247) supported.
-
 3. Create `app/src/main/assets/logback.xml` containing:
 
     ```xml
@@ -95,8 +93,8 @@ _Gradle_ **release**
 
 ```groovy
 dependencies {
-  implementation 'org.slf4j:slf4j-api:1.7.36' // slf4j 2.x not yet supported
-  implementation 'com.github.tony19:logback-android:2.0.0'
+  implementation 'org.slf4j:slf4j-api:2.0.3'
+  implementation 'com.github.tony19:logback-android:2.0.1'
 }
 ```
 
@@ -109,7 +107,7 @@ repositories {
 
 dependencies {
   implementation 'org.slf4j:slf4j-api:2.0.3'
-  implementation 'com.github.tony19:logback-android:2.0.1-SNAPSHOT'
+  implementation 'com.github.tony19:logback-android:2.0.2-SNAPSHOT'
 }
 ```
 
@@ -121,5 +119,5 @@ Use these commands to create the AAR:
     cd logback-android
     scripts/makejar.sh
 
-The file is output to: `./build/logback-android-2.0.0-debug.aar`
+The file is output to: `./build/logback-android-2.0.1-debug.aar`
 

build.gradle

@@ -1,35 +1,30 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-
   repositories {
     google()
     mavenCentral()
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.3.1'
-    classpath 'org.ajoberstar:grgit:2.1.1'
-    classpath 'com.novoda:gradle-static-analysis-plugin:0.5.1'
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }
 }
 plugins {
-  id 'io.codearte.nexus-staging' version '0.30.0' // must be in root project
+  id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
+  id 'maven-publish'
   id 'com.github.hierynomus.license' version '0.16.1'
 }
-
-apply plugin: 'org.ajoberstar.grgit'
-apply from: 'gradle/readme.gradle'
+apply from: "${rootDir}/gradle/publish-root.gradle"
 
 allprojects {
   repositories {
     google()
     mavenCentral()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
   }
-  apply from: "${rootProject.projectDir}/gradle/license.gradle"
 }
 
 task clean(type: Delete) {

gradle.properties

@@ -1,43 +1,54 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-#org.gradle.jvmargs=-Xmx1536m
+# `version` is needed by gradle-release-plugin and always matches
+# `VERSION_NAME`. The plugin updates both automatically.
+version=2.0.2-SNAPSHOT
+VERSION_NAME=2.0.2-SNAPSHOT
+VERSION_CODE=3020000
 
 slf4jVersion=2.0.3
 
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Ensure important default jvmargs aren't overwritten. See https://github.com/gradle/gradle/issues/19750
+org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+org.gradle.parallel=true
 
-# `version` is needed by gradle-release-plugin and always matches
-# `VERSION_NAME`. The plugin updates both automatically.
-version=2.0.1-SNAPSHOT
-VERSION_NAME=2.0.1-SNAPSHOT
-VERSION_CODE=3020000
-GROUP=com.github.tony19
-
-POM_DESCRIPTION="Logging library for Android apps"
-POM_URL=https://github.com/tony19/logback-android
-POM_SCM_URL=https://github.com/tony19/logback-android
-POM_SCM_ISSUES_URL=https://github.com/tony19/logback-android/issues
-POM_SCM_CONNECTION=scm:git@github.com:tony19/logback-android.git
-POM_SCM_DEV_CONNECTION=scm:git@github.com:tony19/logback-android.git
-POM_LICENCE_NAME="The Apache Software License, Version 2.0"
-POM_LICENCE_ID="Apache-2.0"
-POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0
-POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=tony19
-POM_DEVELOPER_NAME=tony19
-POM_DEVELOPER_EMAIL=tony19@gmail.com
+# Not encouraged by Gradle and can produce weird results. Wait for isolated projects instead.
+org.gradle.configureondemand=false
+
+# Enable caching between builds.
+org.gradle.caching=true
+
+# Enable configuration caching between builds.
+org.gradle.unsafe.configuration-cache=true
 
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+
+# Non-transitive R classes is recommended and is faster/smaller
+android.nonTransitiveRClass=true
+
+# Disable build features that are enabled by default,
+# https://developer.android.com/studio/releases/gradle-plugin#buildFeatures
+#android.defaults.buildfeatures.buildconfig=false
+android.defaults.buildfeatures.aidl=false
+android.defaults.buildfeatures.renderscript=false
+android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.shaders=false
+
+# for gradle-maven-publish-plugin
+android.disableAutomaticComponentCreation=true