From 0d3a7b4a2e37b19d540369850abcfb821b72d115 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 27 Oct 2017 12:35:40 -0700 Subject: [PATCH] Android 3.0 upgrade --- .idea/misc.xml | 5 +---- app/build.gradle | 14 ++++++-------- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b0a270f..75dac50 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - + diff --git a/app/build.gradle b/app/build.gradle index ed6a933..fc4dfc4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { applicationId "net.thauvin.erik.android.tesremoteprogrammer" @@ -31,14 +31,10 @@ dependencies { testCompile 'junit:junit:4.12' - compile 'com.android.support:support-v13:26.0.1' - compile 'com.android.support:appcompat-v7:26.0.1' + compile 'com.android.support:support-v13:26.1.0' + compile 'com.android.support:appcompat-v7:26.1.0' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile 'org.jetbrains.anko:anko-sdk23:0.10.1' - compile 'org.jetbrains.anko:anko-appcompat-v7:0.10.1' - compile 'org.jetbrains.anko:anko-support-v4:0.10.1' - compile 'org.jetbrains.anko:anko-design:0.10.1' - compile 'com.android.support:design:26.0.1' + compile 'com.android.support:design:26.1.0' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2' // https://github.com/JakeWharton/ViewPagerIndicator @@ -58,6 +54,8 @@ dependencies { //compile 'com.github.daniel-stoneuk:material-about-library:2.2.1' compile 'com.android.support:animated-vector-drawable:26.0.1' compile 'com.android.support:cardview-v7:26.0.1' + compile 'com.android.support:animated-vector-drawable:26.1.0' + compile 'com.android.support:cardview-v7:26.1.0' // https://github.com/ACRA/acra compile 'ch.acra:acra:4.9.2' diff --git a/build.gradle b/build.gradle index 0f7f94c..5679e48 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.50' + ext.kotlin_version = '1.1.51' repositories { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 76eb191..d25ae36 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Feb 09 15:12:18 PST 2017 +#Thu Oct 26 20:39:44 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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