Merge pull request #578 from martenrebane/MOPPAND-1485

Update Cdoc4j version to 1.5

Author: Counter178

app/build.gradle

@@ -81,6 +81,7 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
             merges += "META-INF/LICENSE.md"
             merges += "META-INF/LICENSE-notice.md"
+            merges += "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
         }
     }
 }
@@ -105,7 +106,7 @@ dependencies {
     implementation "org.slf4j:slf4j-api:${slf4jVersion}"
     implementation "com.github.tony19:logback-android:${logbackAndroidVersion}"
 
-    implementation "org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}"
+    implementation "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}"
 
     implementation "com.github.esnaultdev:MaterialValues:${materialValuesVersion}"
 

build.gradle

@@ -60,7 +60,7 @@ ext {
     timberVersion = '5.0.1'
     okhttpVersion = '4.12.0'
     retrofitVersion = '2.9.0'
-    bouncycastleVersion = '1.70'
+    bouncycastleVersion = '1.79'
     materialValuesVersion = '1.1.1'
     lombokVersion = '1.18.30'
     daggerVersion = '2.54'
@@ -75,7 +75,7 @@ ext {
     logbackAndroidVersion = '3.0.0'
     expandablelayoutVersion = '2.9.2'
     ldapSdkVersion = '6.0.11'
-    cdoc4jVersion = '1.4'
+    cdoc4jVersion = '1.5'
     slf4jVersion = '2.0.7'
     junitVersion = '5.10.0'
     truthVersion = '1.4.4'

common-lib/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     implementation "com.google.auto.value:auto-value-annotations:${autoValueVersion}"
     annotationProcessor "com.google.auto.value:auto-value:${autoValueVersion}"
 
-    api "org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}"
+    api "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}"
 
     api files('libs/libdigidocpp.jar')
 

configuration-lib/build.gradle

@@ -35,7 +35,7 @@ tasks.withType(Test).configureEach {
 }
 
 dependencies {
-    api "org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}"
+    api "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}"
     api "com.squareup.okhttp3:okhttp:${okhttpVersion}"
     api "com.google.code.gson:gson:${gsonVersion}"
 

gradle.properties

@@ -6,7 +6,7 @@ appAbiFilters=arm64-v8a;armeabi-v7a;x86_64
 org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
-android.jetifier.ignorelist=bcprov-jdk15on,jackson-core
+android.jetifier.ignorelist=bcprov-jdk18on,jackson-core
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.enableNewResourceShrinker.preciseShrinking=false

id-card-lib/build.gradle

@@ -29,7 +29,7 @@ dependencies {
 
     implementation "com.jakewharton.timber:timber:${timberVersion}"
 
-    implementation "org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}"
+    implementation "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}"
 
     implementation "com.google.auto.value:auto-value-annotations:${autoValueVersion}"