From 4eb6bb2fecb5dfcf50a5c078f944f82e779e0369 Mon Sep 17 00:00:00 2001
From: neubauerm <michal.neubauer@quanti.cz>
Date: Thu, 30 May 2024 11:45:11 +0200
Subject: [PATCH 1/2] ref: code style changes + remove package name from
 manifest

---
 app/src/main/AndroidManifest.xml       | 19 +++++++++++++------
 kotlinlog/src/main/AndroidManifest.xml | 15 +++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ab45d1e..15c6317 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="quanti.com.kotlinlog3"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
 
     <application
         android:allowBackup="true"
@@ -11,14 +12,20 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity"
+
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
+
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/kotlinlog/src/main/AndroidManifest.xml b/kotlinlog/src/main/AndroidManifest.xml
index 7442ac0..71cce61 100644
--- a/kotlinlog/src/main/AndroidManifest.xml
+++ b/kotlinlog/src/main/AndroidManifest.xml
@@ -1,20 +1,19 @@
-<manifest package="quanti.com.kotlinlog"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-          xmlns:android="http://schemas.android.com/apk/res/android"
->
-
-    <application android:allowBackup="true"
-                 android:supportsRtl="true"
-    >
+    <application
+        android:allowBackup="true"
+        android:supportsRtl="true">
 
         <provider
             android:name="quanti.com.kotlinlog.file.LogFileProvider"
             android:authorities="${applicationId}"
             android:exported="false"
             android:grantUriPermissions="true">
+
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"/>
+                android:resource="@xml/file_paths" />
+
         </provider>
 
     </application>

From 7eca17a365ec3b1fd8ba21132bfca10fa925343c Mon Sep 17 00:00:00 2001
From: neubauerm <michal.neubauer@quanti.cz>
Date: Thu, 30 May 2024 12:41:09 +0200
Subject: [PATCH 2/2] fix: remove specific cmake version

---
 app/build.gradle       | 9 ++++-----
 kotlinlog/build.gradle | 6 ------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 55d091f..234144b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,8 +28,6 @@ android {
         }
     }
 
-    ndkVersion '21.3.6528147'
-
     kotlinOptions {
         jvmTarget = "17"
     }
@@ -57,9 +55,10 @@ dependencies {
 
     // Test
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    androidTestImplementation(
+            'com.android.support.test.espresso:espresso-core:2.2.2',
+            { exclude group: 'com.android.support', module: 'support-annotations' }
+    )
 }
 
 repositories {
diff --git a/kotlinlog/build.gradle b/kotlinlog/build.gradle
index f38b6e8..d21f219 100644
--- a/kotlinlog/build.gradle
+++ b/kotlinlog/build.gradle
@@ -17,11 +17,6 @@ android {
         buildConfigField 'String', 'VERSION_NAME', "\"$versionName\""
         consumerProguardFile('proguard-rules.pro')
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-            cmake {
-                cppFlags ""
-            }
-        }
     }
 
     buildTypes {
@@ -66,7 +61,6 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.10.2"
         }
     }