Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all dependencies #63

Merged
merged 3 commits into from
Jul 21, 2024
Merged

Update all dependencies #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2af8397
Update all dependencies
chenxiaolong Jul 21, 2024
949f504
Fix Android Studio lints and warnings
chenxiaolong Jul 21, 2024
b43bb5a
gradle: Skip building incomplete APKs for unsupported ABIs
chenxiaolong Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@file:Suppress("UnstableApiUsage")

import org.eclipse.jgit.api.ArchiveCommand
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.archive.TarFormat
Expand Down Expand Up @@ -112,7 +110,7 @@ android {

compileSdk = 34
buildToolsVersion = "34.0.0"
ndkVersion = "26.1.10909125"
ndkVersion = "26.3.11579264"

defaultConfig {
applicationId = "com.chiller3.rsaf"
Expand Down Expand Up @@ -184,6 +182,8 @@ android {
abi {
isEnable = true
isUniversalApk = false
reset()
include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
}
}
}
Expand All @@ -201,7 +201,7 @@ dependencies {

// Included only to work around R8 complaining about missing annotation classes referenced by
// the Tink transitive dependency
implementation(libs.jsr305)
implementation(libs.spotbugs)

androidTestImplementation(libs.junit)
androidTestImplementation(libs.espresso.core)
Expand Down
10 changes: 8 additions & 2 deletions app/src/androidTest/java/com/chiller3/rsaf/RcloneProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import com.chiller3.rsaf.binding.rcbridge.Rcbridge
import org.junit.After
import org.junit.Assert.*
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertThrows
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import java.io.File
import java.time.Duration
import java.time.Instant
import kotlin.io.path.*
import kotlin.reflect.KMutableProperty0

@RunWith(AndroidJUnit4::class)
Expand Down
4 changes: 2 additions & 2 deletions app/src/androidTest/res/values/strings_notranslate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<!-- These are needed because build.gradle.kts injects resources that refer to them by @string/<name> -->
<string name="app_name_release" translatable="false"></string>
<string name="app_name_debug" translatable="false"></string>
<string name="app_name_release" translatable="false" />
<string name="app_name_debug" translatable="false" />
</resources>
2 changes: 0 additions & 2 deletions app/src/main/java/com/chiller3/rsaf/MainApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ package com.chiller3.rsaf
import android.app.Application
import android.app.backup.BackupManager
import android.content.SharedPreferences
import android.system.Os
import android.util.Log
import com.chiller3.rsaf.binding.rcbridge.Rcbridge
import com.google.android.material.color.DynamicColors
import java.io.File

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/chiller3/rsaf/RcloneRpc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ object RcloneRpc {
val provider: String = data.getString("Provider")
}

@Suppress("unused", "MemberVisibilityCanBePrivate")
@Suppress("unused")
class ProviderOption(data: JSONObject) {
val name: String = data.getString("Name")
val help: String = data.getString("Help")
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/chiller3/rsaf/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import androidx.preference.size
import com.chiller3.rsaf.binding.rcbridge.Rcbridge
import com.google.android.material.snackbar.Snackbar
import kotlinx.coroutines.launch
import kotlin.math.absoluteValue

class SettingsFragment : PreferenceFragmentCompat(), FragmentResultListener,
Preference.OnPreferenceClickListener, LongClickablePreference.OnPreferenceLongClickListener,
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/chiller3/rsaf/SettingsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ data class RemoteBlockUnblockSucceeded(val remote: String, val blocked: Boolean)
data class RemoteBlockUnblockFailed(val remote: String, val block: Boolean, val error: String) : Alert {
override val requireNotifyRootsChanged: Boolean = false
}
object ImportSucceeded : Alert {
data object ImportSucceeded : Alert {
override val requireNotifyRootsChanged: Boolean = true
}
object ExportSucceeded : Alert {
data object ExportSucceeded : Alert {
override val requireNotifyRootsChanged: Boolean = false
}
data class ImportFailed(val error: String) : Alert {
Expand All @@ -67,10 +67,10 @@ data class ImportFailed(val error: String) : Alert {
data class ExportFailed(val error: String) : Alert {
override val requireNotifyRootsChanged: Boolean = false
}
object ImportCancelled : Alert {
data object ImportCancelled : Alert {
override val requireNotifyRootsChanged: Boolean = false
}
object ExportCancelled : Alert {
data object ExportCancelled : Alert {
override val requireNotifyRootsChanged: Boolean = false
}
data class LogcatSucceeded(val uri: Uri) : Alert {
Expand Down
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]
activity-ktx = "1.8.2"
android-gradle-plugin = "8.3.2"
appcompat = "1.6.1"
activity-ktx = "1.9.0"
android-gradle-plugin = "8.5.1"
appcompat = "1.7.0"
biometric = "1.1.0"
core-ktx = "1.12.0"
jgit = "6.9.0.202403050737-r"
espresso-core = "3.5.1"
fragment-ktx = "1.6.2"
jsr305 = "3.0.2"
junit = "1.1.5"
kotlin = "1.9.23"
material = "1.11.0"
core-ktx = "1.13.1"
jgit = "6.10.0.202406032230-r"
espresso-core = "3.6.1"
fragment-ktx = "1.8.1"
junit = "1.2.1"
kotlin = "2.0.0"
material = "1.12.0"
preference-ktx = "1.2.1"
security-crypto = "1.1.0-alpha06"
spotbugs = "4.8.6"

[libraries]
activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity-ktx" }
Expand All @@ -23,11 +23,11 @@ espresso-core = { group = "androidx.test.espresso", name = "espresso-core", vers
fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment-ktx" }
jgit = { group = "org.eclipse.jgit", name = "org.eclipse.jgit", version.ref = "jgit" }
jgit-archive = { group = "org.eclipse.jgit", name = "org.eclipse.jgit.archive", version.ref = "jgit" }
jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "jsr305" }
junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference-ktx" }
security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "security-crypto" }
spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" }

[plugins]
android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
Expand Down
Loading
Loading