Mentions légales du service

Skip to content
Snippets Groups Projects
Unverified Commit b9547c30 authored by stopcovid@lunabee.com's avatar stopcovid@lunabee.com
Browse files

Merge branch 'main-eu' into feature/use_bc_jdk18

# Conflicts:
#	decoder/build.gradle
parents 04378579 4039792a
No related branches found
No related tags found
1 merge request!4Feature/use bc jdk18
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
classpath "com.android.tools.build:gradle:4.1.3" classpath "com.android.tools.build:gradle:4.1.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
...@@ -30,13 +30,20 @@ android { ...@@ -30,13 +30,20 @@ android {
dependencies { dependencies {
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:_" coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:_"
libraryVariants.all { variant ->
variant.outputs.each { output ->
def lintTask = tasks["lint${variant.name.capitalize()}"]
output.assemble.dependsOn lintTask
}
implementation "org.jetbrains.kotlin:kotlin-stdlib:_" implementation "org.jetbrains.kotlin:kotlin-stdlib:_"
implementation "org.jetbrains.kotlin:kotlin-reflect:_" implementation "org.jetbrains.kotlin:kotlin-reflect:_"
implementation "com.augustcellars.cose:cose-java:_" implementation "com.augustcellars.cose:cose-java:_"
implementation("com.github.java-json-tools:json-schema-validator:_") { implementation("com.github.java-json-tools:json-schema-validator:_") {
exclude group: "org.mozilla", module: "rhino" exclude group: "org.mozilla", module: "rhino"
} }
}
dependencies {
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:_" implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:_"
implementation "org.bouncycastle:bcpkix-jdk18on:_" implementation "org.bouncycastle:bcpkix-jdk18on:_"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment