From 8fbee922557916e84bccd0d55c359160397a2861 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Mon, 25 Jul 2016 12:11:55 +0200 Subject: [PATCH] try to fix failing CI --- .travis.yml | 4 ++-- app/src/main/java/org/schabi/newpipe/App.java | 4 +++- build.gradle | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee704b548..12519bc8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ android: - build-tools-23.0.2 # The SDK version used to compile NewPipe - - android-23 + - android-24 # Additional components - extra-android-support @@ -22,7 +22,7 @@ env: - ADB_INSTALL_TIMEOUT=8 # minutes (2 by default) - GRADLE_OPTS=-Xmx512m # give gradle more memory since it seem to fail otherwise matrix: - - ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a + - ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a before_script: - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index 98839c5a5..c56893fc8 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -41,13 +41,15 @@ public class App extends Application { ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build(); ImageLoader.getInstance().init(config); + /* SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); if(prefs.getBoolean(getString(R.string.use_tor_key), false)) { OrbotHelper.requestStartTor(this); configureTor(true); } else { configureTor(false); - } + }*/ + configureTor(false); // DO NOT REMOVE THIS FUNCTION!!! // Otherwise downloadPathPreference has invalid value. diff --git a/build.gradle b/build.gradle index f6e907312..e220f0b80 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files