summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.git-blame-ignore-revs1
-rw-r--r--buildSrc/build.gradle.kts14
-rw-r--r--format-common/api/format-common.api1
-rw-r--r--gradle/libs.versions.toml12
4 files changed, 14 insertions, 14 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 4b80277f..db035a79 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,4 @@
5e66d99c852ea67a88b650c03b0e8d55e83eccde # Package name restructure
774fda83ac276a635e3402034b1eedbd10be916f # Tree-wide reformat
7e2eb2425e7b9b6ccb37b7b89f19de3fa7a20c44 # Another tree-wide reformat to address a Spotless misconfiguration
+91fce4dce78da73fe551fa90bb4975a8c250e0f5 # XML reformat to 2 space indent
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fbffc105..07c89e3f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -41,14 +41,14 @@ gradlePlugin {
}
dependencies {
- implementation("com.android.tools.build:gradle:4.2.1")
- implementation("com.diffplug.spotless:spotless-plugin-gradle:5.12.4")
- implementation("com.google.dagger:hilt-android-gradle-plugin:2.37")
+ implementation("com.android.tools.build:gradle:4.2.2")
+ implementation("com.diffplug.spotless:spotless-plugin-gradle:5.14.2")
+ implementation("com.google.dagger:hilt-android-gradle-plugin:2.38")
implementation("com.squareup.okhttp3:okhttp:4.9.0")
- implementation("com.vanniktech:gradle-maven-publish-plugin:0.15.1")
+ implementation("com.vanniktech:gradle-maven-publish-plugin:0.17.0")
implementation("com.vdurmont:semver4j:3.1.0")
- implementation("de.undercouch:gradle-download-task:4.1.1")
- implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32")
+ implementation("de.undercouch:gradle-download-task:4.1.2")
+ implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
- implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0")
+ implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0")
}
diff --git a/format-common/api/format-common.api b/format-common/api/format-common.api
index 6d2377f9..88f5d330 100644
--- a/format-common/api/format-common.api
+++ b/format-common/api/format-common.api
@@ -1,5 +1,4 @@
public final class dev/msfjarvis/aps/data/passfile/PasswordEntry {
- public static final field Companion Ldev/msfjarvis/aps/data/passfile/PasswordEntry$Companion;
public fun <init> (Ldev/msfjarvis/aps/util/time/UserClock;Ldev/msfjarvis/aps/util/totp/TotpFinder;Lkotlinx/coroutines/CoroutineScope;[B)V
public final fun getExtraContent ()Ljava/util/Map;
public final fun getExtraContentString ()Ljava/lang/String;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f19bde8d..0ccc28f9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,16 +11,16 @@ lifecycle = "2.4.0-alpha02"
[libraries]
# buildSrc dependencies
-androidGradlePlugin = "com.android.tools.build:gradle:4.2.1"
-binaryCompatibilityValidator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0"
-dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.4.32"
-downloadTaskPlugin = "de.undercouch:gradle-download-task:4.1.1"
+androidGradlePlugin = "com.android.tools.build:gradle:4.2.2"
+binaryCompatibilityValidator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0"
+dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0"
+downloadTaskPlugin = "de.undercouch:gradle-download-task:4.1.2"
hiltGradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.15.1"
+mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.17.0"
okhttp = "com.squareup.okhttp3:okhttp:4.9.0"
semver4j = "com.vdurmont:semver4j:3.1.0"
-spotlessGradlePlugin = "com.diffplug.spotless:spotless-plugin-gradle:5.12.4"
+spotlessGradlePlugin = "com.diffplug.spotless:spotless-plugin-gradle:5.14.2"
# Kotlin dependencies
kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }