diff --git a/app/build.gradle b/app/build.gradle index 0934a03..9958b7e 100644 --- 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 index 8904311..44be269 100644 --- 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(1, MultiThreadedDecoder::decoded)) << "b v0.5.11a"; + sstop << (MultiThreadedDecoder::bytes / std::max(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 index b959498..e8a7ec7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,7 +4,6 @@ package="org.cimbar.camerafilecopy"> - diff --git a/build.gradle b/build.gradle index 5a88d30..e932514 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ subprojects { afterEvaluate { configure(android.lintOptions) { abortOnError false + checkReleaseBuilds false } } }