From 55926caf8c1b97eda28a9bbc96d93ff19cd15ed0 Mon Sep 17 00:00:00 2001 From: Joshua Ott Date: Tue, 15 Aug 2017 11:02:17 +0200 Subject: [PATCH] #29: Update all libs & android sdk --- build.gradle | 6 ++++++ playmusicexporter/build.gradle | 31 ++++++++++++++++--------------- playmusiclib/build.gradle | 16 ++++++++++------ superuser/build.gradle | 18 +++++++++++------- 4 files changed, 43 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 65c7ae6..f2c06aa 100644 --- a/build.gradle +++ b/build.gradle @@ -35,5 +35,11 @@ buildscript { allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com' + } + maven { + url 'https://jitpack.io' + } } } diff --git a/playmusicexporter/build.gradle b/playmusicexporter/build.gradle index c288dca..06ee457 100644 --- a/playmusicexporter/build.gradle +++ b/playmusicexporter/build.gradle @@ -23,23 +23,23 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion '26.0.1' defaultConfig { - applicationId "re.jcg.playmusicexporter" + applicationId 're.jcg.playmusicexporter' minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 26 // TODO Change Version with releases versionCode 110 versionName '0.9.6.0' vectorDrawables.useSupportLibrary = true - buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)" + buildConfigField 'java.util.Date', 'BUILD_TIME', 'new java.util.Date(' + System.currentTimeMillis() + 'L)' } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -53,13 +53,14 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile project(':superuser') compile project(':playmusiclib') - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support:support-vector-drawable:25.3.1' - compile 'com.github.paolorotolo:appintro:4.1.0' - compile 'ly.count.android:sdk:16.12.2' - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' - testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' + compile 'com.android.support:appcompat-v7:26.0.1' + compile 'com.android.support:support-v13:26.0.1' + compile 'com.android.support:design:26.0.1' + compile 'com.android.support:support-vector-drawable:26.0.1' + compile 'com.github.apl-devs:appintro:v4.2.2' + compile 'ly.count.android:sdk:17.05' + // Couldn't update leakcanary to 1.5.2 because it is broken (See "https://github.com/square/leakcanary/issues/815") + debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1' + releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' + testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' } diff --git a/playmusiclib/build.gradle b/playmusiclib/build.gradle index 8266084..415caed 100644 --- a/playmusiclib/build.gradle +++ b/playmusiclib/build.gradle @@ -23,21 +23,25 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion '26.0.1' defaultConfig { - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 26 versionCode 1 - versionName "1.0" + versionName '1.0' } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + targetCompatibility 1.8 + sourceCompatibility 1.8 + } } dependencies { diff --git a/superuser/build.gradle b/superuser/build.gradle index 0db7716..976f576 100644 --- a/superuser/build.gradle +++ b/superuser/build.gradle @@ -23,24 +23,28 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion '26.0.1' defaultConfig { - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 26 versionCode 1 - versionName "1.0" + versionName '1.0' } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + targetCompatibility 1.8 + sourceCompatibility 1.8 + } } dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:appcompat-v7:26.0.1' } \ No newline at end of file