Improve Android example

Author: ppkarwasz

log4j-samples-android/app/build.gradle

@@ -20,6 +20,7 @@ plugins {
 
 android {
     compileSdk 34
+    namespace "org.apache.logging.log4j.samples.android"
 
     defaultConfig {
         applicationId "org.apache.logging.log4j.samples.android"
@@ -50,15 +51,16 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
-    //Log4j
+    // Log4j
     implementation 'org.apache.logging.log4j:log4j-api:2.25.0-SNAPSHOT'
     implementation 'org.apache.logging.log4j:log4j-core:2.25.0-SNAPSHOT'
-}
+
+}

log4j-samples-android/app/src/main/AndroidManifest.xml

@@ -16,8 +16,7 @@
   ~ limitations under the License.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.apache.logging.log4j.samples.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"

log4j-samples-android/app/src/main/resources/log4j2.properties renamed to log4j-samples-android/app/src/main/resources/log4j2.StatusLogger.properties

@@ -15,15 +15,5 @@
 # limitations under the License.
 #
 ##
-# Appenders
-appender.console.type = Console
-appender.console.name = CONSOLE
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5p- %m%n
-
-# Loggers
-rootLogger.level = INFO
-rootLogger.appenderRef.stdout.ref = CONSOLE
-
-logger.0.name = org.apache.logging.log4j.samples.android.MainActivity
-logger.0.level = DEBUG
+# Set the level to `WARN`
+log4j2.statusLoggerLevel = WARN

log4j-samples-android/app/src/main/resources/log4j2.component.properties

@@ -16,4 +16,4 @@
 #
 ##
 log4j2.debug = true
-log4j2.contextSelector = org.apache.logging.log4j.core.selector.BasicContextSelector
+log4j2.contextSelector = org.apache.logging.log4j.core.selector.ClassLoaderContextSelector

log4j-samples-android/app/src/main/resources/log4j2.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<Configuration xmlns="https://logging.apache.org/xml/ns"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="
+                   https://logging.apache.org/xml/ns
+                   https://logging.apache.org/xml/ns/log4j-config-2.xsd">
+  <Appenders>
+    <Console name="CONSOLE">
+      <PatternLayout pattern="%d %-5p [%t] %C:%M - %m%n"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Root level="INFO">
+      <AppenderRef ref="CONSOLE"/>
+    </Root>
+    <Logger name="org.apache.logging.log4j.samples.android.MainActivity"
+            level="DEBUG"/>
+  </Loggers>
+</Configuration>

log4j-samples-android/build.gradle

@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '8.2.0' apply false
+    id 'com.android.library' version '8.2.0' apply false
 }
-
-tasks.register('clean', Delete) {
-    delete rootProject.buildDir
-}

log4j-samples-android/gradle/wrapper/gradle-wrapper.jar

@@ -1,22 +1,5 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-##
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists