update dependencies

newhinton · Aug 19, 2023 · b8b169a · b8b169a
1 parent 6a6d660
commit b8b169a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,13 +17,13 @@ android {
             storeFile file('.config/android/roundsync.keystore')
         }
     }
-    compileSdkVersion 33
     ndkVersion project.properties['de.felixnuesse.extract.ndkVersion']
     defaultConfig {
         generatedDensities = []
         vectorDrawables.generatedDensities = []
         applicationId 'de.felixnuesse.extract'
         minSdkVersion 23
+        compileSdk 33
         targetSdkVersion 33
         versionCode 250 // last digit is reserved for ABI, only ever end on 0!
         versionName '2.1.5'
@@ -53,15 +53,15 @@ android {
     }
 
     sourceSets {
-        all {
+        configureEach {
             jniLibs.srcDirs = ["lib"]
         }
     }
 
-    flavorDimensions 'edition'
+    flavorDimensions += 'edition'
     productFlavors {
         // Default GitHub and Google Play build
-        rcx {
+        rs {
             dimension 'edition'
         }
         // OSS build
@@ -102,18 +102,14 @@ android {
     packagingOptions {
         jniLibs {
             keepDebugSymbols += ['**/*.so']
+            useLegacyPackaging true
         }
     }
     namespace 'ca.pkay.rcloneexplorer'
 
 
 }
 
-def now() {
-    SimpleDateFormat df = new SimpleDateFormat ("yyyMMdd_hhmm")
-    return df.format(new Date())
-}
-
 repositories {
     mavenCentral()
     google()
@@ -122,21 +118,20 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.browser:browser:1.5.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
     implementation 'com.github.leinardi:FloatingActionButtonSpeedDial:3.1.1'
     implementation 'org.markdownj:markdownj-core:0.4'
     implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
     implementation 'com.github.GrenderG:Toasty:1.3.0'
 
-    implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
-    implementation 'com.google.android.material:material:1.7.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.datastore:datastore-preferences:1.0.0'
 
 
@@ -163,6 +158,6 @@ dependencies {
     implementation 'com.github.AppIntro:AppIntro:6.1.0'
     // TEST
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,6 @@
 
     <application
         android:allowBackup="true"
-        android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"

diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = '1.7.20'
+    ext.kotlinVersion = '1.8.21'
     repositories {
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/safdav/build.gradle b/safdav/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 21
+        compileSdk 33
         targetSdkVersion 33
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -33,10 +33,10 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }