update to latest build tools and gradle

- add new flavordimension tag
This commit is contained in:
n8fr8 2017-10-31 09:42:01 -04:00
parent eff2f765db
commit 750a282e20
5 changed files with 11 additions and 6 deletions

View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "25" buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
applicationId "org.torproject.android" applicationId "org.torproject.android"
minSdkVersion 16 minSdkVersion 16
@ -20,8 +20,12 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
} }
flavorDimensions "free"
productFlavors { productFlavors {
minimalperm { minimalperm {
dimension "free"
minSdkVersion 16 minSdkVersion 16
applicationId 'org.torproject.android' applicationId 'org.torproject.android'
targetSdkVersion 23 targetSdkVersion 23
@ -30,6 +34,7 @@ android {
versionName '15.5.0-RC-1-multi-SDK16' versionName '15.5.0-RC-1-multi-SDK16'
} }
fullperm { fullperm {
dimension "free"
minSdkVersion 23 minSdkVersion 23
applicationId 'org.torproject.android' applicationId 'org.torproject.android'
targetSdkVersion 25 targetSdkVersion 25

View File

@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
} }
} }

View File

@ -1,6 +1,6 @@
#Sun Mar 19 08:31:31 EDT 2017 #Tue Oct 31 09:37:18 EDT 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "25" buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8

View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "25" buildToolsVersion '26.0.2'
sourceSets { sourceSets {
main { main {