Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dgca App Core Android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TousAntiCovid sources
Dgca App Core Android
Commits
b9547c30
Unverified
Commit
b9547c30
authored
2 years ago
by
stopcovid@lunabee.com
Browse files
Options
Downloads
Plain Diff
Merge branch 'main-eu' into feature/use_bc_jdk18
# Conflicts: # decoder/build.gradle
parents
04378579
4039792a
No related branches found
Branches containing commit
No related tags found
1 merge request
!4
Feature/use bc jdk18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+1
-1
1 addition, 1 deletion
build.gradle
decoder/build.gradle
+7
-0
7 additions, 0 deletions
decoder/build.gradle
with
8 additions
and
1 deletion
build.gradle
+
1
−
1
View file @
b9547c30
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
decoder/build.gradle
+
7
−
0
View file @
b9547c30
...
@@ -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:_"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment