Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ANON-Public
orbot
Commits
750a282e
Commit
750a282e
authored
Oct 31, 2017
by
n8fr8
Browse files
update to latest build tools and gradle
- add new flavordimension tag
parent
eff2f765
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
750a282e
...
...
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android
{
compileSdkVersion
25
buildToolsVersion
"25"
buildToolsVersion
'26.0.2'
defaultConfig
{
applicationId
"org.torproject.android"
minSdkVersion
16
...
...
@@ -20,8 +20,12 @@ android {
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.txt'
}
}
flavorDimensions
"free"
productFlavors
{
minimalperm
{
dimension
"free"
minSdkVersion
16
applicationId
'org.torproject.android'
targetSdkVersion
23
...
...
@@ -30,6 +34,7 @@ android {
versionName
'15.5.0-RC-1-multi-SDK16'
}
fullperm
{
dimension
"free"
minSdkVersion
23
applicationId
'org.torproject.android'
targetSdkVersion
25
...
...
build.gradle
View file @
750a282e
...
...
@@ -4,7 +4,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:
2.3.3
'
classpath
'com.android.tools.build:gradle:
3.0.0
'
}
}
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
750a282e
#
Sun Mar 19
0
8
:3
1:31
EDT 2017
#
Tue Oct 31
0
9
:3
7:18
EDT 2017
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
3.3
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.1
-all.zip
jsocksAndroid/build.gradle
View file @
750a282e
...
...
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android
{
compileSdkVersion
25
buildToolsVersion
"25"
buildToolsVersion
'26.0.2'
defaultConfig
{
minSdkVersion
8
...
...
orbotservice/build.gradle
View file @
750a282e
...
...
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android
{
compileSdkVersion
25
buildToolsVersion
"25"
buildToolsVersion
'26.0.2'
sourceSets
{
main
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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