Merge pull request #54 from bobrofon/api-34

Api 34
bobrofon · Jul 20, 2024 · 5efe967 · 5efe967
2 parents 5b084d7 + 5a16d38
commit 5efe967
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -23,14 +23,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
-
     defaultConfig {
         applicationId "ru.nsu.bobrofon.easysshfs"
+        compileSdk 34
         minSdkVersion 16
-        targetSdkVersion 33
-        versionCode 85
-        versionName "0.5.11"
+        targetSdkVersion 34
+        versionCode 86
+        versionName "0.5.12-dev"
 
         externalNativeBuild {
             cmake {
@@ -66,6 +65,11 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
     namespace 'ru.nsu.bobrofon.easysshfs'
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
 }
 
 dependencies {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,6 @@
     <application
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        android:extractNativeLibs="true"
         android:fullBackupContent="@xml/full_backup_content"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/ru/nsu/bobrofon/easysshfs/EasySSHFSActivity.kt b/app/src/main/java/ru/nsu/bobrofon/easysshfs/EasySSHFSActivity.kt
@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.ViewModelProvider
 import com.topjohnwu.superuser.Shell
+import ru.nsu.bobrofon.easysshfs.log.AppLog
 import ru.nsu.bobrofon.easysshfs.log.LogFragment
 import ru.nsu.bobrofon.easysshfs.mountpointlist.MountPointsList
 import ru.nsu.bobrofon.easysshfs.mountpointlist.MountpointFragment
@@ -56,6 +57,10 @@ class EasySSHFSActivity : AppCompatActivity(), NavigationDrawerFragment.Navigati
             )
         )[EasySSHFSViewModel::class.java]
 
+        AppLog.instance().addMessage(
+            "EasySSHFS ${BuildConfig.VERSION_NAME} "
+                    + "(${BuildConfig.VERSION_CODE}) ${BuildConfig.BUILD_TYPE}"
+        )
         VersionUpdater(applicationContext).update()
 
         setContentView(R.layout.activity_easy_sshfs)

diff --git a/sshfs-static/configs/sshfs-static-arm64-v8a.config b/sshfs-static/configs/sshfs-static-arm64-v8a.config
@@ -124,7 +124,7 @@ BR2_ARM_FPU_FP_ARMV8=y
 #
 # Commands
 #
-BR2_WGET="wget --passive-ftp -nd -t 3"
+BR2_WGET="wget -nd -t 3"
 BR2_SVN="svn --non-interactive"
 BR2_BZR="bzr"
 BR2_GIT="git"

diff --git a/sshfs-static/configs/sshfs-static-armeabi-v7a.config b/sshfs-static/configs/sshfs-static-armeabi-v7a.config
@@ -162,7 +162,7 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
 #
 # Commands
 #
-BR2_WGET="wget --passive-ftp -nd -t 3"
+BR2_WGET="wget -nd -t 3"
 BR2_SVN="svn --non-interactive"
 BR2_BZR="bzr"
 BR2_GIT="git"

diff --git a/sshfs-static/configs/sshfs-static-x86.config b/sshfs-static/configs/sshfs-static-x86.config
@@ -110,7 +110,7 @@ BR2_x86_i686=y
 #
 # Commands
 #
-BR2_WGET="wget --passive-ftp -nd -t 3"
+BR2_WGET="wget -nd -t 3"
 BR2_SVN="svn --non-interactive"
 BR2_BZR="bzr"
 BR2_GIT="git"

diff --git a/sshfs-static/configs/sshfs-static-x86_64.config b/sshfs-static/configs/sshfs-static-x86_64.config
@@ -98,7 +98,7 @@ BR2_x86_x86_64=y
 #
 # Commands
 #
-BR2_WGET="wget --passive-ftp -nd -t 3"
+BR2_WGET="wget -nd -t 3"
 BR2_SVN="svn --non-interactive"
 BR2_BZR="bzr"
 BR2_GIT="git"