Android 3.0 upgrade
This commit is contained in:
parent
0518af8ff8
commit
0d3a7b4a2e
4 changed files with 11 additions and 16 deletions
5
.idea/misc.xml
generated
5
.idea/misc.xml
generated
|
@ -1,8 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
|
||||||
<entry_points version="2.0" />
|
|
||||||
</component>
|
|
||||||
<component name="NullableNotNullManager">
|
<component name="NullableNotNullManager">
|
||||||
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
||||||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||||
|
@ -27,7 +24,7 @@
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</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" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|
|
@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 26
|
compileSdkVersion 26
|
||||||
buildToolsVersion "26.0.1"
|
buildToolsVersion "26.0.2"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "net.thauvin.erik.android.tesremoteprogrammer"
|
applicationId "net.thauvin.erik.android.tesremoteprogrammer"
|
||||||
|
@ -31,14 +31,10 @@ dependencies {
|
||||||
|
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.12'
|
||||||
|
|
||||||
compile 'com.android.support:support-v13:26.0.1'
|
compile 'com.android.support:support-v13:26.1.0'
|
||||||
compile 'com.android.support:appcompat-v7:26.0.1'
|
compile 'com.android.support:appcompat-v7:26.1.0'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'org.jetbrains.anko:anko-sdk23:0.10.1'
|
compile 'com.android.support:design:26.1.0'
|
||||||
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 group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
|
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
|
||||||
|
|
||||||
// https://github.com/JakeWharton/ViewPagerIndicator
|
// https://github.com/JakeWharton/ViewPagerIndicator
|
||||||
|
@ -58,6 +54,8 @@ dependencies {
|
||||||
//compile 'com.github.daniel-stoneuk:material-about-library:2.2.1'
|
//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:animated-vector-drawable:26.0.1'
|
||||||
compile 'com.android.support:cardview-v7: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
|
// https://github.com/ACRA/acra
|
||||||
compile 'ch.acra:acra:4.9.2'
|
compile 'ch.acra:acra:4.9.2'
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.1.50'
|
ext.kotlin_version = '1.1.51'
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
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"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
#Thu Feb 09 15:12:18 PST 2017
|
#Thu Oct 26 20:39:44 PDT 2017
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue