Downgrade Apache Commons

To fix compatbility with ancient Android versions
Closes https://gitlab.com/divested-mobile/hypatia/-/issues/30

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-04-24 18:09:49 -04:00
parent 944985e894
commit b547d6cc82
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
6 changed files with 171 additions and 3 deletions

1
.idea/misc.xml generated
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">

View file

@ -6,7 +6,7 @@ android {
applicationId "us.spotco.malwarescanner"
minSdkVersion 16
targetSdkVersion 32
versionCode 98
versionCode 99
versionName "2.31"
resConfigs 'en', 'af', 'de', 'es', 'fi', 'fr', 'it', 'pl', 'pt', 'ru'
}
@ -29,6 +29,6 @@ android {
}
dependencies {
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-io:commons-io:2.5'
implementation 'org.bouncycastle:bcpg-jdk15to18:1.73'
}

View file

@ -0,0 +1 @@
* Fix for Android pre-7.1

Binary file not shown.

View file

@ -4730,3 +4730,160 @@ Hu5oLunBHPTWKK+a0ApggLOu6qUmJ78h0QUUr+y6zp9l6Tb2h1OtDHHjYcYc7kYI
LxY9cJ7wtrva6SZrEQZuknyZ3NLY8mSjuaY=
=Qrrc
-----END PGP PUBLIC KEY BLOCK-----
pub BFFC9B54721244AD
uid Bernd Eckenfels <bernd@eckenfels.net>
uid Bernd Eckenfels <ecki@apache.org>
sub 788E173C196BC673
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.68
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
=qlX0
-----END PGP PUBLIC KEY BLOCK-----
pub 21A24B3F8B0F594A
uid Karl Heinz Marbaise (Apache Software Foundation) <khmarbaise@apache.org>
sub D658968EFD5E9F85
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.68
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
=klCb
-----END PGP PUBLIC KEY BLOCK-----

View file

@ -43,6 +43,7 @@
<trusting group="^com[.]fasterxml($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="^com[.]google($|([.].*))" regex="true"/>
<trusted-key id="6bdaca2c0493cca133b372d09c4f7e9d98b1cc53" group="commons-io"/>
<trusted-key id="6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac" group="jakarta.activation"/>
<trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
<trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
@ -1112,6 +1113,11 @@
<pgp value="6bdaca2c0493cca133b372d09c4f7e9d98b1cc53"/>
</artifact>
</component>
<component group="org.apache" name="apache" version="16">
<artifact name="apache-16.pom">
<pgp value="0cde80149711eb46dff17ae421a24b3f8b0f594a"/>
</artifact>
</component>
<component group="org.apache" name="apache" version="18">
<artifact name="apache-18.pom">
<pgp value="190d5a957ff22273e601f7a7c92c5fec70161c62"/>
@ -1133,6 +1139,11 @@
<pgp value="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="39">
<artifact name="commons-parent-39.pom">
<pgp value="808d78b17a5a2d7c3668e31fbffc9b54721244ad"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="48">
<artifact name="commons-parent-48.pom">
<pgp value="b6e73d84ea4fcc47166087253faad2cd5ecbb314"/>