Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
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
savoirfairelinux
jami-client-android
Commits
770618ce
Commit
770618ce
authored
4 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
build: update for Android Studio 4.0
Change-Id: I4d56fd120b2bfd94bbb4a569046a4f340e3c2c76
parent
46bc3c47
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ring-android/app/build.gradle
+4
-6
4 additions, 6 deletions
ring-android/app/build.gradle
ring-android/build.gradle
+1
-1
1 addition, 1 deletion
ring-android/build.gradle
ring-android/gradle/wrapper/gradle-wrapper.properties
+2
-2
2 additions, 2 deletions
ring-android/gradle/wrapper/gradle-wrapper.properties
with
7 additions
and
9 deletions
ring-android/app/build.gradle
+
4
−
6
View file @
770618ce
...
...
@@ -31,6 +31,10 @@ android {
proguardFiles
getDefaultProguardFile
(
'proguard-android-optimize.txt'
),
'proguard-rules.pro'
}
}
buildFeatures
{
viewBinding
true
dataBinding
true
}
flavorDimensions
"push"
productFlavors
{
noPush
{
...
...
@@ -58,12 +62,6 @@ android {
universalApk
true
}
}
viewBinding
{
enabled
true
}
dataBinding
{
enabled
true
}
compileOptions
{
sourceCompatibility
=
JavaVersion
.
VERSION_1_8
targetCompatibility
=
JavaVersion
.
VERSION_1_8
...
...
This diff is collapsed.
Click to expand it.
ring-android/build.gradle
+
1
−
1
View file @
770618ce
...
...
@@ -4,7 +4,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:
3.6.2
'
classpath
'com.android.tools.build:gradle:
4.0.0
'
classpath
'com.google.gms:google-services:4.3.3'
}
}
...
...
This diff is collapsed.
Click to expand it.
ring-android/gradle/wrapper/gradle-wrapper.properties
+
2
−
2
View file @
770618ce
#T
hu Dec 19 21:17:09
E
S
T 20
19
#T
ue Apr 28 13:58:35
E
D
T 20
20
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6.4
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
6.1.1
-all.zip
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