Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hds
flexin
android-app
Commits
73ca167b
Commit
73ca167b
authored
Oct 27, 2017
by
Nastuzzi Samy
Browse files
Merge branch 'feature/JSONClass' into develop
parents
384e6708
efb56f18
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
73ca167b
...
...
@@ -17,14 +17,19 @@ android {
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
}
}
packagingOptions
{
exclude
'META-INF/LICENSE'
}
}
dependencies
{
compile
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
androidTestCompile
(
'com.android.support.test.espresso:espresso-core:2.2.2'
,
{
exclude
group:
'com.android.support'
,
module:
'support-annotations'
})
compile
'com.android.support:appcompat-v7:26.+'
compile
'com.android.support.constraint:constraint-layout:1.0.2'
testCompile
'junit:junit:4.12'
compile
files
(
'libs/jackson-core-2.9.2.jar'
)
compile
files
(
'libs/jackson-databind-2.9.2.jar'
)
compile
files
(
'libs/jackson-annotations-2.9.2.jar'
)
}
app/libs/jackson-annotations-2.9.2.jar
0 → 100644
View file @
73ca167b
File added
app/libs/jackson-core-2.9.2.jar
0 → 100644
View file @
73ca167b
File added
app/libs/jackson-databind-2.9.2.jar
0 → 100644
View file @
73ca167b
File added
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment