From 79282469e1d48d9d7a540d1d57582ef99c1b11dd Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <piotr.github@karwasz.org>
Date: Tue, 8 Oct 2024 16:17:55 +0200
Subject: [PATCH] Move to `o.a.l.l.samples.android` package

---
 log4j-samples-android/app/build.gradle                    | 2 +-
 log4j-samples-android/app/src/main/AndroidManifest.xml    | 4 ++--
 .../logging/log4j/samples/android}/MainActivity.java      | 8 +-------
 log4j-samples-android/build.gradle                        | 2 +-
 log4j-samples-android/gradlew                             | 0
 5 files changed, 5 insertions(+), 11 deletions(-)
 rename log4j-samples-android/app/src/main/java/{com/example/log4japi => org/apache/logging/log4j/samples/android}/MainActivity.java (91%)
 mode change 100644 => 100755 log4j-samples-android/gradlew

diff --git a/log4j-samples-android/app/build.gradle b/log4j-samples-android/app/build.gradle
index 50b9b5e..e209137 100644
--- a/log4j-samples-android/app/build.gradle
+++ b/log4j-samples-android/app/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdk 34
 
     defaultConfig {
-        applicationId "com.example.log4japi"
+        applicationId "org.apache.logging.log4j.samples.android"
         minSdk 26
         targetSdk 34
         versionCode 1
diff --git a/log4j-samples-android/app/src/main/AndroidManifest.xml b/log4j-samples-android/app/src/main/AndroidManifest.xml
index ba30a62..228a0ec 100644
--- a/log4j-samples-android/app/src/main/AndroidManifest.xml
+++ b/log4j-samples-android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.log4japi">
+    package="org.apache.logging.log4j.samples.android">
 
     <application
         android:allowBackup="true"
@@ -14,7 +14,7 @@
         android:theme="@style/Theme.Log4jAPI"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/log4j-samples-android/app/src/main/java/com/example/log4japi/MainActivity.java b/log4j-samples-android/app/src/main/java/org/apache/logging/log4j/samples/android/MainActivity.java
similarity index 91%
rename from log4j-samples-android/app/src/main/java/com/example/log4japi/MainActivity.java
rename to log4j-samples-android/app/src/main/java/org/apache/logging/log4j/samples/android/MainActivity.java
index 1749ed7..7797f6a 100644
--- a/log4j-samples-android/app/src/main/java/com/example/log4japi/MainActivity.java
+++ b/log4j-samples-android/app/src/main/java/org/apache/logging/log4j/samples/android/MainActivity.java
@@ -1,4 +1,4 @@
-package com.example.log4japi;
+package org.apache.logging.log4j.samples.android;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -10,14 +10,8 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.Configurator;
-import org.apache.logging.log4j.core.config.LoggerConfig;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Arrays;
 
 public class MainActivity extends AppCompatActivity {
diff --git a/log4j-samples-android/build.gradle b/log4j-samples-android/build.gradle
index a550ce3..eb1619c 100644
--- a/log4j-samples-android/build.gradle
+++ b/log4j-samples-android/build.gradle
@@ -4,6 +4,6 @@ plugins {
     id 'com.android.library' version '7.2.1' apply false
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file
diff --git a/log4j-samples-android/gradlew b/log4j-samples-android/gradlew
old mode 100644
new mode 100755