Android 3.0 upgrade

This commit is contained in:
Erik C. Thauvin 2017-10-27 12:35:40 -07:00
parent 0518af8ff8
commit 0d3a7b4a2e
4 changed files with 11 additions and 16 deletions

5
.idea/misc.xml generated
View file

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@ -27,7 +24,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View file

@ -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'

View file

@ -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

View file

@ -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