Merge pull request #642 from karyogamy/sdk_26_updrade

Upgrade target sdk and support library version to 26
This commit is contained in:
Mauricio Colli 2017-08-01 22:58:54 -03:00 committed by GitHub
commit a8880bbc0a
3 changed files with 10 additions and 9 deletions

View file

@ -1,13 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion 26
buildToolsVersion '25.0.2' buildToolsVersion '26.0.1'
defaultConfig { defaultConfig {
applicationId "org.schabi.newpipe" applicationId "org.schabi.newpipe"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 26
versionCode 37 versionCode 37
versionName "0.9.10" versionName "0.9.10"
@ -42,10 +42,10 @@ dependencies {
testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.json:json:20160810' testCompile 'org.json:json:20160810'
compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support:support-v4:25.3.1' compile 'com.android.support:support-v4:26.0.0'
compile 'com.android.support:design:25.3.1' compile 'com.android.support:design:26.0.0'
compile 'com.android.support:recyclerview-v7:25.3.1' compile 'com.android.support:recyclerview-v7:26.0.0'
compile 'com.google.code.gson:gson:2.7' compile 'com.google.code.gson:gson:2.7'
compile 'org.jsoup:jsoup:1.8.3' compile 'org.jsoup:jsoup:1.8.3'

View file

@ -1,12 +1,12 @@
package us.shandian.giga.ui.common; package us.shandian.giga.ui.common;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
public abstract class ToolbarActivity extends ActionBarActivity { public abstract class ToolbarActivity extends AppCompatActivity {
protected Toolbar mToolbar; protected Toolbar mToolbar;
@Override @Override

View file

@ -15,5 +15,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
maven { url 'https://maven.google.com' }
} }
} }