Merge pull request #15 from sz3/fix-android12-13-crash

Fix android12/13 crash
sz3 · Mar 21, 2023 · da4270c · da4270c
2 parents 3afd0e8 + 174d38e
commit da4270c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     buildToolsVersion "29.0.3"
     ndkVersion "22.1.7171670"
     defaultConfig {
         applicationId "org.cimbar.camerafilecopy"
         minSdkVersion 21
-        targetSdkVersion 32
-        versionCode 7
-        versionName "0.5.11"
+        targetSdkVersion 30
+        versionCode 8
+        versionName "0.5.12"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -29,7 +29,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/cpp/CMakeLists.txt"
-            version "3.10.2"
+            version "3.16.3"
         }
     }
 }

diff --git a/app/src/cpp/cfc-cpp/jni.cpp b/app/src/cpp/cfc-cpp/jni.cpp
@@ -119,7 +119,7 @@ namespace {
 	{
 		std::stringstream sstop;
 		sstop << "cfc using " << proc.num_threads() << " thread(s). " << proc.color_bits() << "..." << proc.backlog() << "? ";
-		sstop << (MultiThreadedDecoder::bytes / std::max<double>(1, MultiThreadedDecoder::decoded)) << "b v0.5.11a";
+		sstop << (MultiThreadedDecoder::bytes / std::max<double>(1, MultiThreadedDecoder::decoded)) << "b v0.5.12";
 		std::stringstream ssmid;
 		ssmid << "#: " << MultiThreadedDecoder::perfect << " / " << MultiThreadedDecoder::decoded << " / " << MultiThreadedDecoder::scanned << " / " << _calls;
 		std::stringstream ssperf;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,6 @@
           package="org.cimbar.camerafilecopy">
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-feature android:name="android.hardware.camera" android:required="true"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="true"/>
 

diff --git a/build.gradle b/build.gradle
@@ -25,6 +25,7 @@ subprojects {
     afterEvaluate {
             configure(android.lintOptions) {
                 abortOnError false
+                checkReleaseBuilds false
             }
     }
 }