summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-11-28 11:56:49 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2023-11-28 11:56:49 +0530
commit2de636c31bf27f7e616f8d44bba6e6e877ba8ce3 (patch)
tree863314b805f13c52396f22c565f067e2e72c7462
parent1379ca24399e160828f5bc1c732ff80dc1b7a24e (diff)
feat: remove WhatTheStack
This is pretty unmaintained
-rw-r--r--app/build.gradle.kts6
-rw-r--r--app/proguard-rules.pro5
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt8
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt10
-rw-r--r--gradle/libs.versions.toml1
-rw-r--r--settings.gradle.kts4
6 files changed, 0 insertions, 34 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2bef7d22..abd26932 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -89,12 +89,6 @@ dependencies {
implementation(libs.thirdparty.sshj)
implementation(libs.thirdparty.bouncycastle.bcprov)
- if (snapshot.snapshot) {
- implementation(libs.thirdparty.whatthestack)
- } else {
- debugImplementation(libs.thirdparty.whatthestack)
- }
-
implementation(libs.thirdparty.slf4j.api) {
because("SSHJ now uses SLF4J 2.0 which we don't want")
}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index eb414a5d..25887cac 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -4,8 +4,3 @@
-keep class org.eclipse.jgit.internal.JGitText { *; }
-keep class org.bouncycastle.jcajce.provider.** { *; }
-keep class !org.bouncycastle.jce.provider.X509LDAPCertStoreSpi,org.bouncycastle.jce.provider.** { *; }
-
-# WhatTheStack
--keep class com.haroldadmin.whatthestack.WhatTheStackInitializer {
- <init>();
-}
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
index c4620e6b..fa6f3a2c 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
@@ -5,15 +5,12 @@ package app.passwordstore.gradle
import app.passwordstore.gradle.flavors.FlavorDimensions
import app.passwordstore.gradle.flavors.ProductFlavors
import app.passwordstore.gradle.signing.configureBuildSigning
-import app.passwordstore.gradle.snapshot.SnapshotExtension
import com.android.build.api.dsl.ApplicationExtension
import com.android.build.gradle.AppPlugin
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.the
@Suppress("Unused")
class ApplicationPlugin : Plugin<Project> {
@@ -61,11 +58,6 @@ class ApplicationPlugin : Plugin<Project> {
project.configureBuildSigning()
}
-
- project.dependencies {
- extensions.add("snapshot", SnapshotExtension::class.java)
- the<SnapshotExtension>().snapshot = project.isSnapshot()
- }
}
private fun Project.isSnapshot(): Boolean {
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt
deleted file mode 100644
index 191620d1..00000000
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
- */
-
-package app.passwordstore.gradle.snapshot
-
-abstract class SnapshotExtension {
- abstract var snapshot: Boolean
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7f48b219..d669f1e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -93,7 +93,6 @@ thirdparty-slack-lints = "com.slack.lint:slack-lint-checks:0.7.0"
thirdparty-slf4j-api = { module = "org.slf4j:slf4j-api", version = { strictly = "[1.7, 1.8[", prefer = "1.7.36" } }
thirdparty-sshj = "com.hierynomus:sshj:0.37.0"
thirdparty-uri = "com.eygraber:uri-kmp:0.0.15"
-thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:1.0.0-alpha04"
[bundles]
androidxLifecycle = [
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dff3e992..d2c5db2b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -157,10 +157,6 @@ dependencyResolutionManagement {
}
}
exclusiveContent {
- forRepository { maven("https://jitpack.io") }
- filter { includeModule("com.github.haroldadmin", "WhatTheStack") }
- }
- exclusiveContent {
forRepository { maven("https://storage.googleapis.com/r8-releases/raw") }
filter { includeModule("com.android.tools", "r8") }
}