Merge pull request #280 from tony19/wip/2.0.1

fix: allow RollingFileAppender to always run

build.gradle

@@ -4,7 +4,7 @@ buildscript {
 
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:3.2.1'
@@ -27,7 +27,7 @@ apply from: 'gradle/readme.gradle'
 allprojects {
   repositories {
     google()
-    jcenter()
+    mavenCentral()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
   }
   apply from: "${rootProject.projectDir}/gradle/license.gradle"

logback-android/build.gradle

@@ -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
@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode VERSION_CODE.toInteger()
         versionName VERSION_NAME
     }

logback-android/src/main/java/ch/qos/logback/classic/joran/ReconfigureOnChangeTask.java

@@ -22,6 +22,7 @@
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.android.AndroidContextUtil;
 import ch.qos.logback.core.joran.event.SaxEvent;
 import ch.qos.logback.core.joran.spi.ConfigurationWatchList;
 import ch.qos.logback.core.joran.spi.JoranException;
@@ -109,12 +110,13 @@ private void fireDoneReconfiguring() {
 
     private void performXMLConfiguration(LoggerContext lc, URL mainConfigurationURL) {
         JoranConfigurator jc = new JoranConfigurator();
-        jc.setContext(context);
-        StatusUtil statusUtil = new StatusUtil(context);
+        jc.setContext(lc);
+        StatusUtil statusUtil = new StatusUtil(lc);
         List<SaxEvent> eventList = jc.recallSafeConfiguration();
 
-        URL mainURL = ConfigurationWatchListUtil.getMainWatchURL(context);
+        URL mainURL = ConfigurationWatchListUtil.getMainWatchURL(lc);
         lc.reset();
+        new AndroidContextUtil().setupProperties(lc);
         long threshold = System.currentTimeMillis();
         try {
             jc.doConfigure(mainConfigurationURL);
@@ -145,8 +147,8 @@ private void fallbackConfiguration(LoggerContext lc, List<SaxEvent> eventList, U
 
         List<SaxEvent> failsafeEvents = removeIncludeEvents(eventList);
         JoranConfigurator joranConfigurator = new JoranConfigurator();
-        joranConfigurator.setContext(context);
-        ConfigurationWatchList oldCWL = ConfigurationWatchListUtil.getConfigurationWatchList(context);
+        joranConfigurator.setContext(lc);
+        ConfigurationWatchList oldCWL = ConfigurationWatchListUtil.getConfigurationWatchList(lc);
         ConfigurationWatchList newCWL = oldCWL.buildClone();
 
         if (failsafeEvents == null || failsafeEvents.isEmpty()) {
@@ -155,7 +157,8 @@ private void fallbackConfiguration(LoggerContext lc, List<SaxEvent> eventList, U
             addWarn(FALLING_BACK_TO_SAFE_CONFIGURATION);
             try {
                 lc.reset();
-                ConfigurationWatchListUtil.registerConfigurationWatchList(context, newCWL);
+                new AndroidContextUtil().setupProperties(lc);
+                ConfigurationWatchListUtil.registerConfigurationWatchList(lc, newCWL);
                 joranConfigurator.doConfigure(failsafeEvents);
                 addInfo(RE_REGISTERING_PREVIOUS_SAFE_CONFIGURATION);
                 joranConfigurator.registerSafeConfiguration(eventList);

logback-android/src/main/java/ch/qos/logback/classic/net/server/HardenedLoggingEventInputStream.java

@@ -36,8 +36,6 @@
 
 public class HardenedLoggingEventInputStream extends HardenedObjectInputStream {
 
-    static final String ARRAY_PREFIX = "[L";
-
     static public List<String> getWhilelist() {
         List<String> whitelist = new ArrayList<String>();
         whitelist.add(LoggingEventVO.class.getName());