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/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 @@ - + - + - + - - + + + + + \ No newline at end of file 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" } } 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 @@ - - xmlns:android="http://schemas.android.com/apk/res/android" -> - - + + + android:resource="@xml/file_paths" /> +