Merge pull request #35 from Qase/ref/update_libs

Ref/update libs
Qase · May 31, 2024 · 27c2d57 · 27c2d57
2 parents 40f3855 + 7eca17a
commit 27c2d57
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git 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/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>
diff --git 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"
         }
     }
 

diff --git 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>