aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/lint-baseline.xml9
-rw-r--r--app/proguard-rules.pro1
-rw-r--r--app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt2
-rw-r--r--app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt2
-rw-r--r--autofill-parser/lint-baseline.xml2
-rw-r--r--coroutine-utils/lint-baseline.xml2
-rw-r--r--crypto/common/lint-baseline.xml2
-rw-r--r--crypto/pgpainless/lint-baseline.xml2
-rw-r--r--format/common/lint-baseline.xml2
-rw-r--r--gradle/libs.versions.toml2
-rw-r--r--passgen/diceware/lint-baseline.xml2
-rw-r--r--passgen/random/lint-baseline.xml2
-rw-r--r--sentry-stub/lint-baseline.xml2
-rw-r--r--ssh/lint-baseline.xml2
-rw-r--r--ui/compose/lint-baseline.xml2
15 files changed, 22 insertions, 14 deletions
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index b0702655..700a3533 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
<issue
id="StopShip"
@@ -27,6 +27,13 @@
</issue>
<issue
+ id="InvalidPackage"
+ message="Invalid package reference in org.eclipse.jgit:org.eclipse.jgit; not included in Android: `javax.xml.bind`. Referenced from `org.eclipse.jgit.transport.WalkEncryption.SymmetricEncryption`.">
+ <location
+ file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/4.5.7.201904151645-r/e84008db495a7f48d65fb09afe53279b0df68c80/org.eclipse.jgit-4.5.7.201904151645-r.jar"/>
+ </issue>
+
+ <issue
id="DenyListedApi"
message="Use Context#getDrawableCompat() instead"
errorLine1=" ContextCompat.getDrawable(itemView.context, R.drawable.ic_content_copy)"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 6dd3b79e..8e75c760 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -8,6 +8,7 @@
-dontwarn sun.misc.SignalHandler
-dontwarn java.lang.instrument.ClassFileTransformer
-dontwarn javax.servlet.ServletContextListener
+-dontwarn javax.xml.bind.DatatypeConverter
# WhatTheStack
-keep class com.haroldadmin.whatthestack.WhatTheStackInitializer {
diff --git a/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt
index 454054cf..39c6b384 100644
--- a/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt
+++ b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt
@@ -133,7 +133,7 @@ object PasswordRepository {
/** Get the currently checked out branch. */
fun getCurrentBranch(): String? {
val repository = repository ?: return null
- val headRef = repository.getRef(Constants.HEAD) ?: return null
+ val headRef = repository.findRef(Constants.HEAD) ?: return null
return if (headRef.isSymbolic) {
val branchName = headRef.target.name
Repository.shortenRefName(branchName)
diff --git a/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt
index 1411389f..d7584e69 100644
--- a/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt
@@ -158,7 +158,7 @@ class GitConfigActivity : BaseGitActivity() {
*/
private fun headStatusMsg(repo: Repository): String {
return runCatching {
- val headRef = repo.getRef(Constants.HEAD)
+ val headRef = repo.findRef(Constants.HEAD)
if (headRef.isSymbolic) {
val branchName = headRef.target.name
val shortBranchName = Repository.shortenRefName(branchName)
diff --git a/autofill-parser/lint-baseline.xml b/autofill-parser/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/autofill-parser/lint-baseline.xml
+++ b/autofill-parser/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/coroutine-utils/lint-baseline.xml b/coroutine-utils/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/coroutine-utils/lint-baseline.xml
+++ b/coroutine-utils/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/crypto/common/lint-baseline.xml b/crypto/common/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/crypto/common/lint-baseline.xml
+++ b/crypto/common/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/crypto/pgpainless/lint-baseline.xml b/crypto/pgpainless/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/crypto/pgpainless/lint-baseline.xml
+++ b/crypto/pgpainless/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/format/common/lint-baseline.xml b/format/common/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/format/common/lint-baseline.xml
+++ b/format/common/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 547ce613..7f48b219 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -80,7 +80,7 @@ thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.3.0"
thirdparty-flowbinding-android = { module = "io.github.reactivecircus.flowbinding:flowbinding-android", version.ref = "flowbinding" }
# JGit upgrades also raise its minimum Java runtime requirements that we cannot satisfy on Android
# noinspection GradleDependency
-thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:4.0.0.201506090130-r"
+thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:4.5.7.201904151645-r"
thirdparty-kotlinResult = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlinResult" }
thirdparty-kotlinResult-coroutines = { module = "com.michael-bull.kotlin-result:kotlin-result-coroutines", version.ref = "kotlinResult" }
thirdparty-leakcanary-plumber = "com.squareup.leakcanary:plumber-android-startup:2.12"
diff --git a/passgen/diceware/lint-baseline.xml b/passgen/diceware/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/passgen/diceware/lint-baseline.xml
+++ b/passgen/diceware/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/passgen/random/lint-baseline.xml b/passgen/random/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/passgen/random/lint-baseline.xml
+++ b/passgen/random/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/sentry-stub/lint-baseline.xml b/sentry-stub/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/sentry-stub/lint-baseline.xml
+++ b/sentry-stub/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
diff --git a/ssh/lint-baseline.xml b/ssh/lint-baseline.xml
index c12a7d0f..3a04da73 100644
--- a/ssh/lint-baseline.xml
+++ b/ssh/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
<issue
id="InvalidPackage"
diff --git a/ui/compose/lint-baseline.xml b/ui/compose/lint-baseline.xml
index 1f0a317f..73b10006 100644
--- a/ui/compose/lint-baseline.xml
+++ b/ui/compose/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
+<issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-22 18:58:42 +0000