Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,6 @@ dependencies {
testImplementation(libs.kotlinx.coroutines.test)

// region other libraries
compileOnly(libs.org.jbundle.util.osgi.wrapped.org.apache.http.client)
implementation(libs.commons.httpclient.commons.httpclient) // remove after entire switch to lib v2
implementation(libs.jackrabbit.webdav) // remove after entire switch to lib v2
implementation(libs.constraintlayout)
Expand All @@ -438,14 +437,12 @@ dependencies {
implementation(libs.commons.io)
implementation(libs.eventbus)
implementation(libs.ez.vcard)
implementation(libs.nnio)
implementation(libs.bcpkix.jdk18on)
implementation(libs.gson)
implementation(libs.sectioned.recyclerview)
implementation(libs.photoview)
implementation(libs.android.gif.drawable)
implementation(libs.qrcodescanner) // "com.github.blikoon:QRCodeScanner:0.1.2"
implementation(libs.flexbox)
implementation(libs.androidsvg)
implementation(libs.annotation)
implementation(libs.emoji.google)
Expand Down Expand Up @@ -529,10 +526,6 @@ dependencies {
implementation(libs.kotlinx.coroutines.core)
// endregion

// region Stateless
implementation(libs.stateless4j)
// endregion

// region Google Play dependencies, upon each update first test: new registration, receive push
add(gplayImplementationConfiguration, libs.bundles.gplay)
// endregion
Expand Down
1 change: 0 additions & 1 deletion app/lint.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</issue>
<issue id="InvalidPackage">
<ignore path="**/freemarker-2.*.*.jar" />
<ignore path="**/nnio-0.2.jar"/>
<ignore path="**/bcpkix-jdk15on-1.69.jar" />
</issue>

Expand Down
17 changes: 1 addition & 16 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ annotationVersion = "1.10.0"
annotationsVersion = "3.0.1"
appCompatVersion = "1.8.0"
bcpkixJdk18onVersion = "1.84"
cardviewVersion = "1.0.0"
checker = "3.21.2"
coilVersion = "2.7.0"
commonsHttpclient = "3.1"
Expand All @@ -26,7 +25,6 @@ coreTestingVersion = "2.2.0"
coreVersion = "0.15.0"
daggerVersion = "2.60.1"
detektGradlePlugin = "1.23.8"
dexopenerVersion = "2.0.5"
disklrucacheVersion = "2.0.2"
documentScannerVersion = "1.3.0"
emojiGoogleVersion = "0.24.1"
Expand All @@ -37,7 +35,6 @@ ezVcardVersion = "0.12.2"
fbContribVersion = "7.7.4"
findsecbugsPluginVersion = "1.14.0"
firebaseMessagingVersion = "25.1.3"
flexboxVersion = "3.0.0"
fragmentKtxVersion = "1.9.1"
glide = "5.0.9"
gsonVersion = "2.14.0"
Expand All @@ -63,10 +60,8 @@ media3 = "1.11.1"
mockitoKotlinVersion = "6.4.0"
mockitoVersion = "5.22.0"
mockkVersion = "1.14.11"
nnioVersion = "0.3.1"
objenesis = "3.5"
orchestratorVersion = "1.6.1"
orgJbundleUtilOsgiWrappedOrgApacheHttpClientVersion = "4.1.2"
osmdroidAndroidVersion = "6.1.20"
photoviewVersion = "2.3.0"
playServicesBaseVersion = "18.11.0"
Expand All @@ -81,7 +76,6 @@ slfj = "2.0.20"
splash-screen = "1.2.0"
spotbugsGradlePlugin = "6.5.11"
spotless = "8.10.2"
stateless4jVersion = "2.6.0"
webkitVersion = "1.17.0"
workRuntime = "2.12.0"
foundationVersion = "1.12.1"
Expand All @@ -99,7 +93,6 @@ bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bc
# UI
browser = { module = "androidx.browser:browser", version.ref = "browserVersion" }
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompatVersion" }
cardview = { module = "androidx.cardview:cardview", version.ref = "cardviewVersion" }
core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestVersion" }
document-scanning-android-sdk = { module = "com.github.Hazzatur:Document-Scanning-Android-SDK", version.ref = "documentScannerVersion" }
fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtxVersion" }
Expand Down Expand Up @@ -129,7 +122,6 @@ annotation = { module = "androidx.annotation:annotation", version.ref = "annotat
annotations = { module = "com.google.code.findbugs:annotations", version.ref = "annotationsVersion" }
commons-httpclient-commons-httpclient = { module = "commons-httpclient:commons-httpclient", version.ref = "commonsHttpclient" }
commons-io = { module = "commons-io:commons-io", version.ref = "commonsIoVersion" }
dexopener = { module = "com.github.tmurakami:dexopener", version.ref = "dexopenerVersion" }
disklrucache = { module = "com.jakewharton:disklrucache", version.ref = "disklrucacheVersion" }
eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbusVersion" }
ext-strikethrough = { module = "io.noties.markwon:ext-strikethrough", version.ref = "markwonVersion" }
Expand All @@ -139,7 +131,6 @@ ez-vcard = { module = "com.googlecode.ez-vcard:ez-vcard", version.ref = "ezVcard
findsecbugs-plugin = { module = "com.h3xstream.findsecbugs:findsecbugs-plugin", version.ref = "findsecbugsPluginVersion" }
fb-contrib = { module = "com.mebigfatguy.fb-contrib:fb-contrib", version.ref = "fbContribVersion" }
firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "firebaseMessagingVersion" }
flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "flexboxVersion" }
gson = { module = "com.google.code.gson:gson", version.ref = "gsonVersion" }
html = { module = "io.noties.markwon:html", version.ref = "markwonVersion" }
ical4j = { module = "org.mnode.ical4j:ical4j", version.ref = "ical4jVersion" }
Expand All @@ -148,8 +139,6 @@ json = { module = "org.json:json", version.ref = "jsonVersion" }
juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardetVersion" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
nnio = { module = "org.lukhnos:nnio", version.ref = "nnioVersion" }
org-jbundle-util-osgi-wrapped-org-apache-http-client = { module = "org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client", version.ref = "orgJbundleUtilOsgiWrappedOrgApacheHttpClientVersion" }
osmdroid-android = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroidAndroidVersion" }
play-services-base = { module = "com.google.android.gms:play-services-base", version.ref = "playServicesBaseVersion" }
review-ktx = { module = "com.google.android.play:review-ktx", version.ref = "reviewKtxVersion" }
Expand Down Expand Up @@ -221,9 +210,6 @@ junit-junit = { module = "junit:junit", version.ref = "junit" }
# Screenshot Test
screengrab = { module = "tools.fastlane:screengrab", version.ref = "screengrabVersion" }
screenshot-core = { module = "com.facebook.testing.screenshot:core", version.ref = "coreVersion" }
shot = { module = "com.karumi:shot", version.ref = "shotVersion" }

stateless4j = { module = "com.github.stateless4j:stateless4j", version.ref = "stateless4jVersion" }

# Markwon
syntax-highlight = { module = "io.noties.markwon:syntax-highlight", version.ref = "markwonVersion" }
Expand All @@ -245,7 +231,7 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
[bundles]
media3 = ["media3-ui", "media3-session", "media3-exoplayer", "media3-datasource"]
espresso = ["espresso-core", "espresso-contrib", "espresso-web", "espresso-accessibility", "espresso-intents", "espresso-idling-resource"]
ui = ["appcompat", "webkit", "cardview", "exifinterface", "fragment-ktx"]
ui = ["appcompat", "webkit", "exifinterface", "fragment-ktx"]
markdown-rendering = [
"core",
"ext-strikethrough",
Expand All @@ -267,7 +253,6 @@ unit-test = [
"core-testing"
]
mocking = [
"dexopener", # required to allow mocking on API 27 and older
"mockito-kotlin",
"mockk",
"mockk-android",
Expand Down
67 changes: 0 additions & 67 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
<trusting group="org.snakeyaml" name="snakeyaml-engine" version="2.6"/>
<trusting group="org.snakeyaml" name="snakeyaml-engine" version="2.7"/>
</trusted-key>
<trusted-key id="137970EF12A6F2B8B501F62430D28CA4CCC665C6" group="com.github.stateless4j" name="stateless4j" version="2.6.0"/>
<trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90">
<trusting group="org.freemarker" name="freemarker" version="2.3.32"/>
<trusting group="org.freemarker" name="freemarker" version="2.3.34"/>
Expand Down Expand Up @@ -269,10 +268,6 @@
<trusting group="javax.annotation"/>
</trusted-key>
<trusted-key id="4F8FEC6785F611D9A712EA2734918B7D3969D2F5" group="com.google.dagger" name="dagger" version="2.28.3"/>
<trusted-key id="508B736B26AA4F672A10B92C4F91D100EB1F597B">
<trusting group="org.lukhnos" name="nnio" version="0.3"/>
<trusting group="org.lukhnos" name="nnio" version="0.3.1"/>
</trusted-key>
<trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple" name="jopt-simple" version="4.9"/>
<trusted-key id="51B52DC5DD452F92BE342CC2858FC4C4F43856A3" group="xerces" name="xercesImpl" version="2.12.0"/>
<trusted-key id="51BF0A126F41293F40F50A0B8CD7D660AE857DAD" group="com.getkeepsafe.relinker" name="relinker" version="1.4.5"/>
Expand Down Expand Up @@ -333,7 +328,6 @@
<trusting group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.6.8"/>
<trusting group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.6.9"/>
</trusted-key>
<trusted-key id="796737EDB7CB2E2904E2BFA447B25FE8A3702A09" group="^org[.]jbundle($|([.].*))" regex="true"/>
<trusted-key id="7A468635B9B8D04C4408B7BE4D21AC964B4DD57B">
<trusting group="com.github.bumptech.glide"/>
<trusting group="com.github.bumptech.glide" name="glide" version="5.0.4"/>
Expand Down Expand Up @@ -406,7 +400,6 @@
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0"/>
</trusted-key>
<trusted-key id="9EB6D93AEA63F11981C112F716F71868F1D3A389" group="org.lukhnos" name="nnio" version="0.2"/>
<trusted-key id="A31DDE881C3E3C4C985BD0D02C7F998F4272C851" group="com.diffplug.spotless"/>
<trusted-key id="A33A0B49A4C1AB590B0A4DDC1364C5E2DF3E99C5" group="org.reactivestreams" name="reactive-streams" version="1.0.3"/>
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA">
Expand Down Expand Up @@ -25160,14 +25153,6 @@
<sha256 value="9fe355ec42f9f7eab085aa065d60c503d4434e762d24f8b42cedd4be6e6c0e54" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.stateless4j" name="stateless4j" version="2.6.0">
<artifact name="stateless4j-2.6.0.jar">
<sha256 value="029dbbf04cfb0d6a2507eb7a5a7cc364daab3bfdcc99e71a69d0226a5d003a0d" origin="Generated by Gradle"/>
</artifact>
<artifact name="stateless4j-2.6.0.pom">
<sha256 value="11e69fdcd770b6b24b1459a857b96b33513a6e180888041fe1c334be0357f6b1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.stephenc.jcip" name="jcip-annotations" version="1.0-1">
<artifact name="jcip-annotations-1.0-1.jar">
<sha256 value="4fccff8382aafc589962c4edb262f6aa595e34f1e11e61057d1c6a96e8fc7323" origin="Generated by Gradle"/>
Expand All @@ -25176,16 +25161,6 @@
<sha256 value="68c2a5aa6e8f345743093e52b5b9e0190ba4d5a5215c0a59b4d7d33647208cbb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.tmurakami" name="dexopener" version="2.0.5">
<artifact name="dexopener-2.0.5.aar">
<sha256 value="05e68baed90a4c3ae0b325d603022050dcc9bfb6a7373a98431338a83ee9fe0a" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="dexopener-2.0.5.pom">
<sha256 value="f5b4b463aa677a65f140b9a3c5325dfadd2856cf16895d6f6fa6105ab5f0b7a3" origin="Generated by Gradle" reason="Artifact is not signed">
<also-trust value="6ba1b5ac65468d5c6578e334d32a71f19306c3ee1025e5799f46d9b275ef9295"/>
</sha256>
</artifact>
</component>
<component group="com.github.zh79325" name="open-gif" version="1.0.4">
<artifact name="open-gif-1.0.4.jar">
<sha256 value="e83bd8f0e7a9dfc2b4ca04e14c65440620e240d936b5e8fbbe5288fa42f018d0" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -35592,24 +35567,6 @@
<sha256 value="c36a7c13da3a4852aa881bdf9db60b9e4d1af146ec2afb5398f96d5983f6d5dd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jbundle.config" name="jbundle-parent" version="1.1.2">
<artifact name="jbundle-parent-1.1.2.pom">
<sha256 value="74fff3a7c86896efd9fc90f45549e8fac6dba9b4a9fe1e98eeb5d83fc13b39da" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jbundle.util.osgi.wrapped" name="jbundle-util-osgi-wrapped-reactor" version="1.0.4">
<artifact name="jbundle-util-osgi-wrapped-reactor-1.0.4.pom">
<sha256 value="87cf0d150b8b5384afdab7844f6561b45fccc535ef8fc8bb023265ffe08450db" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jbundle.util.osgi.wrapped" name="org.jbundle.util.osgi.wrapped.org.apache.http.client" version="4.1.2">
<artifact name="org.jbundle.util.osgi.wrapped.org.apache.http.client-4.1.2.jar">
<sha256 value="e682c09a599226e38075b42e9b7dfb1ca73098b017e0aaa8ca8025e3b04a232b" origin="Generated by Gradle"/>
</artifact>
<artifact name="org.jbundle.util.osgi.wrapped.org.apache.http.client-4.1.2.pom">
<sha256 value="29424e26a66f2d3fe2dac1286e6c3ab97f10debfcaab3df9a2fe381ab8bc4288" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jcommander" name="jcommander" version="1.85">
<artifact name="jcommander-1.85.jar">
<sha256 value="fa7552d2831a2b20778d86851d093edca68fbc0a77f792b6223110e4fae67a70" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
Expand Down Expand Up @@ -42201,30 +42158,6 @@
<sha256 value="8fc84f36ce6da6ce8c893b6538199a7f69a69a0706d9b17a3ee6a3a09452eed6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.lukhnos" name="nnio" version="0.2">
<artifact name="nnio-0.2.jar">
<sha256 value="71eca3df2d0489edbf541c1d8ffeda3ccd9eb2f8c5fbefa44b722ba260e621d3" origin="Generated by Gradle"/>
</artifact>
<artifact name="nnio-0.2.pom">
<sha256 value="f44da04cf645323acb1fe89dd365308f91a51e7532e2cc6b27540ff6d352ef1d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.lukhnos" name="nnio" version="0.3">
<artifact name="nnio-0.3.jar">
<sha256 value="f6666bb59ee14782b5484d86ae1bafa836c8bfc6b858f7aadec5c50ca9be015f" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
<artifact name="nnio-0.3.module">
<sha256 value="238a7a2002efa66df2cfd313be3ce22a7d206d6ebbfe6b48e0652587830cb2bd" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="org.lukhnos" name="nnio" version="0.3.1">
<artifact name="nnio-0.3.1.jar">
<sha256 value="9c411e08406977f2c2027fd8c2790dba1d688a0fca466436a84bf6398943e484" origin="Generated by Gradle"/>
</artifact>
<artifact name="nnio-0.3.1.module">
<sha256 value="ece61075ffbd0c68b66a101689e5e7e8340a73505cab46d231e7c8a4b27aff27" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.mnode.ical4j" name="ical4j" version="3.0.0">
<artifact name="ical4j-3.0.0.jar">
<sha256 value="847ca726fab2b61b95d389a48693f0ca67fcc591a1bccc6f43057157daa433d0" origin="Generated by Gradle"/>
Expand Down
Loading