[tor-commits] [orbot/master] update gradle, SDK, dependencies, etc
n8fr8 at torproject.org
n8fr8 at torproject.org
Sat May 12 04:50:44 UTC 2018
commit f2c3753a0a41047e9b68dae747ffdb3d4b0a7023
Author: n8fr8 <nathan at freitas.net>
Date: Fri Apr 20 00:09:40 2018 -0400
update gradle, SDK, dependencies, etc
---
app/build.gradle | 25 +++++++++++++------------
build.gradle | 2 +-
jsocksAndroid/build.gradle | 8 ++++----
orbotservice/build.gradle | 8 ++++----
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index e5c8fe65..38d1a6d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 26
- buildToolsVersion '26.0.2'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
defaultConfig {
applicationId "org.torproject.android"
minSdkVersion 16
- targetSdkVersion 26
+ targetSdkVersion 27
}
lintOptions {
checkReleaseBuilds false
@@ -24,6 +24,7 @@ android {
flavorDimensions "free"
productFlavors {
+ /**
minimalperm {
dimension "free"
minSdkVersion 16
@@ -32,24 +33,24 @@ android {
maxSdkVersion 23
versionCode 16000010
versionName '16.0.0-RC-2-multi-SDK16'
- }
+ }**/
fullperm {
dimension "free"
- minSdkVersion 23
+ minSdkVersion 16
applicationId 'org.torproject.android'
- targetSdkVersion 26
+ targetSdkVersion 27
versionCode 16000011
- versionName '16.0.0-RC-2-multi-SDK23'
+ versionName '16.0.0-RC-2-multi-SDK16'
}
}
}
dependencies {
- implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.0'
compile project(':orbotservice')
- compile 'com.android.support:design:26.1.0'
- compile 'pl.bclogic:pulsator4droid:1.0.3'
- compile 'com.github.apl-devs:appintro:v4.2.2'
- compile 'com.github.javiersantos:AppUpdater:2.6.4'
+ implementation 'com.android.support:design:27.1.1'
+ implementation 'pl.bclogic:pulsator4droid:1.0.3'
+ implementation 'com.github.apl-devs:appintro:v4.2.2'
+ implementation 'com.github.javiersantos:AppUpdater:2.6.4'
}
diff --git a/build.gradle b/build.gradle
index ea835f91..8964b5f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.1.1'
}
}
diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle
index 12c743fd..7ac21e4e 100644
--- a/jsocksAndroid/build.gradle
+++ b/jsocksAndroid/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 25
- buildToolsVersion '26.0.2'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
defaultConfig {
- minSdkVersion 8
- targetSdkVersion 25
+ minSdkVersion 16
+ targetSdkVersion 27
}
buildTypes {
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index d950d865..793d088d 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -1,8 +1,8 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 26
- buildToolsVersion '26.0.2'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
sourceSets {
main {
@@ -13,7 +13,7 @@ android {
defaultConfig {
minSdkVersion 16
- targetSdkVersion 26
+ targetSdkVersion 27
versionCode 1
versionName "1.0"
@@ -29,7 +29,7 @@ android {
dependencies {
compile project(':jsocksAndroid')
compile 'org.torproject:tor-android-binary:0.3.1.9b'
- compile 'com.android.support:appcompat-v7:26.1.0'
+ compile 'com.android.support:appcompat-v7:27.1.1'
compile 'com.jrummyapps:android-shell:1.0.1'
compile fileTree(dir: 'libs', include: ['*.jar','*.so'])
testCompile 'junit:junit:4.12'
More information about the tor-commits
mailing list