From baa128e11a8c528a40ce0d2e6cdc70d6cc4bb2ba Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 15 Apr 2021 22:48:00 +0200 Subject: [PATCH] updating commons, kotlin and gradle --- .editorconfig | 2 +- app/build.gradle | 3 ++- .../com/simplemobiletools/camera/helpers/PhotoProcessor.kt | 6 +++--- build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1606d61f..c79c990f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,7 +17,7 @@ insert_final_newline = true charset = utf-8 indent_style = space indent_size = 4 -continuation_indent_size = 8 +continuation_indent_size = 4 [*.xml] continuation_indent_size = 4 diff --git a/app/build.gradle b/app/build.gradle index e2934991..00087d0f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,6 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.16' + implementation 'com.github.SimpleMobileTools:Simple-Commons:8e64d28412' implementation 'androidx.documentfile:documentfile:1.0.1' + implementation "androidx.exifinterface:exifinterface:1.3.2" } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt index 65219f4d..952bd22c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt @@ -4,11 +4,11 @@ import android.annotation.TargetApi import android.graphics.Bitmap import android.graphics.BitmapFactory import android.graphics.Matrix -import android.media.ExifInterface import android.net.Uri import android.os.AsyncTask import android.os.Build import android.os.Environment +import androidx.exifinterface.media.ExifInterface import com.simplemobiletools.camera.R import com.simplemobiletools.camera.activities.MainActivity import com.simplemobiletools.camera.extensions.config @@ -22,7 +22,7 @@ import java.io.OutputStream class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOrientation: Int, val previewRotation: Int, val isUsingFrontCamera: Boolean, val isThirdPartyIntent: Boolean) : - AsyncTask() { + AsyncTask() { @TargetApi(Build.VERSION_CODES.N) override fun doInBackground(vararg params: ByteArray): String { @@ -78,7 +78,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr } val orient = exif?.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED) - ?: ExifInterface.ORIENTATION_UNDEFINED + ?: ExifInterface.ORIENTATION_UNDEFINED val imageRot = orient.degreesFromOrientation() diff --git a/build.gradle b/build.gradle index 6dadbc10..ac335a39 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.32' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong