Merge branch 'release/2.4' of Umnik/SaveTo into master

app/build.gradle

@@ -5,15 +5,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.0"
 
     defaultConfig {
         applicationId "xyz.myachin.saveto"
         minSdkVersion 23
-        targetSdkVersion 32
-        versionCode 23
-        versionName '1.15.7 NO WAR!!!'
+        targetSdkVersion 33
+        versionCode 24
+        versionName '1.15.8'
     }
 
     buildTypes {
@@ -40,20 +40,21 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace 'xyz.myachin.saveto'
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
 
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    
+
     implementation "androidx.navigation:navigation-fragment-ktx:$fragment_version"
     implementation "androidx.navigation:navigation-ui-ktx:$fragment_version"
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="xyz.myachin.saveto">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
         <intent>

app/src/main/java/xyz/myachin/saveto/ui/settings/MimeTypesSettingsActivity.kt

@@ -140,6 +140,7 @@ class MimeTypesSettingsActivity : AppCompatActivity() {
             pref?.title = getString(R.string.select_directory_title)
         }
 
+        @Deprecated("Deprecated in Java")
         override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
             super.onActivityResult(requestCode, resultCode, data)
             if (resultCode == RESULT_OK) {

app/src/main/java/xyz/myachin/saveto/ui/supports/AskDirAccessActivity.kt

@@ -22,6 +22,7 @@ class AskDirAccessActivity : AppCompatActivity() {
         startActivityForResult(IntentCreator.forDirectSaving(accessCode), accessCode)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         setResult(resultCode, data)

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Save to… [NO WAR!!!]</string>
+    <string name="app_name">Save to…</string>
     <string name="floppy" translatable="false">3.5 floppy</string>
     <string name="tvMainScreenDesc">\tThe application waits for an incoming image or pdf and raises a request to save that file.
         Can be useful for applications like WhatsApp, which do not have their own convenient mechanism for saving objects.\n

build.gradle

@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.6.10'
-        lifecycle_version = '2.4.1'
-        fragment_version = '2.4.1'
+        kotlin_version = '1.7.20'
+        lifecycle_version = '2.5.1'
+        fragment_version = '2.5.3'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

fastlane/metadata/android/en-US/changelogs/24.txt

@@ -0,0 +1 @@
+Updating dependencies

fastlane/metadata/android/ru/changelogs /24.txt

@@ -0,0 +1 @@
+Обновление зависимостей

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Sep 01 13:49:20 MSK 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME